Added scope mapping for generic auth.

th37rose · th37rose · commit 678c32ab82fe · 2024-05-06T08:13:16.000Z
diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2GenericAuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2GenericAuthConfig.java
@@ -15,4 +15,5 @@ public class Oauth2GenericAuthConfig extends Oauth2SimpleAuthConfig {
     private String authorizationEndpoint;
     private String tokenEndpoint;
     private String userInfoEndpoint;
+    private String scope;
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/AuthConfigRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/AuthConfigRequest.java
@@ -34,7 +34,7 @@ public boolean isEnableRegister() {
      */
     @Nullable
     public String getIssuerUri() {
-        return getString("issuer");
+        return getString("issuerUri");
     }
 
     @Nullable
@@ -67,6 +67,11 @@ public String getClientSecret() {
         return getString("clientSecret");
     }
 
+    @Nullable
+    public String getScope() {
+        return getString("scope");
+    }
+
     public String getSource(String defaultValue) {
         String source = getString("source");
         if (StringUtils.isNotBlank(source)) {
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactoryImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactoryImpl.java
@@ -112,6 +112,7 @@ private Oauth2SimpleAuthConfig buildOauth2GenericAuthConfig(AuthConfigRequest au
                 .authorizationEndpoint(authConfigRequest.getAuthorizationEndpoint())
                 .tokenEndpoint(authConfigRequest.getTokenEndpoint())
                 .userInfoEndpoint(authConfigRequest.getUserInfoEndpoint())
+                .scope(authConfigRequest.getScope())
                 .authType(AuthTypeConstants.GENERIC)
                 .build();
     }

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,5 @@ public class Oauth2GenericAuthConfig extends Oauth2SimpleAuthConfig {`
`15`	`15`	`private String authorizationEndpoint;`
`16`	`16`	`private String tokenEndpoint;`
`17`	`17`	`private String userInfoEndpoint;`
	`18`	`+ private String scope;`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ private Oauth2SimpleAuthConfig buildOauth2GenericAuthConfig(AuthConfigRequest au`
`112`	`112`	`.authorizationEndpoint(authConfigRequest.getAuthorizationEndpoint())`
`113`	`113`	`.tokenEndpoint(authConfigRequest.getTokenEndpoint())`
`114`	`114`	`.userInfoEndpoint(authConfigRequest.getUserInfoEndpoint())`
	`115`	`+ .scope(authConfigRequest.getScope())`
`115`	`116`	`.authType(AuthTypeConstants.GENERIC)`
`116`	`117`	`.build();`
`117`	`118`	`}`