Skip to content
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

Jump to bottom

[FIX] Create Custom OAuth services from environment variables #17377

Merged
merged 7 commits into from
Sep 8, 2020
Merged

[FIX] Create Custom OAuth services from environment variables #17377

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e88f0b6
Add and run function that creates Custom OAuth services from environm…
Apr 20, 2020
2f6c7e9
Merge branch 'develop' into 10420-create-oauth-config-from-env-variables
mrtndwrd Apr 21, 2020
529438a
Merge branch 'develop' into 10420-create-oauth-config-from-env-variables
Apr 28, 2020
963040b
Merge branch '10420-create-oauth-config-from-env-variables' of github…
Apr 28, 2020
e9eaa3c
Merge branch 'develop' into 10420-create-oauth-config-from-env-variables
May 7, 2020
f6067be
Merge branch 'develop' into 10420-create-oauth-config-from-env-variables
May 14, 2020
e6094d6
Merge branch 'develop' into 10420-create-oauth-config-from-env-variables
mrtndwrd Aug 28, 2020
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
12 changes: 12 additions & 0 deletions app/lib/server/startup/oAuthServicesUpdate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,15 @@ settings.get(/^Accounts_OAuth_Custom-[a-z0-9_]+/, function(key, value) {
return OAuthServicesRemove(key);// eslint-disable-line new-cap
}
});

function customOAuthServicesInit() {
// Add settings for custom OAuth providers to the settings so they get
// automatically added when they are defined in ENV variables
Object.keys(process.env).forEach((key) => {
if (/Accounts_OAuth_Custom-[a-zA-Z0-9_-]+$/.test(key)) {
settings.add(key, process.env[key]);
}
});
}

customOAuthServicesInit();