From 38c2d10cb523659f430d1d902cc4bee496f58e84 Mon Sep 17 00:00:00 2001 From: Mike VanDenburgh Date: Fri, 9 Aug 2024 12:05:56 -0400 Subject: [PATCH] Upgrade oauth client package --- web/package.json | 2 +- web/src/rest.ts | 2 +- web/yarn.lock | 57 ++++++++++++++++++++++++++---------------------- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/web/package.json b/web/package.json index 543fd2205..8f1bbee11 100644 --- a/web/package.json +++ b/web/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@apidevtools/json-schema-ref-parser": "^9.0.7", - "@girder/oauth-client": "^0.8.0", "@koumoul/vjsf": "2.23.3", + "@resonant/oauth-client": "^0.9.0", "@sentry/integrations": "^7.88.0", "@sentry/vue": "^7.88.0", "ajv": "^8.12.0", diff --git a/web/src/rest.ts b/web/src/rest.ts index 4e3775d17..69922b1e3 100644 --- a/web/src/rest.ts +++ b/web/src/rest.ts @@ -1,7 +1,7 @@ import type { AxiosRequestConfig, AxiosResponse } from 'axios'; import axios from 'axios'; import { ref } from 'vue'; -import OAuthClient from '@girder/oauth-client'; +import OAuthClient from '@resonant/oauth-client'; import type { Asset, Dandiset, diff --git a/web/yarn.lock b/web/yarn.lock index 8ea2800e3..74f8fe755 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -81,13 +81,6 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.53.0.tgz#bea56f2ed2b5baea164348ff4d5a879f6f81f20d" integrity sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w== -"@girder/oauth-client@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@girder/oauth-client/-/oauth-client-0.8.0.tgz#6bb6c85edd6cf7892c35ff2951076c49809b048c" - integrity sha512-uOEKyerB3BArN/t4UJxA2+L35ykidk60RNN+XwFXlVUVjZMuajaLFB6/r53Tr977/k8D1RJnBjosAfgl7oLTzg== - dependencies: - "@openid/appauth" "^1.3.0" - "@humanwhocodes/config-array@^0.11.13": version "0.11.13" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297" @@ -213,18 +206,25 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@openid/appauth@^1.3.0": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@openid/appauth/-/appauth-1.3.1.tgz#851e86507b95f9bbe1d05374eb62aaf9b2378f9b" - integrity sha512-e54kpi219wES2ijPzeHe1kMnT8VKH8YeTd1GAn9BzVBmutz3tBgcG1y8a4pziNr4vNjFnuD4W446Ua7ELnNDiA== +"@openid/appauth@^1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@openid/appauth/-/appauth-1.3.2.tgz#d4deb26717e79fc291208df9eaf92eb1b7812877" + integrity sha512-NoOejniaqzOEbHg3RcBZtTriYqhqpQFgTC4lDNaRbgRCnpz6n8PlxWlCbh2N1K5qKawfxRP29/Wiho3FrXQ3Qw== dependencies: - "@types/base64-js" "^1.3.0" - "@types/jquery" "^3.5.5" + "@types/base64-js" "^1.3.2" + "@types/jquery" "^3.5.29" base64-js "^1.5.1" - follow-redirects "^1.13.3" + follow-redirects "^1.15.6" form-data "^4.0.0" opener "^1.5.2" +"@resonant/oauth-client@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@resonant/oauth-client/-/oauth-client-0.9.0.tgz#cb8630ae7f6f59c35da8f405e4a62b10da05fcfc" + integrity sha512-7WaDZeukUw11AlmMD9xJn3fuzWn6YdldfcOFL/IwNNDCbnj2l2LP+0r3Q0PfsAKSAdMiF8Eir7v9Kw3PFJ0buQ== + dependencies: + "@openid/appauth" "^1.3.2" + "@rollup/plugin-inject@^5.0.5": version "5.0.5" resolved "https://registry.yarnpkg.com/@rollup/plugin-inject/-/plugin-inject-5.0.5.tgz#616f3a73fe075765f91c5bec90176608bed277a3" @@ -348,10 +348,10 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== -"@types/base64-js@^1.3.0": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@types/base64-js/-/base64-js-1.3.1.tgz#aac34ef23bfb96c33185642c11277a98007f4ecb" - integrity sha512-7fyfhnFLgedv3df+c6XkOQOOPrcCCFSxVfxY+HJwSXFp3GixW+DjArUIGXz8/Nqygcrl7mJLgZCO99BkRvaDYw== +"@types/base64-js@^1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/base64-js/-/base64-js-1.3.2.tgz#9e94abe3c521f4127f2e6a8b537b63bbc04d0956" + integrity sha512-Q2Xn2/vQHRGLRXhQ5+BSLwhHkR3JVflxVKywH0Q6fVoAiUE8fFYL2pE5/l2ZiOiBDfA8qUqRnSxln4G/NFz1Sg== "@types/dompurify@^3.0.1": version "3.0.4" @@ -365,10 +365,10 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.4.tgz#d9748f5742171b26218516cf1828b8eafaf8a9fa" integrity sha512-2JwWnHK9H+wUZNorf2Zr6ves96WHoWDJIftkcxPKsS7Djta6Zu519LarhRNljPXkpsZR2ZMwNCPeW7omW07BJw== -"@types/jquery@^3.5.5": - version "3.5.26" - resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.26.tgz#af9e5bf442b2ed813eb6a73c06c714621f68e9de" - integrity sha512-wWYf2NBI6b+1RPQY86B74HSgZNsLAUtr4eFlGQoOQPJw/B3mCMfwWCflZWQ7OKtAB18MJCcYpL6+0NZbMIXl5g== +"@types/jquery@^3.5.29": + version "3.5.30" + resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.30.tgz#888d584cbf844d3df56834b69925085038fd80f7" + integrity sha512-nbWKkkyb919DOUxjmRVk8vwtDb0/k8FKncmUKFi+NY+QXqWltooxTrswvz4LspQwxvLdvzBN1TImr6cw3aQx2A== dependencies: "@types/sizzle" "*" @@ -408,9 +408,9 @@ integrity sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ== "@types/sizzle@*": - version "2.3.5" - resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.5.tgz#d93dd29cdcd5801d90be968073b09a6b370780e4" - integrity sha512-tAe4Q+OLFOA/AMD+0lq8ovp8t3ysxAOeaScnfNdZpUxaGl51ZMDEITxkvFl1STudQ58mz6gzVGl9VhMKhwRnZQ== + version "2.3.8" + resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.8.tgz#518609aefb797da19bf222feb199e8f653ff7627" + integrity sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg== "@types/trusted-types@*": version "2.0.5" @@ -1879,11 +1879,16 @@ flatted@^3.2.9: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== -follow-redirects@^1.13.3, follow-redirects@^1.14.0: +follow-redirects@^1.14.0: version "1.15.3" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== +follow-redirects@^1.15.6: + version "1.15.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== + for-each@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"