add switch variable for selecting account on genericoauth

Thomas · Thomas · commit 936b42dfb93d · 2024-06-27T05:17:32.000-04:00
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
@@ -26,13 +26,15 @@ public class Oauth2GenericAuthConfig extends Oauth2SimpleAuthConfig {
     private String scope;
     private HashMap<String, String> sourceMappings;
     private Boolean userInfoIntrospection;
+    private Boolean userCanSelectAccounts;
 
     @Override
     public String replaceAuthUrlClientIdPlaceholder(String url)
     {
         return super.replaceAuthUrlClientIdPlaceholder(url)
                 .replace(BASE_URL_PLACEHOLDER, authorizationEndpoint)
-                .replace(SCOPE_PLACEHOLDER, scope);
+                .replace(SCOPE_PLACEHOLDER, scope)
+                .concat(Boolean.TRUE.equals(userCanSelectAccounts)?"&prompt=select_account":"");
     }
 
 
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
@@ -48,6 +48,5 @@ public class Oauth2Constants {
             + "&redirect_uri=" + REDIRECT_URL_PLACEHOLDER
             + "&state=" + STATE_PLACEHOLDER
             + "&scope=" + SCOPE_PLACEHOLDER
-            + "&access_type=offline"
-            + "&prompt=select_account";
+            + "&access_type=offline";
 }
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
@@ -117,7 +117,8 @@ private Oauth2SimpleAuthConfig buildOauth2GenericAuthConfig(AuthConfigRequest au
                 .userInfoEndpoint(authConfigRequest.getUserInfoEndpoint())
                 .scope(authConfigRequest.getScope())
                 .authType(AuthTypeConstants.GENERIC)
-                .userInfoIntrospection(MapUtils.getBoolean(authConfigRequest,"userInfoIntrospection", false))
+                .userInfoIntrospection(MapUtils.getBoolean(authConfigRequest,"userInfoIntrospection"))
+                .userCanSelectAccounts(MapUtils.getBoolean(authConfigRequest,"userCanSelectAccounts"))
                 .build();
     }
 }
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GenericAuthenticateTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GenericAuthenticateTest.java
@@ -88,6 +88,7 @@ public void testGoogleLoginSuccess(WireMockRuntimeInfo wmRuntimeInfo) {
                 .scope("scope")
                 .sourceMappings(sourceMappings)
                 .userInfoIntrospection(true)
+                .userCanSelectAccounts(true)
                 .build();
 
         var organization = Organization.builder().build();

Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,15 @@ public class Oauth2GenericAuthConfig extends Oauth2SimpleAuthConfig {`
`26`	`26`	`private String scope;`
`27`	`27`	`private HashMap<String, String> sourceMappings;`
`28`	`28`	`private Boolean userInfoIntrospection;`
	`29`	`+ private Boolean userCanSelectAccounts;`
`29`	`30`
`30`	`31`	`@Override`
`31`	`32`	`public String replaceAuthUrlClientIdPlaceholder(String url)`
`32`	`33`	`{`
`33`	`34`	`return super.replaceAuthUrlClientIdPlaceholder(url)`
`34`	`35`	`.replace(BASE_URL_PLACEHOLDER, authorizationEndpoint)`
`35`		`- .replace(SCOPE_PLACEHOLDER, scope);`
	`36`	`+ .replace(SCOPE_PLACEHOLDER, scope)`
	`37`	`+ .concat(Boolean.TRUE.equals(userCanSelectAccounts)?"&prompt=select_account":"");`
`36`	`38`	`}`
`37`	`39`
`38`	`40`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,5 @@ public class Oauth2Constants {`
`48`	`48`	`+ "&redirect_uri=" + REDIRECT_URL_PLACEHOLDER`
`49`	`49`	`+ "&state=" + STATE_PLACEHOLDER`
`50`	`50`	`+ "&scope=" + SCOPE_PLACEHOLDER`
`51`		`- + "&access_type=offline"`
`52`		`- + "&prompt=select_account";`
	`51`	`+ + "&access_type=offline";`
`53`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,8 @@ private Oauth2SimpleAuthConfig buildOauth2GenericAuthConfig(AuthConfigRequest au`
`117`	`117`	`.userInfoEndpoint(authConfigRequest.getUserInfoEndpoint())`
`118`	`118`	`.scope(authConfigRequest.getScope())`
`119`	`119`	`.authType(AuthTypeConstants.GENERIC)`
`120`		`- .userInfoIntrospection(MapUtils.getBoolean(authConfigRequest,"userInfoIntrospection", false))`
	`120`	`+ .userInfoIntrospection(MapUtils.getBoolean(authConfigRequest,"userInfoIntrospection"))`
	`121`	`+ .userCanSelectAccounts(MapUtils.getBoolean(authConfigRequest,"userCanSelectAccounts"))`
`121`	`122`	`.build();`
`122`	`123`	`}`
`123`	`124`	`}`