From 5e30fc062329585b5fc14bf647b7ebb30017c8cd Mon Sep 17 00:00:00 2001 From: Thomasr Date: Sat, 6 Jul 2024 05:25:06 -0400 Subject: [PATCH 1/6] null name issue fixed --- .../lowcoder/api/authentication/util/AuthenticationUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java index ce8d27274..e86dd82a0 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java @@ -112,7 +112,6 @@ public static AuthUser mergeAuthUser(AuthUser low, AuthUser high) { return AuthUser.builder() .uid(high.getUid() != null ? high.getUid() : low.getUid()) .username(high.getUsername() != null ? high.getUsername() : low.getUsername()) - .email(high.getEmail() != null ? high.getEmail() : low.getEmail()) .avatar(high.getAvatar() != null ? high.getAvatar() : low.getAvatar()) .rawUserInfo(high.getRawUserInfo() != null ? high.getRawUserInfo() : low.getRawUserInfo()) .authToken(high.getAuthToken() != null ? high.getAuthToken() : low.getAuthToken()) From 1be217a1680f1f55227a7ed154ff08654b14d839 Mon Sep 17 00:00:00 2001 From: Thomasr Date: Mon, 8 Jul 2024 16:19:04 -0400 Subject: [PATCH 2/6] Add email field to user and match users by email --- .../lowcoder/api/authentication/util/AuthenticationUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java index e86dd82a0..ce8d27274 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java @@ -112,6 +112,7 @@ public static AuthUser mergeAuthUser(AuthUser low, AuthUser high) { return AuthUser.builder() .uid(high.getUid() != null ? high.getUid() : low.getUid()) .username(high.getUsername() != null ? high.getUsername() : low.getUsername()) + .email(high.getEmail() != null ? high.getEmail() : low.getEmail()) .avatar(high.getAvatar() != null ? high.getAvatar() : low.getAvatar()) .rawUserInfo(high.getRawUserInfo() != null ? high.getRawUserInfo() : low.getRawUserInfo()) .authToken(high.getAuthToken() != null ? high.getAuthToken() : low.getAuthToken()) From db52eb871ddca6944518d2627873158f84b2c59e Mon Sep 17 00:00:00 2001 From: Thomasr Date: Wed, 10 Jul 2024 11:48:38 -0400 Subject: [PATCH 3/6] fix addSuperAdminUser migration issue --- .../org/lowcoder/domain/user/repository/UserRepository.java | 2 +- .../java/org/lowcoder/domain/user/service/UserServiceImpl.java | 2 +- .../lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java index 5a5b7faa6..a966c2be7 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java @@ -21,5 +21,5 @@ public interface UserRepository extends ReactiveMongoRepository { Mono findByName(String rawUuid); //email1 and email2 should be equal - Mono findByEmailOrConnections_Email(String email1, String email2); + Flux findByEmailOrConnections_Email(String email1, String email2); } diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java index 7a86591df..58c2eaf21 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java @@ -113,7 +113,7 @@ public Mono findByName(String rawUuid) { } public Mono findByEmailDeep(String email) { - return repository.findByEmailOrConnections_Email(email, email); + return repository.findByEmailOrConnections_Email(email, email).next(); } @Override diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java index ceeabbf2b..2a664d390 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java +++ b/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(); } From 868af363239b91ca7989797365d3f69075e93411 Mon Sep 17 00:00:00 2001 From: FalkWolsky Date: Wed, 10 Jul 2024 21:36:42 +0200 Subject: [PATCH 4/6] Set preventing of overwriting of styles per app default true --- client/packages/lowcoder/src/comps/comps/appSettingsComp.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/packages/lowcoder/src/comps/comps/appSettingsComp.tsx b/client/packages/lowcoder/src/comps/comps/appSettingsComp.tsx index b77c619ef..d4de3b59f 100644 --- a/client/packages/lowcoder/src/comps/comps/appSettingsComp.tsx +++ b/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(DEFAULT_THEMEID), - preventAppStylesOverwriting: withDefault(BoolControl, false), + preventAppStylesOverwriting: withDefault(BoolControl, true), customShortcuts: CustomShortcutsComp, disableCollision: valueComp(false), }; From 07accad24e45834963770a2df6aa51874100959d Mon Sep 17 00:00:00 2001 From: FalkWolsky Date: Wed, 10 Jul 2024 21:51:03 +0200 Subject: [PATCH 5/6] Updating Product Support Identifier --- client/packages/lowcoder/src/app.tsx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/client/packages/lowcoder/src/app.tsx b/client/packages/lowcoder/src/app.tsx index 7f05c9488..8ad8f32b3 100644 --- a/client/packages/lowcoder/src/app.tsx +++ b/client/packages/lowcoder/src/app.tsx @@ -130,12 +130,16 @@ class AppIndex extends React.Component { // 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 ; + } + 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 ; } // persisting the language in local storage From adfb07d64735332795ec20880894a094c1b638b1 Mon Sep 17 00:00:00 2001 From: FalkWolsky Date: Wed, 10 Jul 2024 22:46:52 +0200 Subject: [PATCH 6/6] Updating Frontend SDK version --- client/packages/lowcoder-sdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/packages/lowcoder-sdk/package.json b/client/packages/lowcoder-sdk/package.json index 305ff0013..f774eebd3 100644 --- a/client/packages/lowcoder-sdk/package.json +++ b/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",