Skip to content

Commit

Permalink
feat: add IdP access_token handling (#36)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rentallect
rentallect authored May 2, 2022
1 parent 31167fe commit bff33c9
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 52 deletions.
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
"@babel/preset-env": "^7.16.11",
"@babel/register": "^7.17.0",
"@rollup/plugin-babel": "^5.2.0",
"@rollup/plugin-commonjs": "^21.0.3",
"@rollup/plugin-commonjs": "^22.0.0",
"@rollup/plugin-multi-entry": "^4.0.0",
"@rollup/plugin-node-resolve": "^13.1.3",
"@rollup/plugin-node-resolve": "^13.3.0",
"@rollup/plugin-replace": "^4.0.0",
"@rollup/plugin-typescript": "^8.3.1",
"@rollup/plugin-typescript": "^8.3.2",
"@surma/rollup-plugin-off-main-thread": "^2.2.3",
"@types/jwt-decode": "^3.1.0",
"@types/lodash-es": "^4.17.6",
Expand All @@ -54,7 +54,7 @@
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-typescript2": "^0.31.2",
"typescript": "^4.6.3"
"typescript": "^4.6.4"
},
"workbox": {
"browserNamespace": "workbox.zitiStrategies",
Expand Down Expand Up @@ -83,7 +83,7 @@
]
},
"dependencies": {
"@openziti/ziti-browzer-core": "^0.7.0",
"@openziti/ziti-browzer-core": "^0.8.0",
"async-mutex": "^0.3.2",
"jwt-decode": "^3.1.2",
"lodash-es": "^4.17.21",
Expand All @@ -92,4 +92,4 @@
"workbox-expiration": "^6.5.3",
"workbox-strategies": "^6.5.3"
}
}
}
4 changes: 2 additions & 2 deletions src/ZitiFirstStrategy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ class ZitiFirstStrategy extends NetworkFirst {
sdkVersion: pjson.version,
sdkBranch: buildInfo.sdkBranch,
sdkRevision: buildInfo.sdkRevision,
updbUser: this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.decodedJWT.updbUser,
updbPswd: this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.decodedJWT.updbPswd,
token_type: this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.decodedJWT.token_type,
access_token: this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.decodedJWT.access_token,
httpAgentTargetHost: this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.httpAgent.target.host,
});
this.logger.trace(`ZitiContext created`);
Expand Down
102 changes: 58 additions & 44 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -969,14 +969,14 @@
"@types/emscripten" "^1.39.6"
"@wasmer/wasi" "^1.0.2"

"@openziti/ziti-browzer-core@^0.7.0":
version "0.7.0"
resolved "https://registry.yarnpkg.com/@openziti/ziti-browzer-core/-/ziti-browzer-core-0.7.0.tgz#21688e740761c6b11b333c438512231cbdeb31cf"
integrity sha512-9njTQ+LxtV9wiaeH8WB6v1CVkOczUfQlJKDFwhMpo+5ry6dlMuhvdYg0egorTtgpuET8WZCUn4Fnu4ljZ58CKA==
"@openziti/ziti-browzer-core@^0.8.0":
version "0.8.0"
resolved "https://registry.yarnpkg.com/@openziti/ziti-browzer-core/-/ziti-browzer-core-0.8.0.tgz#68ae0131977e05bf5e09006e0b0b0bb187eb2315"
integrity sha512-AJO0mNcxVBxG9gDwZn3GBXx0LUlwIyZDyjV1ImWQkYAHwiA0bJVwCwcGUQm7EMPHmFU0ESI0YFR8Nm1bufq3Yw==
dependencies:
"@openziti/libcrypto-js" "^0.6.21"
"@openziti/ziti-browzer-edge-client" "^0.1.19"
asn1js "^2.3.2"
"@openziti/ziti-browzer-edge-client" "^0.2.0"
asn1js "^2.4.0"
assert "^2.0.0"
async-mutex "^0.3.2"
asynckit "^0.4.0"
Expand Down Expand Up @@ -1008,12 +1008,12 @@
utf-8-validate "^5.0.9"
util "^0.12.4"

"@openziti/ziti-browzer-edge-client@^0.1.19":
version "0.1.19"
resolved "https://registry.yarnpkg.com/@openziti/ziti-browzer-edge-client/-/ziti-browzer-edge-client-0.1.19.tgz#27bf02d11b51ed48753f75b52ed58048792c98ae"
integrity sha512-ukHLZQKmIgt8CDFzz5mLcz2HENv59e2ocL9QdcWUgxPwVeRvtNXTNwmmpRKFXjCmCkgyQqpYIhp87HbjooBRwQ==
"@openziti/ziti-browzer-edge-client@^0.2.0":
version "0.2.0"
resolved "https://registry.yarnpkg.com/@openziti/ziti-browzer-edge-client/-/ziti-browzer-edge-client-0.2.0.tgz#9f414de6db431fc4978ae937cdf24295afe8b892"
integrity sha512-KBKgA/VkLXVjIlgRre67dpnTF8qJcCjWJySxYX2KhU1tvFNWAb7UXdoFJDy7RoVs65cxo8vfSEco/tmDLs2BGA==
dependencies:
superagent "^7.1.1"
superagent "^7.1.3"

"@rollup/plugin-babel@^5.2.0":
version "5.3.1"
Expand All @@ -1023,10 +1023,10 @@
"@babel/helper-module-imports" "^7.10.4"
"@rollup/pluginutils" "^3.1.0"

"@rollup/plugin-commonjs@^21.0.3":
version "21.0.3"
resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-21.0.3.tgz#287896c64926ef3d7f0013708dcdcc1223576ef0"
integrity sha512-ThGfwyvcLc6cfP/MWxA5ACF+LZCvsuhUq7V5134Az1oQWsiC7lNpLT4mJI86WQunK7BYmpUiHmMk2Op6OAHs0g==
"@rollup/plugin-commonjs@^22.0.0":
version "22.0.0"
resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.0.tgz#f4d87016e2fbf187a593ab9f46626fe05b59e8bd"
integrity sha512-Ktvf2j+bAO+30awhbYoCaXpBcyPmJbaEUYClQns/+6SNCYFURbvBiNbWgHITEsIgDDWCDUclWRKEuf8cwZCFoQ==
dependencies:
"@rollup/pluginutils" "^3.1.0"
commondir "^1.0.1"
Expand All @@ -1044,15 +1044,15 @@
"@rollup/plugin-virtual" "^2.0.3"
matched "^5.0.0"

"@rollup/plugin-node-resolve@^13.1.3":
version "13.2.0"
resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.2.0.tgz#ac516c4649b7133273a944778df439d3081dc3d1"
integrity sha512-GuUIUyIKq7EjQxB51XSn6zPHYo+cILQQBYOGYvFFNxws2OVOqCBShAoof2hFrV8bAZzZGDBDQ8m2iUt8SLOUkg==
"@rollup/plugin-node-resolve@^13.3.0":
version "13.3.0"
resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz#da1c5c5ce8316cef96a2f823d111c1e4e498801c"
integrity sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==
dependencies:
"@rollup/pluginutils" "^3.1.0"
"@types/resolve" "1.17.1"
builtin-modules "^3.1.0"
deepmerge "^4.2.2"
is-builtin-module "^3.1.0"
is-module "^1.0.0"
resolve "^1.19.0"

Expand All @@ -1064,10 +1064,10 @@
"@rollup/pluginutils" "^3.1.0"
magic-string "^0.25.7"

"@rollup/plugin-typescript@^8.3.1":
version "8.3.1"
resolved "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.3.1.tgz"
integrity sha512-84rExe3ICUBXzqNX48WZV2Jp3OddjTMX97O2Py6D1KJaGSwWp0mDHXj+bCGNJqWHIEKDIT2U0sDjhP4czKi6cA==
"@rollup/plugin-typescript@^8.3.2":
version "8.3.2"
resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.3.2.tgz#e1b719e2ed3e752bbc092001656c48378f2d15f0"
integrity sha512-MtgyR5LNHZr3GyN0tM7gNO9D0CS+Y+vflS4v/PHmrX17JCkHUYKvQ5jN5o3cz1YKllM3duXUqu3yOHwMPUxhDg==
dependencies:
"@rollup/pluginutils" "^3.1.0"
resolve "^1.17.0"
Expand Down Expand Up @@ -1366,13 +1366,20 @@ asap@^2.0.0:
resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"
integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=

asn1js@^2.1.1, asn1js@^2.3.2:
asn1js@^2.1.1:
version "2.3.2"
resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-2.3.2.tgz#1864f859f6e5dfd7350c0543f411e18963f30592"
integrity sha512-IYzujqcOk7fHaePpTyvD3KPAA0AjT3qZlaQAw76zmPPAV/XTjhO+tbHjbFbIQZIhw+fk9wCSfb0Z6K+JHe8Q2g==
dependencies:
pvutils latest

asn1js@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-2.4.0.tgz#9ca61dbdd7e4eb49b9ae95b36ab0615b77daff93"
integrity sha512-PvZC0FMyMut8aOnR2jAEGSkmRtHIUYPe9amUEnGjr9TdnUmsfoOkjrvUkOEU9mzpYBR1HyO9bF+8U1cLTMMHhQ==
dependencies:
pvutils "^1.1.3"

assert@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
Expand Down Expand Up @@ -1600,7 +1607,7 @@ bufferutil@^4.0.6:
dependencies:
node-gyp-build "^4.3.0"

builtin-modules@^3.1.0:
builtin-modules@^3.0.0, builtin-modules@^3.1.0:
version "3.2.0"
resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz"
integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
Expand Down Expand Up @@ -1968,7 +1975,7 @@ debug@^2.2.0, debug@^2.3.3:
dependencies:
ms "2.0.0"

debug@^4.1.0, debug@^4.1.1, debug@^4.3.3:
debug@^4.1.0, debug@^4.1.1, debug@^4.3.4:
version "4.3.4"
resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
Expand Down Expand Up @@ -3053,6 +3060,13 @@ is-buffer@^1.1.5:
resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==

is-builtin-module@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.1.0.tgz#6fdb24313b1c03b75f8b9711c0feb8c30b903b00"
integrity sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==
dependencies:
builtin-modules "^3.0.0"

is-callable@^1.1.4, is-callable@^1.2.4:
version "1.2.4"
resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"
Expand Down Expand Up @@ -4301,9 +4315,9 @@ [email protected]:
resolved "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz"
integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==

qs@^6.10.1:
qs@^6.10.3:
version "6.10.3"
resolved "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
dependencies:
side-channel "^1.0.4"
Expand Down Expand Up @@ -4665,10 +4679,10 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==

semver@^7.3.5:
version "7.3.5"
resolved "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"
integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
semver@^7.3.7:
version "7.3.7"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
dependencies:
lru-cache "^6.0.0"

Expand Down Expand Up @@ -4995,22 +5009,22 @@ [email protected]:
resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==

superagent@^7.1.1:
version "7.1.1"
resolved "https://registry.npmjs.org/superagent/-/superagent-7.1.1.tgz"
integrity sha512-CQ2weSS6M+doIwwYFoMatklhRbx6sVNdB99OEJ5czcP3cng76Ljqus694knFWgOj3RkrtxZqIgpe6vhe0J7QWQ==
superagent@^7.1.3:
version "7.1.3"
resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.3.tgz#783ff8330e7c2dad6ad8f0095edc772999273b6b"
integrity sha512-WA6et4nAvgBCS73lJvv1D0ssI5uk5Gh+TGN/kNe+B608EtcVs/yzfl+OLXTzDs7tOBDIpvgh/WUs1K2OK1zTeQ==
dependencies:
component-emitter "^1.3.0"
cookiejar "^2.1.3"
debug "^4.3.3"
debug "^4.3.4"
fast-safe-stringify "^2.1.1"
form-data "^4.0.0"
formidable "^2.0.1"
methods "^1.1.2"
mime "^2.5.0"
qs "^6.10.1"
qs "^6.10.3"
readable-stream "^3.6.0"
semver "^7.3.5"
semver "^7.3.7"

[email protected]:
version "8.1.1"
Expand Down Expand Up @@ -5154,10 +5168,10 @@ typedarray@^0.0.6:
resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

typescript@^4.6.3:
version "4.6.3"
resolved "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz"
integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
typescript@^4.6.4:
version "4.6.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==

unbox-primitive@^1.0.1:
version "1.0.1"
Expand Down

0 comments on commit bff33c9

Please sign in to comment.