Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging #275

Merged
merged 78 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
8ec08fa
update package lock for ecommerce example
Aug 19, 2023
88f236c
Merge pull request #247 from TokenScript/fix/update-package-lock-ecom
nicktaras Aug 21, 2023
e274501
fix to discount shown for passive flow
Aug 21, 2023
6ae0f33
Merge pull request #248 from TokenScript/fix/passive-issuer-discount-…
nicktaras Aug 22, 2023
17d2502
ecommerce package lock file
Aug 22, 2023
db786db
Merge pull request #249 from TokenScript/fix/passive-issuer-discount-…
nicktaras Aug 22, 2023
016c96b
added a poc for Socios Oauth2 integration
Sep 5, 2023
e4d65bf
added socios express app example
Sep 6, 2023
3cd7c3c
added socios express app example
Sep 6, 2023
3b4d227
applied cors settings to example
Sep 11, 2023
83961d8
Merge pull request #250 from TokenScript/feature/socios-oauth2
nicktaras Sep 11, 2023
91150d6
add ultra for testing
Sep 11, 2023
b914b75
Merge pull request #251 from TokenScript/feature/socios-oauth2
nicktaras Sep 11, 2023
f88ec3e
added env for application url in prep to host this via cicd process
Sep 12, 2023
8cc9879
removed unused end points from example.
Sep 12, 2023
cde3ee6
removed unused end points from example.
Sep 12, 2023
4d09140
Merge pull request #252 from TokenScript/feature/socios-oauth2
nicktaras Sep 12, 2023
ca50280
refactor: 💡 add ncc build for socios-oauth2
abcfy2 Sep 12, 2023
89d18eb
updated the callback uri and api endpoints to staging env
Sep 13, 2023
9e309e8
Merge pull request #253 from TokenScript/feature/socios-oauth2
nicktaras Sep 13, 2023
542d0a8
ci: 🎡 add socios-oauth2 deploy
abcfy2 Sep 13, 2023
d9dc13a
socios oauth fix added cors to call back uri
Sep 14, 2023
9847e43
socios oauth fix added cors to call back uri
Sep 14, 2023
e5a242a
Merge pull request #254 from TokenScript/feature/socios-oauth2
nicktaras Sep 14, 2023
250d3cb
socios oauth fix added cors to call back uri
Sep 14, 2023
060d6d2
Merge pull request #255 from TokenScript/feature/socios-oauth2
nicktaras Sep 14, 2023
1dace31
socios oauth fix added cors to call back uri
Sep 14, 2023
2d1c023
socios oauth fix added cors to call back uri
Sep 14, 2023
cf3a380
Merge pull request #256 from TokenScript/feature/socios-oauth2
nicktaras Sep 14, 2023
00fd879
added multi-off-chain example
Sep 18, 2023
be1a7e6
added multi-off-chain example
Sep 18, 2023
05b0454
Merge pull request #257 from TokenScript/feature/multi-origin-demo
nicktaras Sep 18, 2023
b4412e3
config changes applied to examples multi attestation
Sep 18, 2023
4400dfa
config changes applied to examples multi attestation
Sep 18, 2023
978365c
Merge pull request #258 from TokenScript/feature/multi-origin-demo
nicktaras Sep 18, 2023
44b1670
socios fixes
Sep 18, 2023
06063d0
Merge pull request #259 from TokenScript/feature/multi-origin-demo
nicktaras Sep 18, 2023
5deb31a
socios fixes
Sep 18, 2023
26e9f1f
Merge pull request #260 from TokenScript/feature/multi-origin-demo
nicktaras Sep 18, 2023
b025cfe
Update README.md
nicktaras Sep 18, 2023
d2c0cbc
removed unused dependancies from socios example
Sep 18, 2023
4e02cf5
Merge pull request #261 from TokenScript/feature/multi-origin-demo
nicktaras Sep 18, 2023
907dec6
removed unused dependancies from socios example
Sep 19, 2023
f958adf
Merge pull request #262 from TokenScript/feature/multi-origin-demo
nicktaras Sep 19, 2023
397d3e2
Update app.js
nicktaras Sep 19, 2023
de2d054
Merge pull request #263 from TokenScript/nicktaras-patch-1
nicktaras Sep 19, 2023
66cb8af
Update app.js
nicktaras Sep 19, 2023
a4170a1
Merge pull request #264 from TokenScript/nicktaras-patch-1
nicktaras Sep 19, 2023
70382b3
added old config for SL config
Sep 19, 2023
6877979
Merge pull request #265 from TokenScript/feature/multi-origin-demo
nicktaras Sep 19, 2023
953d3d6
updated diaglog renderer for sl examples
Sep 19, 2023
c4eb9a3
Merge pull request #266 from TokenScript/feature/multi-origin-demo
nicktaras Sep 19, 2023
a7f8a37
added smart layer public keys
Sep 19, 2023
a678ed6
Merge pull request #267 from TokenScript/feature/multi-origin-demo
nicktaras Sep 19, 2023
cd8e03e
added new config settings to demo
Sep 21, 2023
442bc8f
updated issuers to use the test attestation id
Sep 21, 2023
6486254
Merge pull request #268 from TokenScript/feature/multi-origin-demo
nicktaras Sep 21, 2023
90fb077
updated the tkn version of each example
Sep 21, 2023
1bde1b9
update lock files
Sep 25, 2023
87e5415
update lock files
Sep 25, 2023
0120970
updated port
Sep 26, 2023
2c20f49
added a timer setting to multi-offchain token demo
Sep 27, 2023
16235c4
Merge pull request #270 from TokenScript/feature/multi-origin-demo
nicktaras Sep 27, 2023
973189e
added socios lock file
Sep 27, 2023
f03b03b
Merge pull request #271 from TokenScript/feature/multi-origin-demo
nicktaras Sep 27, 2023
bf068d8
created a minimal react tkn boiler plate
Oct 10, 2023
94c36e9
updates added to align with release changes. Simplifying the implemen…
Oct 18, 2023
6b9cfa3
Merge pull request #272 from TokenScript/chore/update-examples-with-t…
nicktaras Oct 18, 2023
22d4489
added an experiment to configure a custom ui for hb active bogota
Oct 20, 2023
acb9cc2
fix: update attestation library
micwallace Oct 20, 2023
ce58694
Merge branch 'staging' into experiments/custom-ui-hotel-bogota-active
Oct 22, 2023
7873b2c
alinged examples with 3.2.0 updates.
Oct 22, 2023
0f99581
Merge pull request #273 from TokenScript/experiments/custom-ui-hotel-…
nicktaras Oct 22, 2023
6fa69a3
updated examples to utilise the latest 3.2.0 version of tkn.
Oct 24, 2023
c60dfbb
Merge pull request #274 from TokenScript/release/3.2.0
nicktaras Oct 24, 2023
ecde74c
updated lock file
Oct 24, 2023
cdaa62d
updated lock file
Oct 24, 2023
1916c9f
Merge pull request #276 from TokenScript/release/3.2.0
nicktaras Oct 24, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ecommerce-store-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
76 changes: 76 additions & 0 deletions .github/workflows/socios-auth2.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions .github/workflows/token-outlet-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
1 change: 0 additions & 1 deletion angular-bare-bones-demo/dist/235.c021a217ad7b926f.js

This file was deleted.

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions angular-bare-bones-demo/dist/3rdpartylicenses.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion angular-bare-bones-demo/dist/40.3dccefb5519350f6.js

This file was deleted.

1 change: 0 additions & 1 deletion angular-bare-bones-demo/dist/475.e3436a297ca126a7.js

This file was deleted.

1 change: 1 addition & 0 deletions angular-bare-bones-demo/dist/632.9d9f36148f656fbe.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions angular-bare-bones-demo/dist/639.c511f58df2809e7d.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions angular-bare-bones-demo/dist/729.4bb64d60e5140b36.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion angular-bare-bones-demo/dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 1 addition & 0 deletions angular-bare-bones-demo/dist/main.8007b9fe72510b57.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion angular-bare-bones-demo/dist/main.c1a633876c33af4f.js

This file was deleted.

1 change: 1 addition & 0 deletions angular-bare-bones-demo/dist/runtime.0d7712296a14e25c.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion angular-bare-bones-demo/dist/runtime.0fc8c89eeeb6f972.js

This file was deleted.

Loading