Refactor code to improve performance and readability

zepor · Dec 20, 2023 · 2102fe0 · 2102fe0
1 parent 842c10e
commit 2102fe0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/.github/workflows/be.yaml b/.github/workflows/be.yaml
@@ -23,10 +23,9 @@ jobs:
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
       - name: Build and push image to ACR
-        env:
-          VITE_COGNITO_USER_POOL_ID: ${{ secrets.VITE_COGNITO_USER_POOL_ID }}
-          VITE_COGNITO_CLIENT_ID: ${{ secrets.VITE_COGNITO_CLIENT_ID }}
         run: |
+          export VITE_COGNITO_USER_POOL_ID=${{ secrets.VITE_COGNITO_USER_POOL_ID }}
+          export VITE_COGNITO_CLIENT_ID=${{ secrets.VITE_COGNITO_CLIENT_ID }}
           az acr build --image be:${{ github.sha }} --registry ${{ secrets.AZURE_CONTAINER_REGISTRY }} -g ${{ secrets.ACR_RESOURCE_GROUP }} -f backend-container/Dockerfile.python backend-container/
           az acr build --image be:latest --registry ${{ secrets.AZURE_CONTAINER_REGISTRY }} -g ${{ secrets.ACR_RESOURCE_GROUP }} -f backend-container/Dockerfile.python backend-container/
 

diff --git a/.github/workflows/fe.yaml b/.github/workflows/fe.yaml
@@ -23,10 +23,9 @@ jobs:
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
       - name: Build and push image to ACR
-        env:
-          VITE_COGNITO_USER_POOL_ID: ${{ secrets.VITE_COGNITO_USER_POOL_ID }}
-          VITE_COGNITO_CLIENT_ID: ${{ secrets.VITE_COGNITO_CLIENT_ID }}
         run: |
+          export VITE_COGNITO_USER_POOL_ID=${{ secrets.VITE_COGNITO_USER_POOL_ID }}
+          export VITE_COGNITO_CLIENT_ID=${{ secrets.VITE_COGNITO_CLIENT_ID }}
           az acr build --image fe:${{ github.sha }} --registry ${{ secrets.AZURE_CONTAINER_REGISTRY }} -g ${{ secrets.ACR_RESOURCE_GROUP }} -f frontend-container/Dockerfile.Prod frontend-container/
           az acr build --image fe:latest --registry ${{ secrets.AZURE_CONTAINER_REGISTRY }} -g ${{ secrets.ACR_RESOURCE_GROUP }} -f frontend-container/Dockerfile.Prod frontend-container/
   deploy:

diff --git a/frontend-container/src/contexts/CognitoProvider.jsx b/frontend-container/src/contexts/CognitoProvider.jsx
@@ -6,15 +6,27 @@ import {
   CognitoUserPool,
 } from "amazon-cognito-identity-js";
 import axios from "../utils/axios";
-import { cognitoConfig } from "../config";
+import { cognitoConfig as devCognitoConfig } from "../config";
 import AuthContext from "./CognitoContext";
 
 const INITIALIZE = "INITIALIZE";
 const SIGN_OUT = "SIGN_OUT";
 
+// Function to get Cognito configuration
+const getCognitoConfig = () => {
+  const userPoolId =
+    process.env.VITE_COGNITO_USER_POOL_ID || devCognitoConfig.userPoolId;
+  const clientId =
+    process.env.VITE_COGNITO_CLIENT_ID || devCognitoConfig.clientId;
+
+  return { userPoolId, clientId };
+};
+
+const { userPoolId, clientId } = getCognitoConfig();
+
 const UserPool = new CognitoUserPool({
-  UserPoolId: cognitoConfig.userPoolId || "",
-  ClientId: cognitoConfig.clientId || "",
+  UserPoolId: userPoolId || "",
+  ClientId: clientId || "",
 });
 
 const initialState = {