toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7086 from mattermost/MM-49868_revert_mentions_of_free_oauth

Browse source 
MM-49868: Remove mentions of Free OAuth in OpenID-Connect section
This commit is contained in:
Shivashis Padhi 2023-02-07 20:23:53 +05:30 committed by GitHub
commit 7158de8d5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/utils/server/index.ts
View file

@ -60,11 +60,11 @@ export function loginOptions(config: ClientConfig, license: ClientLicense) {
const isLicensed = license.IsLicensed === 'true';
const samlEnabled = config.EnableSaml === 'true' && isLicensed && license.SAML === 'true';
const gitlabEnabled = config.EnableSignUpWithGitLab === 'true';
const isMinServerVersionForFreeOAuth = isMinimumServerVersion(config.Version, 7, 6);
const isMinServerVersionForCloudOAuthChanges = isMinimumServerVersion(config.Version, 7, 6);
let googleEnabled = false;
let o365Enabled = false;
let openIdEnabled = false;
if (isMinServerVersionForFreeOAuth) {
if (isMinServerVersionForCloudOAuthChanges) {
googleEnabled = config.EnableSignUpWithGoogle === 'true';
o365Enabled = config.EnableSignUpWithOffice365 === 'true';
openIdEnabled = config.EnableSignUpWithOpenId === 'true';