Merge pull request #994 from goldants/feature/generic-oauth

Feature/generic oauth

Author: ludomikula

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.FALSE.equals(userCanSelectAccounts)?"":"&prompt=select_account");
     }
 
 

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";
 }

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GenericAuthRequest.java

@@ -1,5 +1,6 @@
 package org.lowcoder.api.authentication.request.oauth2.request;
 
+import lombok.Setter;
 import org.lowcoder.api.authentication.request.AuthException;
 import org.lowcoder.api.authentication.request.oauth2.GenericOAuthProviderSource;
 import org.lowcoder.api.authentication.request.oauth2.OAuth2RequestContext;

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();
     }
 }

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java

@@ -74,7 +74,7 @@ public static AuthToken mapToAuthToken(Map<String, Object> map, HashMap<String,
                 .accessToken(MapUtils.getString(map, "access_token"))
                 .expireIn(MapUtils.getIntValue(map, "expires_in"))
                 .refreshToken(MapUtils.getString(map, "refresh_token"))
-                .jwt(AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "jwt")))
+                .jwt(AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "jwt", "access_token")))
                 .build();
     }
 

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();