Merge branch 'oauth_pr' into feat-generic-oauth

# Conflicts:
#	server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2GenericAuthConfig.java
#	server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/AuthConfigRequest.java
#	server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactoryImpl.java

Author: ludomikula

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

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java

@@ -141,8 +141,8 @@ public static class Workspace {
 
     @Data
     public static class Cookie {
-
-        private long maxAgeInSeconds = Duration.ofDays(30).toSeconds();
+        //Set cookie max age to 1 day
+        private long maxAgeInSeconds = Duration.ofDays(1).toSeconds();
     }
 
     @Data

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)) {

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

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/SessionUserServiceImpl.java

@@ -118,10 +118,7 @@ public Mono<Void> extendValidity(String token) {
 
     private Duration getTokenExpireTime() {
         long maxAgeInSeconds = commonConfig.getCookie().getMaxAgeInSeconds();
-        if (maxAgeInSeconds >= 0) {
-            return Duration.ofSeconds(maxAgeInSeconds).plus(Duration.ofDays(1));
-        }
-        return Duration.ofDays(7);
+        return Duration.ofSeconds(maxAgeInSeconds);
     }
 
     @Override