Merge branch 'dev' into release/mui-v6

etn-ccis · Dec 18, 2024 · 93a3394 · 93a3394
2 parents 2e4ecef + 2ae6cf9
commit 93a3394
Show file tree

Hide file tree

Showing 7 changed files with 650 additions and 552 deletions.
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -2,16 +2,24 @@
 # https://github.com/firebase/firebase-tools
 
 name: Deploy to Firebase Hosting on merge
-'on':
-    push:
-        branches:
-            - master
+on:
+  push:
+    branches:
+      - master
+
+permissions:
+  pull-requests: write
+  contents: read
+  checks: write
+
 jobs:
     build_and_deploy:
         runs-on: ubuntu-latest
+        env:
+          OKTA_APP_ISSUER: ${{secrets.OKTA_APP_ISSUER}}
         steps:
-            - uses: actions/checkout@v2
-            - run: cd login-workflow && yarn install:dependencies && yarn link:workflow && cd example && yarn && yarn build
+            - uses: actions/checkout@v4
+            - run: cd login-workflow && yarn install:dependencies && yarn link:workflow && cd example && yarn && echo "${{ secrets.OKTA_APP_ISSUER }}" > .env.local && yarn build
             - uses: FirebaseExtended/action-hosting-deploy@v0
               with:
                   entryPoint: './login-workflow'

diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -2,14 +2,23 @@
 # https://github.com/firebase/firebase-tools
 
 name: Deploy to Firebase Hosting on PR
-'on': pull_request
+
+on: pull_request
+
+permissions:
+  pull-requests: write
+  contents: read
+  checks: write
+
 jobs:
     build_and_preview:
         if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
         runs-on: ubuntu-latest
+        env:
+          OKTA_APP_ISSUER: ${{secrets.OKTA_APP_ISSUER}}
         steps:
-            - uses: actions/checkout@v2
-            - run: cd login-workflow && yarn install:dependencies && yarn link:workflow && cd example && yarn && yarn build
+            - uses: actions/checkout@v4
+            - run: cd login-workflow && yarn install:dependencies && yarn link:workflow && cd example && yarn && echo "${{ secrets.OKTA_APP_ISSUER }}" > .env.local && yarn build
             - uses: FirebaseExtended/action-hosting-deploy@v0
               with:
                   entryPoint: './login-workflow'

diff --git a/login-workflow/README.md b/login-workflow/README.md
@@ -66,6 +66,15 @@ In short, you will need to:
 -   [Components & APIs](https://github.com/etn-ccis/blui-react-workflows/tree/master/login-workflow/docs/components/README.md)
 -   [Screens](https://github.com/etn-ccis/blui-react-workflows/tree/master/login-workflow/docs/screens/README.md)
 
+# Migrating from v4 => v5
+
+The migration to v5 from v4 should be very straightforward — all usage remains the same if you are using the custom login flow. However, version 5 has two new peer dependencies that you will need to install:
+
+```
+"@okta/okta-auth-js": "^7.7.0",
+"@okta/okta-react": "^6.9.0",
+```
+
 # Migrating from v3 => v4
 
 We have listened to your feedback and version 4 of this library is a significant rewrite that aims to address many requests for greater flexibility and customization of the workflows.

diff --git a/login-workflow/example/package.json b/login-workflow/example/package.json
@@ -40,7 +40,7 @@
         "@emotion/styled": "^11.10.8",
         "@mui/icons-material": "^6.1.4",
         "@mui/material": "^6.1.4",
-        "@okta/okta-auth-js": "^7.7.0",
+        "@okta/okta-auth-js": "^7.8.1",
         "@okta/okta-react": "^6.9.0",
         "@types/node": "^17.0.23",
         "@types/react": "18.3.10",

diff --git a/login-workflow/example/yarn.lock b/login-workflow/example/yarn.lock
@@ -2032,7 +2032,7 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@okta/okta-auth-js@^7.7.0":
+"@okta/okta-auth-js@^7.8.1":
   version "7.8.1"
   resolved "https://registry.yarnpkg.com/@okta/okta-auth-js/-/okta-auth-js-7.8.1.tgz#eb36ac8deb0290f59917ede239fae82d76cc2ab8"
   integrity sha512-vrsh1QK2NxZQgOQHqIX33ykTsf+X3zcHIzdNjbPbxp1YvTZeyd9oNlcLh1cgp4m0xA/NXoj5xM4no6j3SFtnUw==

diff --git a/login-workflow/firebase.json b/login-workflow/firebase.json
@@ -1,12 +1,16 @@
 {
-    "hosting": {
-        "public": "example/build",
-        "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
-        "rewrites": [
-            {
-                "source": "**",
-                "destination": "/index.html"
-            }
-        ]
-    }
+  "hosting": {
+    "public": "example/build",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ],
+    "rewrites": [
+      {
+        "source": "**",
+        "destination": "/index.html"
+      }
+    ]
+  }
 }