Skip to content

Dev > Main for v2.4.3 #1034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 10, 2024
2 changes: 1 addition & 1 deletion client/packages/lowcoder-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lowcoder-sdk",
"version": "2.4.6",
"version": "2.4.7",
"type": "module",
"files": [
"src",
Expand Down
12 changes: 8 additions & 4 deletions client/packages/lowcoder/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ private AuthUser formulateAuthUser() {
return AuthUser.builder()
.uid(username)
.username(username)
.email(username)
.authContext(authRequestContext)
.build();
}
Expand Down
Loading