Merge pull request #1034 from lowcoder-org/dev

Dev > Main for v2.4.3

client/packages/lowcoder-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-sdk",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "type": "module",
   "files": [
     "src",

client/packages/lowcoder/src/app.tsx

@@ -130,12 +130,16 @@ class AppIndex extends React.Component<AppIndexProps, any> {
     // make sure all users in this app have checked login info
     if (!this.props.isFetchUserFinished || (this.props.currentUserId && !this.props.fetchHomeDataFinished)) {
       const hideLoadingHeader = isTemplate || isAuthUnRequired(pathname);
+      return <ProductLoading hideHeader={hideLoadingHeader} />;
+    }
+    else {
       // if the user just logged in, we send the event to posthog
-      if (sessionStorage.getItem('_just_logged_in_')) {
-        posthog.identify(this.props.currentUserId);
-        sessionStorage.removeItem('_just_logged_in_');
+      if (isLocalhost || isLowCoderDomain) {
+        if (sessionStorage.getItem('_just_logged_in_')) {
+          posthog.identify(this.props.currentUserId);
+          sessionStorage.removeItem('_just_logged_in_');
+        }
       }
-      return <ProductLoading hideHeader={hideLoadingHeader} />;
     }
 
     // persisting the language in local storage

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

@@ -186,7 +186,7 @@ const childrenMap = {
   showHeaderInPublic: withDefault(BoolControl, true),
   maxWidth: dropdownInputSimpleControl(OPTIONS, USER_DEFINE, "1920"),
   themeId: valueComp<string>(DEFAULT_THEMEID),
-  preventAppStylesOverwriting: withDefault(BoolControl, false),
+  preventAppStylesOverwriting: withDefault(BoolControl, true),
   customShortcuts: CustomShortcutsComp,
   disableCollision: valueComp<boolean>(false),
 };

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java

@@ -21,5 +21,5 @@ public interface UserRepository extends ReactiveMongoRepository<User, String> {
     Mono<User> findByName(String rawUuid);
 
     //email1 and email2 should be equal
-    Mono<User> findByEmailOrConnections_Email(String email1, String email2);
+    Flux<User> findByEmailOrConnections_Email(String email1, String email2);
 }

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java

@@ -113,7 +113,7 @@ public Mono<User> findByName(String rawUuid) {
     }
 
     public Mono<User> findByEmailDeep(String email) {
-        return repository.findByEmailOrConnections_Email(email, email);
+        return repository.findByEmailOrConnections_Email(email, email).next();
     }
 
     @Override

server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java

@@ -45,6 +45,7 @@ private AuthUser formulateAuthUser() {
         return AuthUser.builder()
                 .uid(username)
                 .username(username)
+                .email(username)
                 .authContext(authRequestContext)
                 .build();
     }