oauth in storage

This commit is contained in:
Jan Prochazka
2024-07-30 17:30:45 +02:00
parent 4c5da50a04
commit 33cd3b0647
3 changed files with 17 additions and 5 deletions

View File

@@ -35,6 +35,10 @@ class AuthProviderBase {
isLoginForm() { isLoginForm() {
return false; return false;
} }
getAdditionalConfigProps() {
return {};
}
} }
class OAuthProvider extends AuthProviderBase { class OAuthProvider extends AuthProviderBase {
@@ -92,6 +96,15 @@ class OAuthProvider extends AuthProviderBase {
return { error: 'Token not found' }; return { error: 'Token not found' };
} }
getAdditionalConfigProps() {
return {
oauth: process.env.OAUTH_AUTH,
oauthClient: process.env.OAUTH_CLIENT_ID,
oauthScope: process.env.OAUTH_SCOPE,
oauthLogout: process.env.OAUTH_LOGOUT,
};
}
} }
class ADProvider extends AuthProviderBase { class ADProvider extends AuthProviderBase {
@@ -176,7 +189,7 @@ function detectEnvAuthProvider() {
if (process.env.AUTH_PROVIDER) { if (process.env.AUTH_PROVIDER) {
return process.env.AUTH_PROVIDER; return process.env.AUTH_PROVIDER;
} }
if (process.env.STORAGE_DATABASE) { if (process.env.STORAGE_DATABASE) {
return 'denyall'; return 'denyall';
} }

View File

@@ -32,6 +32,7 @@ module.exports = {
const login = authProvider.getCurrentLogin(req); const login = authProvider.getCurrentLogin(req);
const permissions = authProvider.getCurrentPermissions(req); const permissions = authProvider.getCurrentPermissions(req);
const isLoginForm = authProvider.isLoginForm(); const isLoginForm = authProvider.isLoginForm();
const additionalConfigProps = authProvider.getAdditionalConfigProps();
return { return {
runAsPortal: !!connections.portalConnections, runAsPortal: !!connections.portalConnections,
@@ -43,10 +44,7 @@ module.exports = {
isDocker: platformInfo.isDocker, isDocker: platformInfo.isDocker,
permissions, permissions,
login, login,
oauth: process.env.OAUTH_AUTH, ...additionalConfigProps,
oauthClient: process.env.OAUTH_CLIENT_ID,
oauthScope: process.env.OAUTH_SCOPE,
oauthLogout: process.env.OAUTH_LOGOUT,
isLoginForm, isLoginForm,
isAdminLoginForm: !!(process.env.STORAGE_DATABASE && process.env.ADMIN_PASSWORD && !process.env.BASIC_AUTH), isAdminLoginForm: !!(process.env.STORAGE_DATABASE && process.env.ADMIN_PASSWORD && !process.env.BASIC_AUTH),
storageDatabase: process.env.STORAGE_DATABASE, storageDatabase: process.env.STORAGE_DATABASE,

View File

@@ -32,6 +32,7 @@
display: flex; display: flex;
flex: 1; flex: 1;
position: relative; position: relative;
max-height: 100%;
} }
.toolstrip { .toolstrip {