received failed login error -- added dedicated login step

Smithsonian · Jun 21, 2024 · c255060 · c255060
1 parent 30b40d3
commit c255060
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/.github/workflows/main-forestgeo-livesite.yml b/.github/workflows/main-forestgeo-livesite.yml
@@ -29,6 +29,7 @@ jobs:
           echo AZURE_AD_CLIENT_SECRET=${{ secrets.AZURE_AD_CLIENT_SECRET }} >> frontend/.env
           echo AZURE_AD_CLIENT_ID=${{ secrets.AZURE_AD_CLIENT_ID }} >> frontend/.env
           echo AZURE_AD_TENANT_ID=${{ secrets.AZURE_AD_TENANT_ID }} >> frontend/.env
+          echo AZURE_AD_SUBSCRIPTION_ID=${{ secrets.AZURE_AD_SUBSCRIPTION_ID }} >> frontend/.env
           echo NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }} >> frontend/.env
           echo NEXTAUTH_URL=${{ secrets.NEXTAUTH_URL }} >> frontend/.env
           echo AZURE_SQL_USER=${{ secrets.AZURE_SQL_USER }} >> frontend/.env
@@ -59,9 +60,10 @@ jobs:
         uses: actions/cache@v2
         with:
           path: frontend/.next/cache
-          key: ${{ runner.os }}-next-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-next-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/.next/cache') }}
           restore-keys: |
             ${{ runner.os }}-next-
+            ${{ runner.os }}-next-${{ hashFiles('**/package-lock.json') }}
 
       - name: move into frontend --> npm install, build, and test
         run: |
@@ -76,15 +78,13 @@ jobs:
           mv ./frontend/public ./frontend/build/standalone
           mv ./frontend/*.pem ./frontend/build/standalone/
 
-      - name: 'Deploy to Azure Web App (main)'
-        id: deploy-to-webapp-main
-        if: github.ref == 'refs/heads/main'
-        uses: azure/webapps-deploy@v2
+      - name: 'Login to Azure'
+        uses: azure/login@v1
         with:
-          app-name: 'forestgeo-livesite'
-          slot-name: 'Production'
-          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_852346BD764D45D08854E6679137F844 }}
-          package: ./frontend/build/standalone
+          client-id: ${{ secrets.AZURE_AD_CLIENT_ID }}
+          client-secret: ${{ secrets.AZURE_AD_CLIENT_SECRET }}
+          tenant-id: ${{ secrets.AZURE_AD_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_AD_SUBSCRIPTION_ID }}
 
       - name: 'Deploy to Azure Web App (development)'
         id: deploy-to-webapp-dev