diff --git a/layouts/default.vue b/layouts/default.vue index 0e44cb2..e9ab31e 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -114,7 +114,9 @@ export default { } const doLogout = () => { logout({ - returnTo: window.location.origin + logoutParams: { + returnTo: window.location.origin + } }) } const darkMode = computed({ diff --git a/package.json b/package.json index 83ddb20..84f9b0f 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "@apollo/client": "^3.7.1", - "@auth0/auth0-spa-js": "^1.22.4", + "@auth0/auth0-spa-js": "^2.0.0", "@graphql-codegen/typescript": "^2.8.0", "@graphql-codegen/typescript-operations": "^2.5.5", "@graphql-codegen/typescript-vue-apollo": "^3.3.5", diff --git a/plugins/auth.ts b/plugins/auth.ts index 7c68b07..1603d71 100644 --- a/plugins/auth.ts +++ b/plugins/auth.ts @@ -1,6 +1,6 @@ -import createAuth0Client, { +import { + createAuth0Client, Auth0Client, - GetIdTokenClaimsOptions, GetTokenSilentlyOptions, IdToken, LogoutOptions, @@ -21,7 +21,7 @@ interface Client { error: Ref handleRedirectCallback: () => Promise loginWithRedirect: (o: RedirectLoginOptions) => Promise - getIdTokenClaims: (o: GetIdTokenClaimsOptions) => Promise + getIdTokenClaims: () => Promise getTokenSilently: (o: GetTokenSilentlyOptions) => Promise logout: (o: LogoutOptions) => Promise } @@ -37,9 +37,11 @@ export const useAuth = (onRedirectCallback: (appState?: any) => void = DEFAULT_R } const options = { domain, - client_id: 'orQfnvCPUR5C3mJkKoiWLQHOVQsBn60e', - audience: 'http://dancefinder.unbound.se', - redirect_uri: window.location.origin + clientId: 'orQfnvCPUR5C3mJkKoiWLQHOVQsBn60e', + authorizationParams: { + audience: 'http://dancefinder.unbound.se', + redirect_uri: window.location.origin + } } instance = { @@ -76,8 +78,8 @@ export const useAuth = (onRedirectCallback: (appState?: any) => void = DEFAULT_R }) }, /** Returns all the claims present in the ID token */ - getIdTokenClaims: (o: GetIdTokenClaimsOptions) => { - return instance.auth0Client!.then(client => client.getIdTokenClaims(o)) + getIdTokenClaims: () => { + return instance.auth0Client!.then(client => client.getIdTokenClaims()) }, /** Returns the access token. If the token is invalid or missing, a new one is retrieved */ getTokenSilently: (o: GetTokenSilentlyOptions) => { diff --git a/yarn.lock b/yarn.lock index 10bab34..798eb8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -59,18 +59,10 @@ dependencies: node-fetch "^2.6.1" -"@auth0/auth0-spa-js@^1.22.4": - version "1.22.5" - resolved "https://registry.yarnpkg.com/@auth0/auth0-spa-js/-/auth0-spa-js-1.22.5.tgz#e48be3a6abfa6f63ab6e4b869d04788b4f229f23" - integrity sha512-6gaQcd+Eb8ZBcdQkrrm9undM7dY/rPvVdQN8s7rxxrviUCs7OopEygsfSkHf67IP4HtlCiE8dSW5/AipRUOw/A== - dependencies: - abortcontroller-polyfill "^1.7.3" - browser-tabs-lock "^1.2.15" - core-js "^3.25.1" - es-cookie "~1.3.2" - fast-text-encoding "^1.0.6" - promise-polyfill "^8.2.3" - unfetch "^4.2.0" +"@auth0/auth0-spa-js@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@auth0/auth0-spa-js/-/auth0-spa-js-2.0.0.tgz#6b53499fa27a49716492f3375fd0bd6db2497a13" + integrity sha512-qHArgvA+ltI37g1vo3q7XtWxhMNAyL0LrnwCKCHQ1uzMWnxhdyxi2w9/BXfp1c+2L1Zc+DDh3XhpbYVXNhvadg== "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.18.6": version "7.18.6" @@ -3637,11 +3629,6 @@ abort-controller@^3.0.0: dependencies: event-target-shim "^5.0.0" -abortcontroller-polyfill@^1.7.3: - version "1.7.5" - resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz#6738495f4e901fbb57b6c0611d0c75f76c485bed" - integrity sha512-JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ== - accepts@~1.3.5: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" @@ -4374,13 +4361,6 @@ brorand@^1.0.1, brorand@^1.1.0: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== -browser-tabs-lock@^1.2.15: - version "1.2.15" - resolved "https://registry.yarnpkg.com/browser-tabs-lock/-/browser-tabs-lock-1.2.15.tgz#d5012e652e2a0cb4eba471b0a2300c2fa5d92788" - integrity sha512-J8K9vdivK0Di+b8SBdE7EZxDr88TnATing7XoLw6+nFkXMQ6sVBh92K3NQvZlZU91AIkFRi0w3sztk5Z+vsswA== - dependencies: - lodash ">=4.17.21" - browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" @@ -6361,11 +6341,6 @@ es-array-method-boxes-properly@^1.0.0: resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== -es-cookie@~1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/es-cookie/-/es-cookie-1.3.2.tgz#80e831597f72a25721701bdcb21d990319acd831" - integrity sha512-UTlYYhXGLOy05P/vKVT2Ui7WtC7NiRzGtJyAKKn32g5Gvcjn7KAClLPWlipCtxIus934dFg9o9jXiBL0nP+t9Q== - es-shim-unscopables@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" @@ -7110,11 +7085,6 @@ fast-levenshtein@^2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== -fast-text-encoding@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867" - integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w== - fastest-levenshtein@^1.0.16: version "1.0.16" resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" @@ -9611,7 +9581,7 @@ lodash.uniqby@4.x: resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" integrity sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww== -lodash@>=4.17.21, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.0: +lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -12262,11 +12232,6 @@ promise-inflight@^1.0.1: resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== -promise-polyfill@^8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.2.3.tgz#2edc7e4b81aff781c88a0d577e5fe9da822107c6" - integrity sha512-Og0+jCRQetV84U8wVjMNccfGCnMQ9mGs9Hv78QFe+pSDD3gWTpz0y+1QCuxy5d/vBFuZ3iwP2eycAkvqIMPmWg== - promise-retry@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"