Fix auth error infinite loop

dekart-xyz · Dec 6, 2023 · 1192b2e · 1192b2e
1 parent 95f97b6
commit 1192b2e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -15,13 +15,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Check out the repo
-        uses: actions/checkout@v2
-      - name: Create .npmrc
-        run: |
-          echo "//npm.pkg.github.com/:_authToken=${{ secrets.NPM_GH_TOKEN }}" > .npmrc
-          echo "@dekart-xyz:registry=https://npm.pkg.github.com" >> .npmrc
-      - name: Set up QEMU
+    - name: Check out the repo
+      uses: actions/checkout@v2
+    - name: Create .npmrc
+      run: |
+        echo "//npm.pkg.github.com/:_authToken=${{ secrets.NPM_GH_TOKEN }}" > .npmrc
+        echo "@dekart-xyz:registry=https://npm.pkg.github.com" >> .npmrc
+    - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2

diff --git a/src/client/App.js b/src/client/App.js
@@ -61,6 +61,7 @@ function AppRedirect () {
   }, [status, doNotAuthenticate])
 
   if (status === 401 && doNotAuthenticate === false) {
+    // redirect to authentication endpoint from useEffect
     return null
   }
 

diff --git a/src/client/actions/message.js b/src/client/actions/message.js
@@ -51,8 +51,8 @@ export function setError (err, transitive = true) {
   }
 }
 
-export function setHttpError (status, message = '', doNotAuthenticate = false) {
-  return { type: setHttpError.name, status, message, doNotAuthenticate }
+export function setHttpError (status, message = '') {
+  return { type: setHttpError.name, status, message}
 }
 
 export function setStreamError (code, msg) {

diff --git a/src/client/reducers/rootReducer.js b/src/client/reducers/rootReducer.js
@@ -288,12 +288,18 @@ function env (state = defaultEnv, action) {
 
 function httpError (state = {}, action) {
   switch (action.type) {
-    case setHttpError.name:
-      return {
-        status: action.status,
-        message: action.message,
-        doNotAuthenticate: action.doNotAuthenticate
+    case setHttpError.name: {
+      if (action.status === 401 && state.doNotAuthenticate) {
+        // just keep showing auth error, do not override it with other 401
+        return state
+      } else {
+        return {
+          status: action.status,
+          message: action.message,
+          doNotAuthenticate: false
+        }
       }
+    }
     case setRedirectState.name: {
       const err = action.redirectState.getError()
       if (err) {