Fixed: OpenIDHashVariable - To obtain token endpoint from issuer disc…

…overy if the issuer type is not "Custom"
jogetoss · Jul 15, 2024 · 8308ccf · 8308ccf
1 parent 8db88e3
commit 8308ccf
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.joget</groupId>
     <artifactId>openid-connect-authentication</artifactId>
     <packaging>bundle</packaging>
-    <version>7.0.6</version>
+    <version>7.0.7</version>
     <name>openid-connect-authentication</name>
     <url>http://www.joget.org</url>
     <build>

diff --git a/src/main/java/org/joget/plugin/marketplace/ExtUserSecurityImpl.java b/src/main/java/org/joget/plugin/marketplace/ExtUserSecurityImpl.java
@@ -28,7 +28,7 @@ public String getDescription() {
 
     @Override
     public String getVersion() {
-        return "7.0.6";
+        return "7.0.7";
     }
 
     @Override

diff --git a/src/main/java/org/joget/plugin/marketplace/OpenIDDirectoryManager.java b/src/main/java/org/joget/plugin/marketplace/OpenIDDirectoryManager.java
@@ -104,7 +104,7 @@ public String getDescription() {
 
     @Override
     public String getVersion() {
-        return "7.0.6";
+        return "7.0.7";
     }
 
     @Override
@@ -247,7 +247,7 @@ public void webService(HttpServletRequest request, HttpServletResponse response)
         }
     }
 
-    public OIDCProviderMetadata IssuerDiscovery() throws IOException, URISyntaxException {
+    public static OIDCProviderMetadata IssuerDiscovery() throws IOException, URISyntaxException {
         DirectoryManagerProxyImpl dm = (DirectoryManagerProxyImpl) AppUtil.getApplicationContext().getBean("directoryManager");
         SecureDirectoryManagerImpl dmImpl = (SecureDirectoryManagerImpl) dm.getDirectoryManagerImpl();
 

diff --git a/src/main/java/org/joget/plugin/marketplace/OpenIDHashVariable.java b/src/main/java/org/joget/plugin/marketplace/OpenIDHashVariable.java
@@ -17,6 +17,7 @@
 import com.nimbusds.oauth2.sdk.token.RefreshToken;
 import com.nimbusds.oauth2.sdk.token.Tokens;
 import com.nimbusds.openid.connect.sdk.OIDCTokenResponseParser;
+import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -39,7 +40,7 @@ public String getName() {
 
     @Override
     public String getVersion() {
-        return "7.0.6";
+        return "7.0.7";
     }
 
     @Override
@@ -105,7 +106,16 @@ public String processHashVariable(String variableKey) {
             try {
                 RefreshToken receivedRefreshToken = new RefreshToken(refreshTokenUmd.getValue());
                 AuthorizationGrant refreshTokenGrant = new RefreshTokenGrant(receivedRefreshToken);
-                URI tokenEndpoint = new URI(dmImpl.getPropertyString("tokenEndpoint"));
+                //URI tokenEndpoint = new URI(dmImpl.getPropertyString("tokenEndpoint"));
+                URI tokenEndpoint;
+
+                if (dmImpl.getPropertyString("tokenEndpoint").isEmpty()) {
+                    OIDCProviderMetadata providerMetadata = OpenIDDirectoryManager.IssuerDiscovery();
+                    tokenEndpoint = providerMetadata.getTokenEndpointURI();
+                } else {
+                    tokenEndpoint = new URI(dmImpl.getPropertyString("tokenEndpoint"));
+                }
+
                 ClientID clientID = new ClientID(dmImpl.getPropertyString("clientId"));
                 Secret secret = new Secret(dmImpl.getPropertyString("clientSecret"));
                 ClientAuthentication clientAuth = new ClientSecretBasic(clientID, secret);