From d5990a59a71a14675bb54fcbec535c09e922a19d Mon Sep 17 00:00:00 2001
From: Aditya Kumar <84377163+thakuradi@users.noreply.github.com>
Date: Thu, 28 Nov 2024 17:34:08 +0530
Subject: [PATCH 1/3] Delete
 .github/workflows/azure-static-web-apps-agreeable-grass-0385a320f.yml

---
 ...tic-web-apps-agreeable-grass-0385a320f.yml | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 .github/workflows/azure-static-web-apps-agreeable-grass-0385a320f.yml

diff --git a/.github/workflows/azure-static-web-apps-agreeable-grass-0385a320f.yml b/.github/workflows/azure-static-web-apps-agreeable-grass-0385a320f.yml
deleted file mode 100644
index d9a4265..0000000
--- a/.github/workflows/azure-static-web-apps-agreeable-grass-0385a320f.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: Azure Static Web Apps CI/CD
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    types: [opened, synchronize, reopened, closed]
-    branches:
-      - main
-
-jobs:
-  build_and_deploy_job:
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
-    runs-on: ubuntu-latest
-    name: Build and Deploy Job
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-          lfs: false
-      - name: Build And Deploy
-        id: builddeploy
-        uses: Azure/static-web-apps-deploy@v1
-        with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_GRASS_0385A320F }}
-          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
-          action: "upload"
-          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
-          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
-          app_location: "/" # App source code path
-          api_location: "" # Api source code path - optional
-          output_location: "" # Built app content directory - optional
-          ###### End of Repository/Build Configurations ######
-
-  close_pull_request_job:
-    if: github.event_name == 'pull_request' && github.event.action == 'closed'
-    runs-on: ubuntu-latest
-    name: Close Pull Request Job
-    steps:
-      - name: Close Pull Request
-        id: closepullrequest
-        uses: Azure/static-web-apps-deploy@v1
-        with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_GRASS_0385A320F }}
-          action: "close"

From 71f607e990599a3c214222ffd74f0f80ddcb6f68 Mon Sep 17 00:00:00 2001
From: Aditya Kumar <84377163+thakuradi@users.noreply.github.com>
Date: Thu, 28 Nov 2024 17:41:55 +0530
Subject: [PATCH 2/3] ci: add Azure Static Web Apps workflow file on-behalf-of:
 @Azure opensource@microsoft.com

---
 ...-static-web-apps-brave-stone-00624df0f.yml | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 .github/workflows/azure-static-web-apps-brave-stone-00624df0f.yml

diff --git a/.github/workflows/azure-static-web-apps-brave-stone-00624df0f.yml b/.github/workflows/azure-static-web-apps-brave-stone-00624df0f.yml
new file mode 100644
index 0000000..a0909d6
--- /dev/null
+++ b/.github/workflows/azure-static-web-apps-brave-stone-00624df0f.yml
@@ -0,0 +1,46 @@
+name: Azure Static Web Apps CI/CD
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - main
+
+jobs:
+  build_and_deploy_job:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+          lfs: false
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_STONE_00624DF0F }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: "upload"
+          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: "/src" # App source code path
+          api_location: "" # Api source code path - optional
+          output_location: "" # Built app content directory - optional
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_STONE_00624DF0F }}
+          action: "close"

From 15264aaa41e2b32a12ab8d6627ab461cd46cbb54 Mon Sep 17 00:00:00 2001
From: Aditya Kumar <84377163+thakuradi@users.noreply.github.com>
Date: Thu, 28 Nov 2024 17:44:48 +0530
Subject: [PATCH 3/3] ci: add Azure Static Web Apps workflow file on-behalf-of:
 @Azure opensource@microsoft.com

---
 ...e-static-web-apps-brave-stone-00624df0f.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/azure-static-web-apps-brave-stone-00624df0f.yml b/.github/workflows/azure-static-web-apps-brave-stone-00624df0f.yml
index a0909d6..4731e9a 100644
--- a/.github/workflows/azure-static-web-apps-brave-stone-00624df0f.yml
+++ b/.github/workflows/azure-static-web-apps-brave-stone-00624df0f.yml
@@ -14,23 +14,36 @@ jobs:
     if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
     runs-on: ubuntu-latest
     name: Build and Deploy Job
+    permissions:
+       id-token: write
+       contents: read
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: true
           lfs: false
+      - name: Install OIDC Client from Core Package
+        run: npm install @actions/core@1.6.0 @actions/http-client
+      - name: Get Id Token
+        uses: actions/github-script@v6
+        id: idtoken
+        with:
+           script: |
+               const coredemo = require('@actions/core')
+               return await coredemo.getIDToken()
+           result-encoding: string
       - name: Build And Deploy
         id: builddeploy
         uses: Azure/static-web-apps-deploy@v1
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_STONE_00624DF0F }}
-          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
           action: "upload"
           ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
           # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
-          app_location: "/src" # App source code path
+          app_location: "/" # App source code path
           api_location: "" # Api source code path - optional
           output_location: "" # Built app content directory - optional
+          github_id_token: ${{ steps.idtoken.outputs.result }}
           ###### End of Repository/Build Configurations ######
 
   close_pull_request_job:
@@ -42,5 +55,4 @@ jobs:
         id: closepullrequest
         uses: Azure/static-web-apps-deploy@v1
         with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_STONE_00624DF0F }}
           action: "close"