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.

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

changing web app settings to use custom domain #925

Merged
merged 2 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions code/development-env/config/local/web_auth_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"redirect_uri": "https://testlab.datalabs.localhost/callback",
"response_type": "code",
"scope": "openid profile",
"authority": "https://mjbr.eu.auth0.com",
"authority": "https://login.datalabs.ceh.ac.uk",
"automaticSilentRenew": true,
"accessTokenExpiringNotificationTime": 600,
"filterProtocolClaims": true,
Expand All @@ -14,12 +14,12 @@
"audience": "https://datalab.datalabs.nerc.ac.uk/api"
},
"metadata": {
"issuer": "https://mjbr.eu.auth0.com/",
"authorization_endpoint": "https://mjbr.eu.auth0.com/authorize",
"userinfo_endpoint": "https://mjbr.eu.auth0.com/userinfo",
"end_session_endpoint": "https://mjbr.eu.auth0.com/v2/logout?returnTo=https://testlab.datalabs.localhost/&client_id=Xf62MEzjqxfaId1DVWnFul61D9oA3eMt",
"jwks_uri": "https://mjbr.eu.auth0.com/.well-known/jwks.json",
"token_endpoint": "https://mjbr.eu.auth0.com/oauth/token"
"issuer": "https://login.datalabs.ceh.ac.uk/",
"authorization_endpoint": "https://login.datalabs.ceh.ac.uk/authorize",
"userinfo_endpoint": "https://login.datalabs.ceh.ac.uk/userinfo",
"end_session_endpoint": "https://login.datalabs.ceh.ac.uk/v2/logout?returnTo=https://testlab.datalabs.localhost/&client_id=Xf62MEzjqxfaId1DVWnFul61D9oA3eMt",
"jwks_uri": "https://login.datalabs.ceh.ac.uk/.well-known/jwks.json",
"token_endpoint": "https://login.datalabs.ceh.ac.uk/oauth/token"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

exports[`getOidcConfig returns config from environment to match snapshot when configuration endpoint requests fail 1`] = `
Object {
"issuer": "https://mjbr.eu.auth0.com/",
"jwks_uri": "https://mjbr.eu.auth0.com/.well-known/jwks.json",
"token_endpoint": "https://mjbr.eu.auth0.com/oauth/token",
"issuer": "https://login.datalabs.ceh.ac.uk/",
"jwks_uri": "https://login.datalabs.ceh.ac.uk/.well-known/jwks.json",
"token_endpoint": "https://login.datalabs.ceh.ac.uk/oauth/token",
}
`;
2 changes: 1 addition & 1 deletion code/workspaces/auth-service/src/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const config = convict({
oidcProviderDomain: {
doc: 'URL of the OpenID Connect provider domain',
format: 'String',
default: 'mjbr.eu.auth0.com',
default: 'login.datalabs.ceh.ac.uk',
env: 'OIDC_PROVIDER_DOMAIN',
},
oidcProviderAudience: {
Expand Down
14 changes: 7 additions & 7 deletions code/workspaces/common/src/config/web_auth_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"redirect_uri": "https://testlab.datalabs.localhost/callback",
"response_type": "code",
"scope": "openid profile",
"authority": "https://mjbr.eu.auth0.com",
"authority": "https://login.datalabs.ceh.ac.uk",
"automaticSilentRenew": true,
"filterProtocolClaims": true,
"loadUserInfo": true,
"extraQueryParams": {
"audience": "https://datalab.datalabs.nerc.ac.uk/api"
},
"metadata": {
"issuer": "https://mjbr.eu.auth0.com/",
"authorization_endpoint": "https://mjbr.eu.auth0.com/authorize",
"userinfo_endpoint": "https://mjbr.eu.auth0.com/userinfo",
"end_session_endpoint": "https://mjbr.eu.auth0.com/v2/logout?returnTo=https://testlab.datalabs.localhost/&client_id=Xf62MEzjqxfaId1DVWnFul61D9oA3eMt",
"jwks_uri": "https://mjbr.eu.auth0.com/.well-known/jwks.json",
"token_endpoint": "https://mjbr.eu.auth0.com/oauth/token"
"issuer": "https://login.datalabs.ceh.ac.uk/",
"authorization_endpoint": "https://login.datalabs.ceh.ac.uk/authorize",
"userinfo_endpoint": "https://login.datalabs.ceh.ac.uk/userinfo",
"end_session_endpoint": "https://login.datalabs.ceh.ac.uk/v2/logout?returnTo=https://testlab.datalabs.localhost/&client_id=Xf62MEzjqxfaId1DVWnFul61D9oA3eMt",
"jwks_uri": "https://login.datalabs.ceh.ac.uk/.well-known/jwks.json",
"token_endpoint": "https://login.datalabs.ceh.ac.uk/oauth/token"
}
}
},
Expand Down
14 changes: 7 additions & 7 deletions code/workspaces/web-app/public/web_auth_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
"redirect_uri": "https://testlab.datalabs.localhost/callback",
"response_type": "code",
"scope": "openid profile",
"authority": "https://mjbr.eu.auth0.com",
"authority": "https://login.datalabs.ceh.ac.uk",
"automaticSilentRenew": true,
"filterProtocolClaims": true,
"loadUserInfo": true,
"extraQueryParams": {
"audience": "https://datalab.datalabs.nerc.ac.uk/api"
},
"metadata": {
"issuer": "https://mjbr.eu.auth0.com/",
"authorization_endpoint": "https://mjbr.eu.auth0.com/authorize",
"userinfo_endpoint": "https://mjbr.eu.auth0.com/userinfo",
"end_session_endpoint": "https://mjbr.eu.auth0.com/v2/logout?returnTo=https://testlab.datalabs.localhost/&client_id=Xf62MEzjqxfaId1DVWnFul61D9oA3eMt",
"jwks_uri": "https://mjbr.eu.auth0.com/.well-known/jwks.json",
"token_endpoint": "https://mjbr.eu.auth0.com/oauth/token"
"issuer": "https://login.datalabs.ceh.ac.uk/",
"authorization_endpoint": "https://login.datalabs.ceh.ac.uk/authorize",
"userinfo_endpoint": "https://login.datalabs.ceh.ac.uk/userinfo",
"end_session_endpoint": "https://login.datalabs.ceh.ac.uk/v2/logout?returnTo=https://testlab.datalabs.localhost/&client_id=Xf62MEzjqxfaId1DVWnFul61D9oA3eMt",
"jwks_uri": "https://login.datalabs.ceh.ac.uk/.well-known/jwks.json",
"token_endpoint": "https://login.datalabs.ceh.ac.uk/oauth/token"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`auth returns correct configuration 1`] = `
Object {
"oidc": Object {
"userManager": Object {
"authority": "https://mjbr.eu.auth0.com",
"authority": "https://login.datalabs.ceh.ac.uk",
"automaticSilentRenew": true,
"client_id": "Xf62MEzjqxfaId1DVWnFul61D9oA3eMt",
"extraQueryParams": Object {
Expand All @@ -13,12 +13,12 @@ Object {
"filterProtocolClaims": true,
"loadUserInfo": true,
"metadata": Object {
"authorization_endpoint": "https://mjbr.eu.auth0.com/authorize",
"end_session_endpoint": "https://mjbr.eu.auth0.com/v2/logout?returnTo=https://testlab.datalabs.localhost/&client_id=Xf62MEzjqxfaId1DVWnFul61D9oA3eMt",
"issuer": "https://mjbr.eu.auth0.com/",
"jwks_uri": "https://mjbr.eu.auth0.com/.well-known/jwks.json",
"token_endpoint": "https://mjbr.eu.auth0.com/oauth/token",
"userinfo_endpoint": "https://mjbr.eu.auth0.com/userinfo",
"authorization_endpoint": "https://login.datalabs.ceh.ac.uk/authorize",
"end_session_endpoint": "https://login.datalabs.ceh.ac.uk/v2/logout?returnTo=https://testlab.datalabs.localhost/&client_id=Xf62MEzjqxfaId1DVWnFul61D9oA3eMt",
"issuer": "https://login.datalabs.ceh.ac.uk/",
"jwks_uri": "https://login.datalabs.ceh.ac.uk/.well-known/jwks.json",
"token_endpoint": "https://login.datalabs.ceh.ac.uk/oauth/token",
"userinfo_endpoint": "https://login.datalabs.ceh.ac.uk/userinfo",
},
"redirect_uri": "http://localhost/callback",
"response_type": "code",
Expand Down
Loading