Merge pull request #275 from TokenScript/staging

Staging

.github/workflows/build-examples.yml

@@ -31,7 +31,7 @@ jobs:
         node-version: [16.x]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
@@ -74,7 +74,7 @@ jobs:
     name: SonarCloud
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
       - name: SonarCloud Scan

.github/workflows/deploy-to-gh-pages.yml

@@ -27,7 +27,7 @@ jobs:
         node-version: [16.x]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3

.github/workflows/ecommerce-store-website.yml

@@ -13,7 +13,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: 16
@@ -53,7 +53,7 @@ jobs:
           name: ecommerce-store-website
           path: ecommerce-store-website/out/
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/socios-auth2.yml

@@ -0,0 +1,76 @@
+name: "socios-oauth2 CI"
+
+on:
+  push:
+    branches:
+      - main
+      - staging
+  pull_request:
+    branches:
+      - "*"
+  workflow_dispatch:
+
+env:
+  PROJ_PATH: socios-oauth2
+  DEPLOY_URL: https://socios-oauth2.tokenscript.org/
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: "npm"
+          cache-dependency-path: ${{ env.PROJ_PATH }}/package-lock.json
+      - run: |
+          echo -n "Node version: "
+          node -v
+          echo -n "Npm version: "
+          npm -v
+      - name: build
+        run: |
+          cd "${PROJ_PATH}"
+          npm ci
+          npm run build
+      - uses: actions/upload-artifact@v3
+        with:
+          name: socios-oauth2
+          path: ${{ env.PROJ_PATH }}/dist/
+
+  deploy:
+    runs-on: ubuntu-latest
+    environment:
+      name: socios-oauth2
+      url: ${{ env.DEPLOY_URL }}
+    needs:
+      - build
+    if: ${{ contains(
+      fromJson('["push", "workflow_dispatch"]'),
+      github.event_name) &&
+      contains(
+      fromJson('["staging"]'),
+      github.ref_name)
+      }}
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: socios-oauth2
+          path: ${{ env.PROJ_PATH }}/dist/
+      - name: Deploy to EC2
+        uses: easingthemes/ssh-deploy@v4
+        with:
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+          REMOTE_HOST: 54.177.203.8
+          REMOTE_USER: ubuntu
+          ARGS: "-aPz --delete"
+          SOURCE: "${{ env.PROJ_PATH }}/dist/"
+          TARGET: /opt/services/socios-oauth2/
+          SCRIPT_AFTER: |
+            sudo systemctl restart socios-oauth2
+      - name: check deploy
+        run: |
+          for i in $(seq 15); do
+            curl -sfL --connect-timeout 30 "${DEPLOY_URL}" && exit || sleep 5
+          done && exit 1

.github/workflows/token-outlet-website.yml

@@ -25,7 +25,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: 16
@@ -82,7 +82,7 @@ jobs:
           name: token-outlet-website
           path: token-outlet-website/build/
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

angular-bare-bones-demo/dist/3rdpartylicenses.txt

@@ -2818,6 +2818,31 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+abort-controller
+MIT
+MIT License
+
+Copyright (c) 2017 Toru Nagashima
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 aes-js
 MIT
 The MIT License (MIT)
@@ -5200,31 +5225,6 @@ SOFTWARE.
 
 
 
-string.prototype.trim
-MIT
-The MIT License (MIT)
-
-Copyright (c) 2015 Jordan Harband
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 string_decoder
 MIT
 Node.js is licensed for use as follows:

angular-bare-bones-demo/dist/index.html

@@ -7,6 +7,6 @@
 <style>@import"https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@200;400&display=swap.css"</style><link rel="stylesheet" href="/token-negotiator-examples/angular-bare-bones-demo/styles.fea609fc74ab4ced.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="/token-negotiator-examples/angular-bare-bones-demo/styles.fea609fc74ab4ced.css"></noscript></head>
 <body>
   <app-root></app-root>
-<script src="/token-negotiator-examples/angular-bare-bones-demo/runtime.0fc8c89eeeb6f972.js" type="module"></script><script src="/token-negotiator-examples/angular-bare-bones-demo/polyfills.4d7608bd69f2092d.js" type="module"></script><script src="/token-negotiator-examples/angular-bare-bones-demo/main.c1a633876c33af4f.js" type="module"></script>
+<script src="/token-negotiator-examples/angular-bare-bones-demo/runtime.0d7712296a14e25c.js" type="module"></script><script src="/token-negotiator-examples/angular-bare-bones-demo/polyfills.4d7608bd69f2092d.js" type="module"></script><script src="/token-negotiator-examples/angular-bare-bones-demo/main.8007b9fe72510b57.js" type="module"></script>
 
 </body></html>