Merge branch 'dev' into org-auth-url-fix

Author: FalkWolsky

client/packages/lowcoder-comps/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-comps",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "type": "module",
   "license": "MIT",
   "dependencies": {

client/packages/lowcoder/src/comps/comps/responsiveLayout/responsiveLayout.tsx

@@ -277,7 +277,8 @@ class ResponsiveLayoutImplComp extends ResponsiveLayoutBaseComp implements ICont
           },
         } as CompAction;
       }
-      if (value.type === "delete" && columns.length <= 1) {
+      const { path } = action;
+      if (value.type === "delete" && path[0] === 'columns' && columns.length <= 1) {
         messageInstance.warning(trans("responsiveLayout.atLeastOneColumnError"));
         // at least one column
         return this;

client/packages/lowcoder/src/pages/setting/idSource/createModal.tsx

@@ -176,39 +176,6 @@ function CreateModal(props: CreateModalProp) {
             </div>
           );
         })}
-        {/* <Form.Item
-          name="clientId"
-          label="Client ID"
-          rules={[{ required: true }]}
-        >
-          <Input
-            placeholder={trans("idSource.formPlaceholder", {
-              label: 'Client ID',
-            })}
-            autoComplete="off"
-          />
-        </Form.Item>
-        <Form.Item
-          name="clientSecret"
-          label={
-            <PasswordLabel>
-              <span>{"Client secret"}:</span>
-              <CloseEyeIcon />
-            </PasswordLabel>
-          }
-          rules={[{
-            required: true,
-            message: trans("idSource.formPlaceholder", {
-              label: 'Client secret',
-            })
-          }]}
-        >
-          <Input
-            type="password"
-            placeholder={trans("idSource.encryptedServer")}
-            autoComplete="off"
-          />
-        </Form.Item> */}
       </FormStyled>
     </CustomModalStyled>
   );

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/UserSessionPersistenceFilter.java

@@ -65,23 +65,24 @@ public Mono<Void> filter(@Nonnull ServerWebExchange exchange, WebFilterChain cha
                             boolean isAccessTokenExpiryNear = (connection.getAuthConnectionAuthToken().getExpireAt()*1000) <= next5Minutes.toEpochMilli();
                             if(isAccessTokenExpiryNear) {
                                 connection.getOrgIds().forEach(orgId -> {
-                                    FindAuthConfig findAuthConfig = authenticationService.findAuthConfigByAuthId(orgId, connection.getAuthId()).block();
-                                    if(findAuthConfig == null) {
-                                        return;
-                                    }
-                                    OAuth2RequestContext oAuth2RequestContext = new OAuth2RequestContext(orgId, null, null);
-                                    oAuth2RequestContext.setAuthConfig(findAuthConfig.authConfig());
-                                    AuthRequest authRequest = authRequestFactory.build(oAuth2RequestContext).block();
-                                    try {
-                                        AuthUser authUser = authRequest.refresh(connection.getAuthConnectionAuthToken().getRefreshToken()).block();
-                                        authUser.setAuthContext(oAuth2RequestContext);
-                                        authenticationApiService.updateConnection(authUser, user);
-                                    } catch (Exception e) {
-                                        log.error("Failed to refresh access token. Removing user sessions/tokens.");
-                                        tokensToRemove.addAll(connection.getTokens());
-                                    }
+                                    authenticationService.findAuthConfigByAuthId(orgId, connection.getAuthId())
+	                                	.doOnSuccess(findAuthConfig -> {
+	                                        if(findAuthConfig == null) {
+	                                            return;
+	                                        }
+	                                        OAuth2RequestContext oAuth2RequestContext = new OAuth2RequestContext(orgId, null, null);
+	                                        oAuth2RequestContext.setAuthConfig(findAuthConfig.authConfig());
+	                                        AuthRequest authRequest = authRequestFactory.build(oAuth2RequestContext).block();
+	                                        try {
+	                                            AuthUser authUser = authRequest.refresh(connection.getAuthConnectionAuthToken().getRefreshToken()).block();
+	                                            authUser.setAuthContext(oAuth2RequestContext);
+	                                            authenticationApiService.updateConnection(authUser, user);
+	                                        } catch (Exception e) {
+	                                            log.error("Failed to refresh access token. Removing user sessions/tokens.");
+	                                            tokensToRemove.addAll(connection.getTokens());
+	                                        }
+	                                	});
                                 });
-
                             }
                         }
                     });