Skip to content

Update the branch #484

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.

Sign up for GitHub

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 8 commits into from
Nov 10, 2023
Merged

Update the branch #484

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f3e5322
fix: enable oauth for community
raheeliftikhar5 Nov 6, 2023
e90ae28
Merge pull request #479 from raheeliftikhar5/oauth-updates
FalkWolsky Nov 6, 2023
e659406
fix: update Lowcoder OpenAPI version and make it configurable
ludomikula Nov 6, 2023
beb8290
Make ENV Vars accessible in Web-App
Nov 7, 2023
c49eb8d
Make ENV Vars accessible in Web-App 2
Nov 7, 2023
e8bf78e
fix orgId questionmark in API calls
Nov 7, 2023
32d9889
Merge pull request #480 from lowcoder-org/dev
FalkWolsky Nov 7, 2023
445f960
Merge branch 'agora-integrationn' into main
FalkWolsky Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: enable oauth for community
  • Loading branch information
@raheeliftikhar5
raheeliftikhar5 committed Nov 6, 2023
commit f3e5322a6ac60959cc0943b3ba75e7000a34e967
4 changes: 2 additions & 2 deletions client/packages/lowcoder/src/pages/setting/idSource/list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ export const IdSourceList = (props: any) => {
const enableEnterpriseLogin = useSelector(selectSystemConfig)?.featureFlag?.enableEnterpriseLogin;

useEffect(() => {
if (!currentOrgId || (!isSelfDomain(config) && !isEnterpriseMode(config))) {
if (!currentOrgId) {
return;
}
getConfigs();
}, [currentOrgId]);

if (!currentOrgId || (!isSelfDomain(config) && !isEnterpriseMode(config))) {
if (!currentOrgId) {
return null;
}

Expand Down
9 changes: 2 additions & 7 deletions client/packages/lowcoder/src/pages/setting/settingHome.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,9 @@ export function SettingHome() {
{
key: SettingPageEnum.OAuthProvider,
label: (
<span>
<span className="text">{trans("settings.oauthProviders")}</span>
{(!currentOrgAdmin(user) || (!isSelfDomain(config) && !isEnterpriseMode(config))) && (
<FreeLimitTag text={trans("settings.premium")} />
)}
</span>
<span className="text">{trans("settings.oauthProviders")}</span>
),
disabled: !currentOrgAdmin(user) || (!isSelfDomain(config) && !isEnterpriseMode(config)),
disabled: !currentOrgAdmin(user),
},
{
key: SettingPageEnum.Environments,
Expand Down
4 changes: 2 additions & 2 deletions client/packages/lowcoder/src/pages/userAuth/login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,11 @@ function Login() {
loginCardView = thirdPartyLoginView;
}

const loginHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
const loginHeading = LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
? LOWCODER_CUSTOM_AUTH_WELCOME_TEXT
: getLoginTitle(inviteInfo?.createUserName, systemConfig?.branding?.brandName)

const loginSubHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
const loginSubHeading = LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
? trans("userAuth.poweredByLowcoder")
: ''

Expand Down
4 changes: 2 additions & 2 deletions client/packages/lowcoder/src/pages/userAuth/register.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ function UserRegister() {
return null;
}

const registerHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
const registerHeading = LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
? LOWCODER_CUSTOM_AUTH_WELCOME_TEXT
: trans("userAuth.register")

const registerSubHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
const registerSubHeading = LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
? trans("userAuth.poweredByLowcoder")
: ''

Expand Down