Merge pull request #46 from dadosfera/alpha

Alpha

.github/workflows/deploy.yml

@@ -7,22 +7,6 @@ on:
       - main
 
 jobs:
-  extract_environment:
-    runs-on: ubuntu-latest
-    outputs:
-      environment: ${{ steps.extract_environment.outputs.environment }}
-    steps:
-      - name: Extract Environment
-        run: |
-          if [ ${GITHUB_REF} == "refs/heads/main" ]; then
-            echo "##[set-output name=environment;]$(echo "prd")"
-          elif [ ${GITHUB_REF} == "refs/heads/alpha" ]; then
-            echo "##[set-output name=environment;]$(echo "dev")"
-          elif [ ${GITHUB_REF} == "refs/heads/beta" ]; then
-            echo "##[set-output name=environment;]$(echo "stg")"
-          fi
-        id: extract_environment
-
   deploy:
     runs-on: self-hosted
     steps:

src/middlewares/authentication.ts

@@ -95,31 +95,29 @@ const verifyToken = async (accessToken: string) => {
 
   try {
     await setUp(awsRegion, awsPoolId);
-    if (!accessToken) {
-      throw new UnauthorizedException();
-    }
+    if (accessToken) {
+      const user: any = decode(accessToken, { complete: true });
 
-    const user: any = decode(accessToken, { complete: true });
-
-    if (user === null) {
-      throw new UnauthorizedException();
-    }
-
-    const { kid } = user.header;
-    const pem = pems.filter((item: any) => item[kid]);
-    const pemValue: any = pem[0][kid];
-
-    if (!pem) {
-      throw new UnauthorizedException();
-    }
-
-    verify(accessToken, pemValue, (err: any) => {
-      if (err) {
+      if (user === null) {
         throw new UnauthorizedException();
       }
 
-      return;
-    });
+      const { kid } = user.header;
+      const pem = pems.filter((item: any) => item[kid]);
+      const pemValue: any = pem[0][kid];
+
+      if (!pem) {
+        throw new UnauthorizedException();
+      }
+
+      verify(accessToken, pemValue, (err: any) => {
+        if (err) {
+          throw new UnauthorizedException();
+        }
+
+        return;
+      });
+    }
   } catch (error) {
     throw new UnauthorizedException();
   }