Merge pull request #748 from hms-dbmi-cellenics/remove-ui-hardcodings

[BIOMAGE-1934] Remove account specific hardcodings in the UI code
hms-dbmi-cellenics · Jul 7, 2022 · b44486d · b44486d
2 parents 4071e04 + 05eaedf
commit b44486d
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 55 deletions.
diff --git a/next.config.js b/next.config.js
@@ -107,4 +107,9 @@ module.exports = withPlugins([
     },
   }],
   [css],
+  {
+    publicRuntimeConfig: {
+      domainName: process.env.DOMAIN_NAME,
+    },
+  },
 ], nextConfig);
diff --git a/src/__test__/utils/getAccountId.test.js b/src/__test__/utils/getAccountId.test.js
diff --git a/src/components/data-management/SamplesTable.jsx b/src/components/data-management/SamplesTable.jsx
@@ -31,9 +31,7 @@ import { arrayMoveImmutable } from 'utils/array-move';
 
 import { metadataNameToKey, metadataKeyToName, temporaryMetadataKey } from 'utils/data-management/metadataUtils';
 import integrationTestConstants from 'utils/integrationTestConstants';
-
 import 'utils/css/data-management.css';
-
 import { ClipLoader } from 'react-spinners';
 import useConditionalEffect from 'utils/customHooks/useConditionalEffect';
 import { METADATA_DEFAULT_VALUE } from 'redux/reducers/experiments/initialState';

diff --git a/src/utils/amplify-config.js b/src/utils/amplify-config.js
@@ -1,32 +1,14 @@
-import Environment, { ssrGetCurrentEnvironment } from './environment';
-import getAccountId from './getAccountId';
+import getAWSRegion from './getAWSRegion';
 
 const configure = (userPoolId, identityPoolId, userPoolClientDetails) => {
-  const currentEnvironment = ssrGetCurrentEnvironment();
-  const accountId = getAccountId(currentEnvironment);
-  const bucketName = `biomage-originals-${currentEnvironment}-${accountId}`;
-
-  const storageConfig = {
-    Storage: {
-      AWSS3: {
-        bucket: bucketName,
-        region: 'eu-west-1',
-        dangerouslyConnectToHttpEndpointForTesting: currentEnvironment === Environment.DEVELOPMENT,
-        identityId: identityPoolId,
-        customPrefix: {
-          public: '',
-        },
-      },
-    },
-  };
   const redirectProtocol = (process.env.NODE_ENV === 'development') ? 'http:' : 'https:';
   const usingProtocol = (url) => url.startsWith(redirectProtocol);
   const signInRedirect = userPoolClientDetails.CallbackURLs.filter(usingProtocol)[0];
   const signOutRedirect = userPoolClientDetails.LogoutURLs.filter(usingProtocol)[0];
 
   const authConfig = {
     Auth: {
-      region: 'eu-west-1',
+      region: getAWSRegion(),
       identityPoolId,
       userPoolId,
       userPoolWebClientId: userPoolClientDetails.ClientId,
@@ -45,7 +27,7 @@ const configure = (userPoolId, identityPoolId, userPoolClientDetails) => {
   };
 
   return (
-    { ...authConfig, ...storageConfig }
+    { ...authConfig }
   );
 };
 

diff --git a/src/utils/apiEndpoint.js b/src/utils/apiEndpoint.js
@@ -1,3 +1,5 @@
+import nextConfig from 'next/config';
+
 const getApiEndpoint = (location) => {
   try {
     const url = new URL(location || window.location.href);
@@ -9,8 +11,8 @@ const getApiEndpoint = (location) => {
     if (url.hostname.includes('localhost') || url.hostname.includes('127.0.0.1')) {
       return 'http://localhost:3000';
     }
-
-    return 'https://api.scp.biomage.net';
+    const domainName = nextConfig()?.publicRuntimeConfig?.domainName;
+    return `https://api.${domainName}`;
   } catch (error) {
     console.error('Failed to get API endpoint.');
     console.error(error);

diff --git a/src/utils/getAWSRegion.js b/src/utils/getAWSRegion.js
@@ -0,0 +1,17 @@
+const getAWSRegion = () => {
+  // only works in ssr, where process.env is available
+
+  if (process.env.NODE_ENV === 'development') {
+    return 'eu-west-1';
+  }
+
+  const { AWS_REGION, AWS_DEFAULT_REGION } = process.env;
+
+  if (!AWS_REGION && !AWS_DEFAULT_REGION) {
+    throw new Error('AWS_REGION or DEFAULT_REGION must be set in the environment.');
+  }
+
+  return AWS_REGION || AWS_DEFAULT_REGION;
+};
+
+export default getAWSRegion;
diff --git a/src/utils/getAccountId.js b/src/utils/getAccountId.js
diff --git a/src/utils/ssr/getAuthenticationInfo.js b/src/utils/ssr/getAuthenticationInfo.js
@@ -11,6 +11,7 @@ import {
 } from '@aws-sdk/client-cognito-identity-provider';
 import { getDefaultRoleAssumerWithWebIdentity } from '@aws-sdk/client-sts';
 import { fromTokenFile } from '@aws-sdk/credential-provider-web-identity';
+import getAWSRegion from 'utils/getAWSRegion';
 import configure from '../amplify-config';
 
 const getAuthenticationInfo = async () => {
@@ -19,7 +20,6 @@ const getAuthenticationInfo = async () => {
   if (global.cachedAuthenticationInfo) {
     return global.cachedAuthenticationInfo;
   }
-
   let additionalClientParams = {};
 
   if (process.env.NODE_ENV !== 'development') {
@@ -33,14 +33,14 @@ const getAuthenticationInfo = async () => {
 
   const identityPoolClient = new CognitoIdentityClient(
     {
-      region: 'eu-west-1',
+      region: getAWSRegion(),
       ...additionalClientParams,
     },
   );
 
   const userPoolClient = new CognitoIdentityProviderClient(
     {
-      region: 'eu-west-1',
+      region: getAWSRegion(),
       ...additionalClientParams,
     },
   );
@@ -91,7 +91,7 @@ const getAuthenticationInfo = async () => {
   const amplifyConfig = configure(
     userPoolId,
     identityPoolId,
-    { ...userPoolClientDetails, Domain: `${Domain}.auth.eu-west-1.amazoncognito.com` },
+    { ...userPoolClientDetails, Domain: `${Domain}.auth.${getAWSRegion()}.amazoncognito.com` },
   );
 
   const result = {