Merge pull request #925 from NERC-CEH/ed-37-web-app-use-custom-domain

changing web app settings to use custom domain
NERC-CEH · Nov 17, 2023 · 30824e9 · 30824e9
2 parents eb0e7a6 + 0b65e7d
commit 30824e9
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 32 deletions.
diff --git a/code/development-env/config/local/web_auth_config.json b/code/development-env/config/local/web_auth_config.json
@@ -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,
@@ -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"
       }
     }
   },

diff --git a/code/workspaces/auth-service/src/config/__snapshots__/oidcConfig.spec.js.snap b/code/workspaces/auth-service/src/config/__snapshots__/oidcConfig.spec.js.snap
@@ -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",
 }
 `;
diff --git a/code/workspaces/auth-service/src/config/config.js b/code/workspaces/auth-service/src/config/config.js
@@ -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: {

diff --git a/code/workspaces/common/src/config/web_auth_config.json b/code/workspaces/common/src/config/web_auth_config.json
@@ -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"
       }
     }
   },

diff --git a/code/workspaces/web-app/public/web_auth_config.json b/code/workspaces/web-app/public/web_auth_config.json
@@ -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"
       }
     }
   },

diff --git a/code/workspaces/web-app/src/config/__snapshots__/auth.spec.js.snap b/code/workspaces/web-app/src/config/__snapshots__/auth.spec.js.snap
@@ -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 {
@@ -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",