Merge pull request #63 from deepali-chavhan/develop

fix: Added secret key in env and remove from code
transform1234 · Sep 9, 2024 · 9062a37 · 9062a37
2 parents 617f968 + e921f55
commit 9062a37
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 12 deletions.
diff --git a/packages/common-lib/.env.development b/packages/common-lib/.env.development
@@ -1,3 +1,4 @@
 REACT_APP_OAUTH_PROXY_ENABLED=false
 REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
-REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
+REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
+REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
diff --git a/packages/common-lib/.env.production b/packages/common-lib/.env.production
@@ -1,3 +1,4 @@
 REACT_APP_OAUTH_PROXY_ENABLED=false
 REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
-REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
+REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
+REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
diff --git a/packages/common-lib/src/services/Auth.ts b/packages/common-lib/src/services/Auth.ts
@@ -3,14 +3,15 @@ import axios from 'axios'
 export function fetchToken(
   authUrl: string,
   username: string,
-  password: string
+  password: string,
+  secret_key:string
 ): Promise<any> {
   const params = new URLSearchParams()
   params.append('client_id', 'hasura-app')
   params.append('username', username)
   params.append('password', password)
   params.append('grant_type', 'password')
-  params.append('client_secret', '9ca6e96d-f72e-4208-91f4-a2d8e681f767')
+  params.append('client_secret', secret_key)
 
   const config = {
     headers: {

diff --git a/packages/core/.env.development b/packages/core/.env.development
@@ -1,4 +1,5 @@
 REACT_APP_OAUTH_PROXY_ENABLED=false
 REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
 REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
-REACT_APP_AUTH_URL="https://alt-dev.uniteframework.io/auth/realms/hasura-app/protocol/openid-connect/token"
+REACT_APP_AUTH_URL="https://alt-dev.uniteframework.io/auth/realms/hasura-app/protocol/openid-connect/token"
+REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
diff --git a/packages/core/.env.production b/packages/core/.env.production
@@ -1,4 +1,5 @@
 REACT_APP_OAUTH_PROXY_ENABLED=false
 REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
 REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
-REACT_APP_AUTH_URL="https://alt-dev.uniteframework.io/auth/realms/hasura-app/protocol/openid-connect/token"
+REACT_APP_AUTH_URL="https://alt-dev.uniteframework.io/auth/realms/hasura-app/protocol/openid-connect/token"
+REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
diff --git a/packages/core/src/pages/Login.js b/packages/core/src/pages/Login.js
@@ -75,7 +75,8 @@ export default function Login({ swPath }) {
       const result = await fetchToken(
         process.env.REACT_APP_AUTH_URL,
         credentials?.username,
-        credentials?.password
+        credentials?.password,
+        process.env.REACT_APP_SECRET_KEY
       );
       if (result?.data) {
         let token = result.data.access_token;

diff --git a/packages/core/src/pages/StudentLogin.js b/packages/core/src/pages/StudentLogin.js
@@ -186,7 +186,8 @@ export default function StudentLogin({ swPath }) {
       const result = await fetchToken(
         process.env.REACT_APP_AUTH_URL,
         credentials?.username,
-        credentials?.password
+        credentials?.password,
+        process.env.REACT_APP_SECRET_KEY
       );
 
       if (result?.data) {

diff --git a/packages/student-app/.env.development b/packages/student-app/.env.development
@@ -1,3 +1,4 @@
 REACT_APP_OAUTH_PROXY_ENABLED=false
 REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
-REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
+REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
+REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
diff --git a/packages/student-app/.env.production b/packages/student-app/.env.production
@@ -1,3 +1,4 @@
 REACT_APP_OAUTH_PROXY_ENABLED=false
 REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
-REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
+REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
+REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
diff --git a/packages/student-app/src/App.js b/packages/student-app/src/App.js
@@ -79,7 +79,7 @@ function App() {
               headers: {
                 "Content-Type": "application/x-www-form-urlencoded",
               },
-              body: `client_id=hasura-app&token=${refreshToken}&client_secret=9ca6e96d-f72e-4208-91f4-a2d8e681f767`,
+              body: `client_id=hasura-app&token=${refreshToken}&client_secret=${process.env.REACT_APP_SECRET_KEY}`,
             }
           );
           console.log("REFRESH check");

diff --git a/packages/student-app/src/api's/getNewAccessToken.jsx b/packages/student-app/src/api's/getNewAccessToken.jsx
@@ -11,7 +11,7 @@ const getNewAccessToken = async () => {
         client_id: "hasura-app",
         refresh_token: token,
         grant_type: "refresh_token",
-        client_secret: "9ca6e96d-f72e-4208-91f4-a2d8e681f767",
+        client_secret: process.env.REACT_APP_SECRET_KEY,
       })
     );