new: use scope provided from frontend

Author: ludomikula

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2KeycloakAuthConfig.java

@@ -2,6 +2,7 @@
 
 import static org.lowcoder.sdk.auth.constants.Oauth2Constants.BASE_URL_PLACEHOLDER;
 import static org.lowcoder.sdk.auth.constants.Oauth2Constants.REALM_PLACEHOLDER;
+import static org.lowcoder.sdk.auth.constants.Oauth2Constants.SCOPE_PLACEHOLDER;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -17,6 +18,7 @@ public class Oauth2KeycloakAuthConfig extends Oauth2SimpleAuthConfig
 {
 	protected String baseUrl;
 	protected String realm;
+	protected String scope;
 
 	@JsonCreator
 	public Oauth2KeycloakAuthConfig(
@@ -29,11 +31,13 @@ public Oauth2KeycloakAuthConfig(
 			@JsonProperty("clientSecret") String clientSecret,
 			@JsonProperty("baseUrl") String baseUrl,
 			@JsonProperty("realm") String realm,
+			@JsonProperty("scope") String scope,
 			@JsonProperty("authType") String authType) 
 	{
 		super(id, enable, enableRegister, source, sourceName, clientId, clientSecret, authType);
 		this.baseUrl = baseUrl;
 		this.realm = realm;
+		this.scope = scope;
 	}
 
 
@@ -43,7 +47,8 @@ public String replaceAuthUrlClientIdPlaceholder(String url)
 	{
 		return super.replaceAuthUrlClientIdPlaceholder(url)
 				.replace(BASE_URL_PLACEHOLDER, baseUrl)
-				.replace(REALM_PLACEHOLDER, realm);
+				.replace(REALM_PLACEHOLDER, realm)
+				.replace(SCOPE_PLACEHOLDER, scope);
 	}
 
 

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2OryAuthConfig.java

@@ -1,6 +1,7 @@
 package org.lowcoder.sdk.auth;
 
 import static org.lowcoder.sdk.auth.constants.Oauth2Constants.BASE_URL_PLACEHOLDER;
+import static org.lowcoder.sdk.auth.constants.Oauth2Constants.SCOPE_PLACEHOLDER;
 
 import javax.annotation.Nullable;
 
@@ -15,6 +16,7 @@
 public class Oauth2OryAuthConfig extends Oauth2SimpleAuthConfig {
 
     protected String baseUrl;
+    protected String scope;
 
     @JsonCreator
     public Oauth2OryAuthConfig(
@@ -26,13 +28,17 @@ public Oauth2OryAuthConfig(
             String clientId,
             String clientSecret,
             String baseUrl,
+            String scope,
             String authType) {
         super(id, enable, enableRegister, source, sourceName, clientId, clientSecret, authType);
         this.baseUrl = baseUrl;
+        this.scope = scope;
     }
 
     @Override
     public String replaceAuthUrlClientIdPlaceholder(String url) {
-        return super.replaceAuthUrlClientIdPlaceholder(url).replace(BASE_URL_PLACEHOLDER, baseUrl);
+        return super.replaceAuthUrlClientIdPlaceholder(url)
+        		.replace(BASE_URL_PLACEHOLDER, baseUrl)
+        		.replace(SCOPE_PLACEHOLDER, scope);
     }
 }

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/constants/Oauth2Constants.java

@@ -9,6 +9,7 @@ public class Oauth2Constants {
     public static final String REALM_PLACEHOLDER = "$REALM";
 
     public static final String BASE_URL_PLACEHOLDER = "$BASE_URL";
+    public static final String SCOPE_PLACEHOLDER = "$SCOPE";
 
     // authorize url
     public static final String GITHUB_AUTHORIZE_URL = "https://github.com/login/oauth/authorize"
@@ -32,12 +33,12 @@ public class Oauth2Constants {
             + "&client_id=" + CLIENT_ID_PLACEHOLDER
             + "&redirect_uri=" + REDIRECT_URL_PLACEHOLDER
             + "&state=" + STATE_PLACEHOLDER
-            + "&scope=openid email profile offline_access";
+            + "&scope=" + SCOPE_PLACEHOLDER;
 
     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
             + "&state=" + STATE_PLACEHOLDER
-            + "&scope=openid email profile";
+            + "&scope=" + SCOPE_PLACEHOLDER;
 }