fix: change oauth url format to allow whole base url

ludomikula · ludomikula · commit 2e13bff11546 · 2023-11-20T11:37:31.000+01:00
diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2KeycloakAuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2KeycloakAuthConfig.java
@@ -1,6 +1,6 @@
 package org.lowcoder.sdk.auth;
 
-import static org.lowcoder.sdk.auth.constants.Oauth2Constants.INSTANCE_ID_PLACEHOLDER;
+import static org.lowcoder.sdk.auth.constants.Oauth2Constants.BASE_URL_PLACEHOLDER;
 import static org.lowcoder.sdk.auth.constants.Oauth2Constants.REALM_PLACEHOLDER;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -15,7 +15,7 @@
 @Getter
 public class Oauth2KeycloakAuthConfig extends Oauth2SimpleAuthConfig 
 {
-	protected String instanceId;
+	protected String baseUrl;
 	protected String realm;
 	
 	@JsonCreator
@@ -27,12 +27,12 @@ public Oauth2KeycloakAuthConfig(
 			@JsonProperty("sourceName") String sourceName,
 			@JsonProperty("clientId") String clientId, 
 			@JsonProperty("clientSecret") String clientSecret,
-			@JsonProperty("instanceId") String instanceId,
+			@JsonProperty("baseUrl") String baseUrl,
 			@JsonProperty("realm") String realm,
 			@JsonProperty("authType") String authType) 
 	{
 		super(id, enable, enableRegister, source, sourceName, clientId, clientSecret, authType);
-		this.instanceId = instanceId;
+		this.baseUrl = baseUrl;
 		this.realm = realm;
 	}
 
@@ -42,7 +42,7 @@ public Oauth2KeycloakAuthConfig(
 	public String replaceAuthUrlClientIdPlaceholder(String url) 
 	{
 		return super.replaceAuthUrlClientIdPlaceholder(url)
-				.replace(INSTANCE_ID_PLACEHOLDER, instanceId)
+				.replace(BASE_URL_PLACEHOLDER, baseUrl)
 				.replace(REALM_PLACEHOLDER, realm);
 	}
 	
diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2OryAuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2OryAuthConfig.java
@@ -1,6 +1,6 @@
 package org.lowcoder.sdk.auth;
 
-import static org.lowcoder.sdk.auth.constants.Oauth2Constants.INSTANCE_ID_PLACEHOLDER;
+import static org.lowcoder.sdk.auth.constants.Oauth2Constants.BASE_URL_PLACEHOLDER;
 
 import javax.annotation.Nullable;
 
@@ -14,7 +14,7 @@
 @Getter
 public class Oauth2OryAuthConfig extends Oauth2SimpleAuthConfig {
 
-    protected String instanceId;
+    protected String baseUrl;
 
     @JsonCreator
     public Oauth2OryAuthConfig(
@@ -25,14 +25,14 @@ public Oauth2OryAuthConfig(
             String sourceName,
             String clientId,
             String clientSecret,
-            String instanceId,
+            String baseUrl,
             String authType) {
         super(id, enable, enableRegister, source, sourceName, clientId, clientSecret, authType);
-        this.instanceId = instanceId;
+        this.baseUrl = baseUrl;
     }
 
     @Override
     public String replaceAuthUrlClientIdPlaceholder(String url) {
-        return super.replaceAuthUrlClientIdPlaceholder(url).replace(INSTANCE_ID_PLACEHOLDER, instanceId);
+        return super.replaceAuthUrlClientIdPlaceholder(url).replace(BASE_URL_PLACEHOLDER, baseUrl);
     }
 }
diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/constants/Oauth2Constants.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/constants/Oauth2Constants.java
@@ -8,7 +8,7 @@ public class Oauth2Constants {
     public static final String STATE_PLACEHOLDER = "$STATE";
     public static final String REALM_PLACEHOLDER = "$REALM";
 
-    public static final String INSTANCE_ID_PLACEHOLDER = "$INSTANCE_ID";
+    public static final String BASE_URL_PLACEHOLDER = "$BASE_URL";
 
     // authorize url
     public static final String GITHUB_AUTHORIZE_URL = "https://github.com/login/oauth/authorize"
@@ -27,14 +27,14 @@ public class Oauth2Constants {
             + "&scope=openid email profile"
             + "&prompt=select_account";
 
-    public static final String ORY_AUTHORIZE_URL = "https://" + INSTANCE_ID_PLACEHOLDER +  "/oauth2/auth"
+    public static final String ORY_AUTHORIZE_URL = BASE_URL_PLACEHOLDER +  "/oauth2/auth"
             + "?response_type=code"
             + "&client_id=" + CLIENT_ID_PLACEHOLDER
             + "&redirect_uri=" + REDIRECT_URL_PLACEHOLDER
             + "&state=" + STATE_PLACEHOLDER
             + "&scope=openid email profile offline_access";
 
-    public static final String KEYCLOAK_AUTHORIZE_URL = "https://" + INSTANCE_ID_PLACEHOLDER + "/realms/" + REALM_PLACEHOLDER + "/protocol/openid-connect/auth"
+    public static final String KEYCLOAK_AUTHORIZE_URL = BASE_URL_PLACEHOLDER + "/realms/" + REALM_PLACEHOLDER + "/protocol/openid-connect/auth"
             + "?response_type=code"
             + "&client_id=" + CLIENT_ID_PLACEHOLDER
             + "&redirect_uri=" + REDIRECT_URL_PLACEHOLDER
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/Oauth2DefaultSource.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/Oauth2DefaultSource.java
@@ -1,7 +1,6 @@
 package org.lowcoder.api.authentication.request.oauth2;
 
 import org.lowcoder.sdk.auth.constants.Oauth2Constants;
-import org.springframework.security.config.oauth2.client.CommonOAuth2Provider;
 
 public enum Oauth2DefaultSource implements Oauth2Source {
 
@@ -43,17 +42,17 @@ public String refresh() {
     ORY {
         @Override
         public String accessToken() {
-            return "https://" + Oauth2Constants.INSTANCE_ID_PLACEHOLDER + "/oauth2/token";
+            return Oauth2Constants.BASE_URL_PLACEHOLDER + "/oauth2/token";
         }
 
         @Override
         public String userInfo() {
-            return "https://" + Oauth2Constants.INSTANCE_ID_PLACEHOLDER + "/userinfo";
+            return Oauth2Constants.BASE_URL_PLACEHOLDER + "/userinfo";
         }
 
         @Override
         public String refresh() {
-            return "https://" + Oauth2Constants.INSTANCE_ID_PLACEHOLDER + "/oauth2/token";
+            return Oauth2Constants.BASE_URL_PLACEHOLDER + "/oauth2/token";
         }
 
     },
@@ -62,17 +61,17 @@ public String refresh() {
 
         @Override
         public String accessToken() {
-            return "http://" + Oauth2Constants.INSTANCE_ID_PLACEHOLDER + "/realms/" + Oauth2Constants.REALM_PLACEHOLDER + "/protocol/openid-connect/token";
+            return Oauth2Constants.BASE_URL_PLACEHOLDER + "/realms/" + Oauth2Constants.REALM_PLACEHOLDER + "/protocol/openid-connect/token";
         }
 
         @Override
         public String userInfo() {
-            return "http://" + Oauth2Constants.INSTANCE_ID_PLACEHOLDER + "/realms/" + Oauth2Constants.REALM_PLACEHOLDER + "/protocol/openid-connect/userinfo";
+            return Oauth2Constants.BASE_URL_PLACEHOLDER + "/realms/" + Oauth2Constants.REALM_PLACEHOLDER + "/protocol/openid-connect/userinfo";
         }
 
         @Override
         public String refresh() {
-        	return "http://" + Oauth2Constants.INSTANCE_ID_PLACEHOLDER + "/realms/" + Oauth2Constants.REALM_PLACEHOLDER + "/protocol/openid-connect/token";
+        	return Oauth2Constants.BASE_URL_PLACEHOLDER + "/realms/" + Oauth2Constants.REALM_PLACEHOLDER + "/protocol/openid-connect/token";
         }
     	
     }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package org.lowcoder.api.authentication.request.oauth2;`
`2`	`2`
`3`	`3`	`import org.lowcoder.sdk.auth.constants.Oauth2Constants;`
`4`		`-import org.springframework.security.config.oauth2.client.CommonOAuth2Provider;`
`5`	`4`
`6`	`5`	`public enum Oauth2DefaultSource implements Oauth2Source {`
`7`	`6`
`@@ -43,17 +42,17 @@ public String refresh() {`
`43`	`42`	`ORY {`
`44`	`43`	`@Override`
`45`	`44`	`public String accessToken() {`
`46`		`- return "https://" + Oauth2Constants.INSTANCE_ID_PLACEHOLDER + "/oauth2/token";`
	`45`	`+ return Oauth2Constants.BASE_URL_PLACEHOLDER + "/oauth2/token";`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`@Override`
`50`	`49`	`public String userInfo() {`
`51`		`- return "https://" + Oauth2Constants.INSTANCE_ID_PLACEHOLDER + "/userinfo";`
	`50`	`+ return Oauth2Constants.BASE_URL_PLACEHOLDER + "/userinfo";`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`@Override`
`55`	`54`	`public String refresh() {`
`56`		`- return "https://" + Oauth2Constants.INSTANCE_ID_PLACEHOLDER + "/oauth2/token";`
	`55`	`+ return Oauth2Constants.BASE_URL_PLACEHOLDER + "/oauth2/token";`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`},`
`@@ -62,17 +61,17 @@ public String refresh() {`
`62`	`61`
`63`	`62`	`@Override`
`64`	`63`	`public String accessToken() {`
`65`		`- return "http://" + Oauth2Constants.INSTANCE_ID_PLACEHOLDER + "/realms/" + Oauth2Constants.REALM_PLACEHOLDER + "/protocol/openid-connect/token";`
	`64`	`+ return Oauth2Constants.BASE_URL_PLACEHOLDER + "/realms/" + Oauth2Constants.REALM_PLACEHOLDER + "/protocol/openid-connect/token";`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`@Override`
`69`	`68`	`public String userInfo() {`
`70`		`- return "http://" + Oauth2Constants.INSTANCE_ID_PLACEHOLDER + "/realms/" + Oauth2Constants.REALM_PLACEHOLDER + "/protocol/openid-connect/userinfo";`
	`69`	`+ return Oauth2Constants.BASE_URL_PLACEHOLDER + "/realms/" + Oauth2Constants.REALM_PLACEHOLDER + "/protocol/openid-connect/userinfo";`
`71`	`70`	`}`
`72`	`71`
`73`	`72`	`@Override`
`74`	`73`	`public String refresh() {`
`75`		`- return "http://" + Oauth2Constants.INSTANCE_ID_PLACEHOLDER + "/realms/" + Oauth2Constants.REALM_PLACEHOLDER + "/protocol/openid-connect/token";`
	`74`	`+ return Oauth2Constants.BASE_URL_PLACEHOLDER + "/realms/" + Oauth2Constants.REALM_PLACEHOLDER + "/protocol/openid-connect/token";`
`76`	`75`	`}`
`77`	`76`
`78`	`77`	`}`