@osdk/oauth 1.1.0-beta.5 → 1.1.0-beta.7

package/build/esm/common.d.ts

@@ -2,22 +2,17 @@ import type { AuthorizationServer, Client, HttpRequestOptions, OAuth2TokenEndpoi
 import type { BaseOauthClient, Events } from "./BaseOauthClient.js";
 import type { Token } from "./Token.js";
 export type LocalStorageState = {
-    refresh_token?: never;
+    refresh_token?: string;
+};
+export type SessionStorageState = {
     codeVerifier?: never;
     state?: never;
     oldUrl: string;
 } | {
-    refresh_token?: never;
     codeVerifier: string;
     state: string;
     oldUrl: string;
 } | {
-    refresh_token?: string;
-    codeVerifier?: never;
-    state?: never;
-    oldUrl?: never;
-} | {
-    refresh_token?: never;
     codeVerifier?: never;
     state?: never;
     oldUrl?: never;
@@ -25,6 +20,9 @@ export type LocalStorageState = {
 export declare function saveLocal(client: Client, x: LocalStorageState): void;
 export declare function removeLocal(client: Client): void;
 export declare function readLocal(client: Client): LocalStorageState;
+export declare function saveSession(client: Client, x: SessionStorageState): void;
+export declare function removeSession(client: Client): void;
+export declare function readSession(client: Client): SessionStorageState;
 export declare function common<R extends undefined | (() => Promise<Token | undefined>)>(client: Client, as: AuthorizationServer, _signIn: () => Promise<Token>, oauthHttpOptions: HttpRequestOptions, refresh: R): {
     getToken: BaseOauthClient<keyof Events & string> & {
         refresh: R;

package/build/esm/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/common.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,mBAAmB,EACnB,MAAM,EACN,kBAAkB,EAClB,2BAA2B,EAC5B,MAAM,cAAc,CAAC;AAItB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEpE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAwBxC,MAAM,MAAM,iBAAiB,GAEzB;IACA,aAAa,CAAC,EAAE,KAAK,CAAC;IACtB,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GAEC;IACA,aAAa,CAAC,EAAE,KAAK,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GAEC;IACA,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB,GACC;IACA,aAAa,CAAC,EAAE,KAAK,CAAC;IACtB,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB,CAAC;AAEJ,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,iBAAiB,QAM7D;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,QAKzC;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAQ3D;AAED,wBAAgB,MAAM,CACpB,CAAC,SAAS,SAAS,GAAG,CAAC,MAAM,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC,EAExD,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,mBAAmB,EACvB,OAAO,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,EAC7B,gBAAgB,EAAE,kBAAkB,EACpC,OAAO,EAAE,CAAC,GACT;IACD,QAAQ,EAAE,eAAe,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC,CAAA;KAAE,CAAC;IAClE,uBAAuB,EAAE,CACvB,IAAI,EAAE,2BAA2B,EACjC,IAAI,EAAE,QAAQ,GAAG,SAAS,KACvB,KAAK,CAAC;CACZ,CA0GA;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,GACV,QAAQ,CACT,IAAI,CACF,mBAAmB,EACjB,QAAQ,GACR,gBAAgB,GAChB,wBAAwB,GACxB,qBAAqB,CACxB,CACF,CAQA"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/common.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,mBAAmB,EACnB,MAAM,EACN,kBAAkB,EAClB,2BAA2B,EAC5B,MAAM,cAAc,CAAC;AAItB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEpE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAwBxC,MAAM,MAAM,iBAAiB,GAAG;IAAE,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3D,MAAM,MAAM,mBAAmB,GAE3B;IACA,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GAEC;IACA,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GAEC;IACA,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB,CAAC;AAEJ,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAMpE;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAKhD;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAQ3D;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,mBAAmB,QAMjE;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,QAK3C;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAQ/D;AAED,wBAAgB,MAAM,CACpB,CAAC,SAAS,SAAS,GAAG,CAAC,MAAM,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC,EAExD,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,mBAAmB,EACvB,OAAO,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,EAC7B,gBAAgB,EAAE,kBAAkB,EACpC,OAAO,EAAE,CAAC,GACT;IACD,QAAQ,EAAE,eAAe,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC,CAAA;KAAE,CAAC;IAClE,uBAAuB,EAAE,CACvB,IAAI,EAAE,2BAA2B,EACjC,IAAI,EAAE,QAAQ,GAAG,SAAS,KACvB,KAAK,CAAC;CACZ,CA0GA;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,GACV,QAAQ,CACT,IAAI,CACF,mBAAmB,EACjB,QAAQ,GACR,gBAAgB,GAChB,wBAAwB,GACxB,qBAAqB,CACxB,CACF,CAQA"}

package/build/esm/common.js

@@ -42,6 +42,19 @@ export function readLocal(client) {
   // MUST `localStorage?` as nodejs does not have localStorage
   globalThis.localStorage?.getItem(`@osdk/oauth : refresh : ${client.client_id}`) ?? "{}");
 }
+export function saveSession(client, x) {
+  // MUST `sessionStorage?` as nodejs does not have sessionStorage
+  globalThis.sessionStorage?.setItem(`@osdk/oauth : refresh : ${client.client_id}`, JSON.stringify(x));
+}
+export function removeSession(client) {
+  // MUST `sessionStorage?` as nodejs does not have sessionStorage
+  globalThis.sessionStorage?.removeItem(`@osdk/oauth : refresh : ${client.client_id}`);
+}
+export function readSession(client) {
+  return JSON.parse(
+  // MUST `sessionStorage?` as nodejs does not have sessionStorage
+  globalThis.sessionStorage?.getItem(`@osdk/oauth : refresh : ${client.client_id}`) ?? "{}");
+}
 export function common(client, as, _signIn, oauthHttpOptions, refresh) {
   let token;
   const eventTarget = new TypedEventTarget();

package/build/esm/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","names":["processRevocationResponse","revocationRequest","invariant","TypedEventTarget","throwIfError","CustomEvent","globalThis","Event","detail","constructor","type","options","saveLocal","client","x","localStorage","setItem","client_id","JSON","stringify","removeLocal","removeItem","readLocal","parse","getItem","common","as","_signIn","oauthHttpOptions","refresh","token","eventTarget","makeTokenAndSaveRefresh","resp","refresh_token","expires_in","access_token","process","env","NODE_ENV","expires_at","Date","now","dispatchTypedEvent","refreshTimeout","rmTimeout","clearTimeout","restartRefreshTimer","evt","setTimeout","pendingSignIn","signIn","undefined","addEventListener","getTokenOrUndefined","getToken","Object","assign","signOut","result","bind","removeEventListener","createAuthorizationServer","ctxPath","url","issuer","URL","token_endpoint","authorization_endpoint","revocation_endpoint"],"sources":["common.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { processRevocationResponse, revocationRequest } from \"oauth4webapi\";\nimport invariant from \"tiny-invariant\";\nimport { TypedEventTarget } from \"typescript-event-target\";\nimport { throwIfError } from \"./throwIfError.js\";\n// Node 18 is supposed to have a `CustomEvent` but it is not exposed on `globalThis`\n// which creates a problem for making a single codebase for node and browser. This polyfill works around it\nconst CustomEvent = process.env.TARGET === \"browser\"\n    ? globalThis.CustomEvent\n    : globalThis.CustomEvent\n        ?? class CustomEvent extends Event {\n            #detail;\n            constructor(type, options) {\n                super(type, options);\n                this.#detail = options?.detail ?? null;\n            }\n            get detail() {\n                return this.#detail;\n            }\n        };\nexport function saveLocal(client, x) {\n    // MUST `localStorage?` as nodejs does not have localStorage\n    globalThis.localStorage?.setItem(`@osdk/oauth : refresh : ${client.client_id}`, JSON.stringify(x));\n}\nexport function removeLocal(client) {\n    // MUST `localStorage?` as nodejs does not have localStorage\n    globalThis.localStorage?.removeItem(`@osdk/oauth : refresh : ${client.client_id}`);\n}\nexport function readLocal(client) {\n    return JSON.parse(\n    // MUST `localStorage?` as nodejs does not have localStorage\n    globalThis.localStorage?.getItem(`@osdk/oauth : refresh : ${client.client_id}`)\n        ?? \"{}\");\n}\nexport function common(client, as, _signIn, oauthHttpOptions, refresh) {\n    let token;\n    const eventTarget = new TypedEventTarget();\n    function makeTokenAndSaveRefresh(resp, type) {\n        const { refresh_token, expires_in, access_token } = resp;\n        invariant(expires_in != null);\n        saveLocal(client, { refresh_token });\n        token = {\n            refresh_token,\n            expires_in,\n            access_token,\n            expires_at: Date.now() + expires_in * 1000,\n        };\n        eventTarget.dispatchTypedEvent(type, new CustomEvent(type, { detail: token }));\n        return token;\n    }\n    let refreshTimeout;\n    function rmTimeout() {\n        if (refreshTimeout)\n            clearTimeout(refreshTimeout);\n    }\n    function restartRefreshTimer(evt) {\n        if (refresh) {\n            rmTimeout();\n            refreshTimeout = setTimeout(refresh, evt.detail.expires_in * 1000 - 60 * 1000);\n        }\n    }\n    async function signOut() {\n        invariant(token, \"not signed in\");\n        const result = await processRevocationResponse(await revocationRequest(as, client, token.access_token, oauthHttpOptions));\n        rmTimeout();\n        // Clean up\n        removeLocal(client);\n        token = undefined;\n        throwIfError(result);\n        eventTarget.dispatchTypedEvent(\"signOut\", new Event(\"signOut\"));\n    }\n    let pendingSignIn;\n    async function signIn() {\n        if (pendingSignIn) {\n            return pendingSignIn;\n        }\n        try {\n            pendingSignIn = _signIn();\n            return await pendingSignIn;\n        }\n        finally {\n            pendingSignIn = undefined;\n        }\n    }\n    eventTarget.addEventListener(\"signIn\", restartRefreshTimer);\n    eventTarget.addEventListener(\"refresh\", restartRefreshTimer);\n    function getTokenOrUndefined() {\n        if (!token || Date.now() >= token.expires_at) {\n            return undefined;\n        }\n        return token?.access_token;\n    }\n    const getToken = Object.assign(async function getToken() {\n        if (!token || Date.now() >= token.expires_at) {\n            token = await signIn();\n        }\n        return token?.access_token;\n    }, {\n        signIn,\n        refresh,\n        signOut,\n        rmTimeout,\n        getTokenOrUndefined,\n        addEventListener: eventTarget.addEventListener.bind(eventTarget),\n        removeEventListener: eventTarget.removeEventListener.bind(eventTarget),\n    });\n    return { getToken, makeTokenAndSaveRefresh };\n}\nexport function createAuthorizationServer(ctxPath, url) {\n    const issuer = `${new URL(ctxPath, url)}`;\n    return {\n        token_endpoint: `${issuer}/api/oauth2/token`,\n        authorization_endpoint: `${issuer}/api/oauth2/authorize`,\n        revocation_endpoint: `${issuer}/api/oauth2/revoke_token`,\n        issuer,\n    };\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"common.js","names":["processRevocationResponse","revocationRequest","invariant","TypedEventTarget","throwIfError","CustomEvent","globalThis","Event","detail","constructor","type","options","saveLocal","client","x","localStorage","setItem","client_id","JSON","stringify","removeLocal","removeItem","readLocal","parse","getItem","saveSession","sessionStorage","removeSession","readSession","common","as","_signIn","oauthHttpOptions","refresh","token","eventTarget","makeTokenAndSaveRefresh","resp","refresh_token","expires_in","access_token","process","env","NODE_ENV","expires_at","Date","now","dispatchTypedEvent","refreshTimeout","rmTimeout","clearTimeout","restartRefreshTimer","evt","setTimeout","pendingSignIn","signIn","undefined","addEventListener","getTokenOrUndefined","getToken","Object","assign","signOut","result","bind","removeEventListener","createAuthorizationServer","ctxPath","url","issuer","URL","token_endpoint","authorization_endpoint","revocation_endpoint"],"sources":["common.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { processRevocationResponse, revocationRequest } from \"oauth4webapi\";\nimport invariant from \"tiny-invariant\";\nimport { TypedEventTarget } from \"typescript-event-target\";\nimport { throwIfError } from \"./throwIfError.js\";\n// Node 18 is supposed to have a `CustomEvent` but it is not exposed on `globalThis`\n// which creates a problem for making a single codebase for node and browser. This polyfill works around it\nconst CustomEvent = process.env.TARGET === \"browser\"\n    ? globalThis.CustomEvent\n    : globalThis.CustomEvent\n        ?? class CustomEvent extends Event {\n            #detail;\n            constructor(type, options) {\n                super(type, options);\n                this.#detail = options?.detail ?? null;\n            }\n            get detail() {\n                return this.#detail;\n            }\n        };\nexport function saveLocal(client, x) {\n    // MUST `localStorage?` as nodejs does not have localStorage\n    globalThis.localStorage?.setItem(`@osdk/oauth : refresh : ${client.client_id}`, JSON.stringify(x));\n}\nexport function removeLocal(client) {\n    // MUST `localStorage?` as nodejs does not have localStorage\n    globalThis.localStorage?.removeItem(`@osdk/oauth : refresh : ${client.client_id}`);\n}\nexport function readLocal(client) {\n    return JSON.parse(\n    // MUST `localStorage?` as nodejs does not have localStorage\n    globalThis.localStorage?.getItem(`@osdk/oauth : refresh : ${client.client_id}`)\n        ?? \"{}\");\n}\nexport function saveSession(client, x) {\n    // MUST `sessionStorage?` as nodejs does not have sessionStorage\n    globalThis.sessionStorage?.setItem(`@osdk/oauth : refresh : ${client.client_id}`, JSON.stringify(x));\n}\nexport function removeSession(client) {\n    // MUST `sessionStorage?` as nodejs does not have sessionStorage\n    globalThis.sessionStorage?.removeItem(`@osdk/oauth : refresh : ${client.client_id}`);\n}\nexport function readSession(client) {\n    return JSON.parse(\n    // MUST `sessionStorage?` as nodejs does not have sessionStorage\n    globalThis.sessionStorage?.getItem(`@osdk/oauth : refresh : ${client.client_id}`)\n        ?? \"{}\");\n}\nexport function common(client, as, _signIn, oauthHttpOptions, refresh) {\n    let token;\n    const eventTarget = new TypedEventTarget();\n    function makeTokenAndSaveRefresh(resp, type) {\n        const { refresh_token, expires_in, access_token } = resp;\n        invariant(expires_in != null);\n        saveLocal(client, { refresh_token });\n        token = {\n            refresh_token,\n            expires_in,\n            access_token,\n            expires_at: Date.now() + expires_in * 1000,\n        };\n        eventTarget.dispatchTypedEvent(type, new CustomEvent(type, { detail: token }));\n        return token;\n    }\n    let refreshTimeout;\n    function rmTimeout() {\n        if (refreshTimeout)\n            clearTimeout(refreshTimeout);\n    }\n    function restartRefreshTimer(evt) {\n        if (refresh) {\n            rmTimeout();\n            refreshTimeout = setTimeout(refresh, evt.detail.expires_in * 1000 - 60 * 1000);\n        }\n    }\n    async function signOut() {\n        invariant(token, \"not signed in\");\n        const result = await processRevocationResponse(await revocationRequest(as, client, token.access_token, oauthHttpOptions));\n        rmTimeout();\n        // Clean up\n        removeLocal(client);\n        token = undefined;\n        throwIfError(result);\n        eventTarget.dispatchTypedEvent(\"signOut\", new Event(\"signOut\"));\n    }\n    let pendingSignIn;\n    async function signIn() {\n        if (pendingSignIn) {\n            return pendingSignIn;\n        }\n        try {\n            pendingSignIn = _signIn();\n            return await pendingSignIn;\n        }\n        finally {\n            pendingSignIn = undefined;\n        }\n    }\n    eventTarget.addEventListener(\"signIn\", restartRefreshTimer);\n    eventTarget.addEventListener(\"refresh\", restartRefreshTimer);\n    function getTokenOrUndefined() {\n        if (!token || Date.now() >= token.expires_at) {\n            return undefined;\n        }\n        return token?.access_token;\n    }\n    const getToken = Object.assign(async function getToken() {\n        if (!token || Date.now() >= token.expires_at) {\n            token = await signIn();\n        }\n        return token?.access_token;\n    }, {\n        signIn,\n        refresh,\n        signOut,\n        rmTimeout,\n        getTokenOrUndefined,\n        addEventListener: eventTarget.addEventListener.bind(eventTarget),\n        removeEventListener: eventTarget.removeEventListener.bind(eventTarget),\n    });\n    return { getToken, makeTokenAndSaveRefresh };\n}\nexport function createAuthorizationServer(ctxPath, url) {\n    const issuer = `${new URL(ctxPath, url)}`;\n    return {\n        token_endpoint: `${issuer}/api/oauth2/token`,\n        authorization_endpoint: `${issuer}/api/oauth2/authorize`,\n        revocation_endpoint: `${issuer}/api/oauth2/revoke_token`,\n        issuer,\n    };\n}\n"],"mappings":"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","ignoreList":[]}

package/build/esm/createConfidentialOauthClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createConfidentialOauthClient.d.ts","sourceRoot":"","sources":["../../src/createConfidentialOauthClient.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAG5E;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,MAAM,EAAoD,EAClE,OAAO,GAAE,OAAO,UAAU,CAAC,KAAwB,EACnD,OAAO,GAAE,MAAoB,GAC5B,uBAAuB,CAgCzB"}
+{"version":3,"file":"createConfidentialOauthClient.d.ts","sourceRoot":"","sources":["../../src/createConfidentialOauthClient.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAG5E;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,MAAM,EAAwC,EACtD,OAAO,GAAE,OAAO,UAAU,CAAC,KAAwB,EACnD,OAAO,GAAE,MAAoB,GAC5B,uBAAuB,CAgCzB"}

package/build/esm/createConfidentialOauthClient.js

@@ -25,7 +25,7 @@ import { throwIfError } from "./throwIfError.js";
  * @param ctxPath
  * @returns which can be used as a token provider
  */
-export function createConfidentialOauthClient(client_id, client_secret, url, scopes = ["api:ontologies-read", "api:ontologies-write"], fetchFn = globalThis.fetch, ctxPath = "multipass") {
+export function createConfidentialOauthClient(client_id, client_secret, url, scopes = ["api:read-data", "api:write-data"], fetchFn = globalThis.fetch, ctxPath = "multipass") {
   const client = {
     client_id,
     client_secret

package/build/esm/createConfidentialOauthClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"createConfidentialOauthClient.js","names":["clientCredentialsGrantRequest","customFetch","processClientCredentialsResponse","common","createAuthorizationServer","throwIfError","createConfidentialOauthClient","client_id","client_secret","url","scopes","fetchFn","globalThis","fetch","ctxPath","client","authServer","oauthHttpOptions","getToken","makeTokenAndSaveRefresh","URLSearchParams","scope","join","undefined"],"sources":["createConfidentialOauthClient.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { clientCredentialsGrantRequest, customFetch, processClientCredentialsResponse, } from \"oauth4webapi\";\nimport { common, createAuthorizationServer } from \"./common.js\";\nimport { throwIfError } from \"./throwIfError.js\";\n/**\n * @param client_id\n * @param client_secret\n * @param url the base url of your foundry server\n * @param scopes\n * @param fetchFn\n * @param ctxPath\n * @returns which can be used as a token provider\n */\nexport function createConfidentialOauthClient(client_id, client_secret, url, scopes = [\"api:ontologies-read\", \"api:ontologies-write\"], fetchFn = globalThis.fetch, ctxPath = \"multipass\") {\n    const client = { client_id, client_secret };\n    const authServer = createAuthorizationServer(ctxPath, url);\n    const oauthHttpOptions = { [customFetch]: fetchFn };\n    const { getToken, makeTokenAndSaveRefresh } = common(client, authServer, _signIn, oauthHttpOptions, undefined);\n    async function _signIn() {\n        return makeTokenAndSaveRefresh(throwIfError(await processClientCredentialsResponse(authServer, client, await clientCredentialsGrantRequest(authServer, client, new URLSearchParams({ scope: scopes.join(\" \") }), oauthHttpOptions))), \"signIn\");\n    }\n    return getToken;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,6BAA6B,EAAEC,WAAW,EAAEC,gCAAgC,QAAS,cAAc;AAC5G,SAASC,MAAM,EAAEC,yBAAyB,QAAQ,aAAa;AAC/D,SAASC,YAAY,QAAQ,mBAAmB;AAChD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,6BAA6BA,CAACC,SAAS,EAAEC,aAAa,EAAEC,GAAG,EAAEC,MAAM,GAAG,CAAC,qBAAqB,EAAE,sBAAsB,CAAC,EAAEC,OAAO,GAAGC,UAAU,CAACC,KAAK,EAAEC,OAAO,GAAG,WAAW,EAAE;EACtL,MAAMC,MAAM,GAAG;IAAER,SAAS;IAAEC;EAAc,CAAC;EAC3C,MAAMQ,UAAU,GAAGZ,yBAAyB,CAACU,OAAO,EAAEL,GAAG,CAAC;EAC1D,MAAMQ,gBAAgB,GAAG;IAAE,CAAChB,WAAW,GAAGU;EAAQ,CAAC;EACnD,MAAM;IAAEO,QAAQ;IAAEC;EAAwB,CAAC,GAAGhB,MAAM,CAACY,MAAM,EAAEC,UAAU,EACvE,kBAAyB;IACrB,OAAOG,uBAAuB,CAACd,YAAY,CAAC,MAAMH,gCAAgC,CAACc,UAAU,EAAED,MAAM,EAAE,MAAMf,6BAA6B,CAACgB,UAAU,EAAED,MAAM,EAAE,IAAIK,eAAe,CAAC;MAAEC,KAAK,EAAEX,MAAM,CAACY,IAAI,CAAC,GAAG;IAAE,CAAC,CAAC,EAAEL,gBAAgB,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC;EACnP,CAAC,EAHiFA,gBAAgB,EAAEM,SAAS,CAAC;EAI9G,OAAOL,QAAQ;AACnB","ignoreList":[]}
+{"version":3,"file":"createConfidentialOauthClient.js","names":["clientCredentialsGrantRequest","customFetch","processClientCredentialsResponse","common","createAuthorizationServer","throwIfError","createConfidentialOauthClient","client_id","client_secret","url","scopes","fetchFn","globalThis","fetch","ctxPath","client","authServer","oauthHttpOptions","getToken","makeTokenAndSaveRefresh","URLSearchParams","scope","join","undefined"],"sources":["createConfidentialOauthClient.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { clientCredentialsGrantRequest, customFetch, processClientCredentialsResponse, } from \"oauth4webapi\";\nimport { common, createAuthorizationServer } from \"./common.js\";\nimport { throwIfError } from \"./throwIfError.js\";\n/**\n * @param client_id\n * @param client_secret\n * @param url the base url of your foundry server\n * @param scopes\n * @param fetchFn\n * @param ctxPath\n * @returns which can be used as a token provider\n */\nexport function createConfidentialOauthClient(client_id, client_secret, url, scopes = [\"api:read-data\", \"api:write-data\"], fetchFn = globalThis.fetch, ctxPath = \"multipass\") {\n    const client = { client_id, client_secret };\n    const authServer = createAuthorizationServer(ctxPath, url);\n    const oauthHttpOptions = { [customFetch]: fetchFn };\n    const { getToken, makeTokenAndSaveRefresh } = common(client, authServer, _signIn, oauthHttpOptions, undefined);\n    async function _signIn() {\n        return makeTokenAndSaveRefresh(throwIfError(await processClientCredentialsResponse(authServer, client, await clientCredentialsGrantRequest(authServer, client, new URLSearchParams({ scope: scopes.join(\" \") }), oauthHttpOptions))), \"signIn\");\n    }\n    return getToken;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,6BAA6B,EAAEC,WAAW,EAAEC,gCAAgC,QAAS,cAAc;AAC5G,SAASC,MAAM,EAAEC,yBAAyB,QAAQ,aAAa;AAC/D,SAASC,YAAY,QAAQ,mBAAmB;AAChD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,6BAA6BA,CAACC,SAAS,EAAEC,aAAa,EAAEC,GAAG,EAAEC,MAAM,GAAG,CAAC,eAAe,EAAE,gBAAgB,CAAC,EAAEC,OAAO,GAAGC,UAAU,CAACC,KAAK,EAAEC,OAAO,GAAG,WAAW,EAAE;EAC1K,MAAMC,MAAM,GAAG;IAAER,SAAS;IAAEC;EAAc,CAAC;EAC3C,MAAMQ,UAAU,GAAGZ,yBAAyB,CAACU,OAAO,EAAEL,GAAG,CAAC;EAC1D,MAAMQ,gBAAgB,GAAG;IAAE,CAAChB,WAAW,GAAGU;EAAQ,CAAC;EACnD,MAAM;IAAEO,QAAQ;IAAEC;EAAwB,CAAC,GAAGhB,MAAM,CAACY,MAAM,EAAEC,UAAU,EACvE,kBAAyB;IACrB,OAAOG,uBAAuB,CAACd,YAAY,CAAC,MAAMH,gCAAgC,CAACc,UAAU,EAAED,MAAM,EAAE,MAAMf,6BAA6B,CAACgB,UAAU,EAAED,MAAM,EAAE,IAAIK,eAAe,CAAC;MAAEC,KAAK,EAAEX,MAAM,CAACY,IAAI,CAAC,GAAG;IAAE,CAAC,CAAC,EAAEL,gBAAgB,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC;EACnP,CAAC,EAHiFA,gBAAgB,EAAEM,SAAS,CAAC;EAI9G,OAAOL,QAAQ;AACnB","ignoreList":[]}

package/build/esm/createPublicOauthClient.d.ts

@@ -13,7 +13,7 @@ export interface PublicOauthClientOptions {
      */
     postLoginPage?: string;
     /**
-     * * @param {string[]} [scopes=[]] - OAuth scopes to request. If not provided, defaults to `["api:ontologies-read", "api:ontologies-write"]`
+     * * @param {string[]} [scopes=[]] - OAuth scopes to request. If not provided, defaults to `["api:read-data", "api:write-data"]`
      */
     scopes?: string[];
     /**
@@ -44,7 +44,7 @@ export declare function createPublicOauthClient(clientId: string, url: string, r
  * @param {boolean} useHistory - If true, uses `history.replaceState()`, otherwise uses `window.location.assign()` (defaults to true)
  * @param {string} loginPage - Custom landing page URL prior to logging in
  * @param {string} postLoginPage - URL to return to after completed authentication cycle (defaults to `window.location.toString()`)
- * @param {string[]} scopes - OAuth scopes to request. If not provided, defaults to `["api:ontologies-read", "api:ontologies-write"]`
+ * @param {string[]} scopes - OAuth scopes to request. If not provided, defaults to `["api:read-data", "api:write-data"]`
  * @param {typeof globalThis.fetch} fetchFn - Custom fetch function to use for requests (defaults to `globalThis.fetch`)
  * @param {string} ctxPath - Context path for the authorization server (defaults to "multipass")
  * @returns {PublicOauthClient} A client that can be used as a token provider

package/build/esm/createPublicOauthClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createPublicOauthClient.d.ts","sourceRoot":"","sources":["../../src/createPublicOauthClient.ts"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAYhE,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAElC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,wBAAwB,GACjC,iBAAiB,CAAC;AAErB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,OAAO,EACpB,SAAS,CAAC,EAAE,MAAM,EAClB,aAAa,CAAC,EAAE,MAAM,EACtB,MAAM,CAAC,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,EACjC,OAAO,CAAC,EAAE,MAAM,GACf,iBAAiB,CAAC"}
+{"version":3,"file":"createPublicOauthClient.d.ts","sourceRoot":"","sources":["../../src/createPublicOauthClient.ts"],"names":[],"mappings":"AAsCA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAYhE,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAElC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,wBAAwB,GACjC,iBAAiB,CAAC;AAErB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,OAAO,EACpB,SAAS,CAAC,EAAE,MAAM,EAClB,aAAa,CAAC,EAAE,MAAM,EACtB,MAAM,CAAC,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,EACjC,OAAO,CAAC,EAAE,MAAM,GACf,iBAAiB,CAAC"}

package/build/esm/createPublicOauthClient.js

@@ -15,7 +15,7 @@
  */
 import delay from "delay";
 import { authorizationCodeGrantRequest, calculatePKCECodeChallenge, customFetch, generateRandomCodeVerifier, generateRandomState, processAuthorizationCodeOAuth2Response, refreshTokenGrantRequest, validateAuthResponse } from "oauth4webapi";
-import { common, createAuthorizationServer, readLocal, removeLocal, saveLocal } from "./common.js";
+import { common, createAuthorizationServer, readLocal, readSession, removeLocal, removeSession, saveLocal, saveSession } from "./common.js";
 import { throwIfError } from "./throwIfError.js";
 import { processOptionsAndAssignDefaults } from "./utils.js";
 export function createPublicOauthClient(client_id, url, redirect_uri, useHistory, loginPage, postLoginPage, scopes, fetchFn, ctxPath) {
@@ -49,7 +49,10 @@ export function createPublicOauthClient(client_id, url, redirect_uri, useHistory
   }, oauthHttpOptions, maybeRefresh.bind(globalThis, true));
   // as an arrow function, `useHistory` is known to be a boolean
   const go = async x => {
-    if (useHistory) return window.history.replaceState({}, "", x);else window.location.assign(x);
+    if (useHistory) {
+      window.history.replaceState({}, "", x);
+      return;
+    } else window.location.assign(x);
     await delay(1000);
     throw new Error("Unable to redirect");
   };
@@ -68,8 +71,9 @@ export function createPublicOauthClient(client_id, url, redirect_uri, useHistory
       if (result && window.location.pathname === new URL(redirect_uri).pathname) {
         const {
           oldUrl
-        } = readLocal(client);
-        go(oldUrl ?? "/");
+        } = readSession(client);
+        // don't block on the redirect
+        void go(oldUrl ?? "/");
       }
       return result;
     } catch (e) {
@@ -85,14 +89,14 @@ export function createPublicOauthClient(client_id, url, redirect_uri, useHistory
   }
   async function maybeHandleAuthReturn() {
     const {
-      codeVerifier,
       state,
-      oldUrl
-    } = readLocal(client);
+      oldUrl,
+      codeVerifier
+    } = readSession(client);
     if (!codeVerifier) return;
     try {
       const ret = makeTokenAndSaveRefresh(throwIfError(await processAuthorizationCodeOAuth2Response(authServer, client, await authorizationCodeGrantRequest(authServer, client, throwIfError(validateAuthResponse(authServer, client, new URL(window.location.href), state)), redirect_uri, codeVerifier, oauthHttpOptions))), "signIn");
-      go(oldUrl);
+      void go(oldUrl);
       return ret;
     } catch (e) {
       if (process.env.NODE_ENV !== "production") {
@@ -100,20 +104,25 @@ export function createPublicOauthClient(client_id, url, redirect_uri, useHistory
         console.warn("Failed to get OAuth2 token using PKCE, removing PKCE and starting a new auth flow", e);
       }
       removeLocal(client);
+      removeSession(client);
+      throw e;
     }
   }
   // As an arrow function, `scopes` and `postLoginPage` are known at compile time
   const initiateLoginRedirect = async () => {
     if (loginPage && window.location.href !== loginPage && window.location.pathname !== loginPage) {
-      saveLocal(client, {
+      saveLocal(client, {});
+      saveSession(client, {
         oldUrl: postLoginPage
       });
-      return await go(loginPage);
+      await go(loginPage);
+      return;
     }
     const state = generateRandomState();
     const codeVerifier = generateRandomCodeVerifier();
-    const oldUrl = readLocal(client).oldUrl ?? window.location.toString();
-    saveLocal(client, {
+    const oldUrl = readSession(client).oldUrl ?? window.location.toString();
+    saveLocal(client, {});
+    saveSession(client, {
       codeVerifier,
       state,
       oldUrl

package/build/esm/createPublicOauthClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPublicOauthClient.js","names":["delay","authorizationCodeGrantRequest","calculatePKCECodeChallenge","customFetch","generateRandomCodeVerifier","generateRandomState","processAuthorizationCodeOAuth2Response","refreshTokenGrantRequest","validateAuthResponse","common","createAuthorizationServer","readLocal","removeLocal","saveLocal","throwIfError","processOptionsAndAssignDefaults","createPublicOauthClient","client_id","url","redirect_uri","useHistory","loginPage","postLoginPage","scopes","fetchFn","ctxPath","client","token_endpoint_auth_method","authServer","oauthHttpOptions","makeTokenAndSaveRefresh","getToken","_signIn","maybeRefresh","maybeHandleAuthReturn","initiateLoginRedirect","bind","globalThis","go","x","window","history","replaceState","location","assign","Error","expectRefreshToken","refresh_token","result","pathname","URL","oldUrl","e","process","env","NODE_ENV","console","warn","codeVerifier","state","ret","href","toString","authorization_endpoint","URLSearchParams","response_type","code_challenge","code_challenge_method","scope","join"],"sources":["createPublicOauthClient.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport delay from \"delay\";\nimport { authorizationCodeGrantRequest, calculatePKCECodeChallenge, customFetch, generateRandomCodeVerifier, generateRandomState, processAuthorizationCodeOAuth2Response, refreshTokenGrantRequest, validateAuthResponse, } from \"oauth4webapi\";\nimport { common, createAuthorizationServer, readLocal, removeLocal, saveLocal, } from \"./common.js\";\nimport { throwIfError } from \"./throwIfError.js\";\nimport { processOptionsAndAssignDefaults } from \"./utils.js\";\nexport function createPublicOauthClient(client_id, url, redirect_uri, useHistory, loginPage, postLoginPage, scopes, fetchFn, ctxPath) {\n    ({\n        useHistory,\n        loginPage,\n        postLoginPage,\n        scopes,\n        fetchFn,\n        ctxPath,\n    } = processOptionsAndAssignDefaults(url, redirect_uri, useHistory, loginPage, postLoginPage, scopes, fetchFn, ctxPath));\n    const client = { client_id, token_endpoint_auth_method: \"none\" };\n    const authServer = createAuthorizationServer(ctxPath, url);\n    const oauthHttpOptions = { [customFetch]: fetchFn };\n    const { makeTokenAndSaveRefresh, getToken } = common(client, authServer, _signIn, oauthHttpOptions, maybeRefresh.bind(globalThis, true));\n    // as an arrow function, `useHistory` is known to be a boolean\n    const go = async (x) => {\n        if (useHistory)\n            return window.history.replaceState({}, \"\", x);\n        else\n            window.location.assign(x);\n        await delay(1000);\n        throw new Error(\"Unable to redirect\");\n    };\n    async function maybeRefresh(expectRefreshToken) {\n        const { refresh_token } = readLocal(client);\n        if (!refresh_token) {\n            if (expectRefreshToken)\n                throw new Error(\"No refresh token found\");\n            return;\n        }\n        try {\n            // note, we don't use processRefreshTokenResponse because the mp oauth implementation\n            // doesn't do refresh tokens quite right and this lets us skip the id check\n            const result = makeTokenAndSaveRefresh(throwIfError(await processAuthorizationCodeOAuth2Response(authServer, client, await refreshTokenGrantRequest(authServer, client, refresh_token, oauthHttpOptions))), \"refresh\");\n            if (result && window.location.pathname === new URL(redirect_uri).pathname) {\n                const { oldUrl } = readLocal(client);\n                go(oldUrl ?? \"/\");\n            }\n            return result;\n        }\n        catch (e) {\n            if (process.env.NODE_ENV !== \"production\") {\n                // eslint-disable-next-line no-console\n                console.warn(\"Failed to get OAuth2 refresh token. Removing refresh token\", e);\n            }\n            removeLocal(client);\n            if (expectRefreshToken) {\n                throw new Error(\"Could not refresh token\");\n            }\n        }\n    }\n    async function maybeHandleAuthReturn() {\n        const { codeVerifier, state, oldUrl } = readLocal(client);\n        if (!codeVerifier)\n            return;\n        try {\n            const ret = makeTokenAndSaveRefresh(throwIfError(await processAuthorizationCodeOAuth2Response(authServer, client, await authorizationCodeGrantRequest(authServer, client, throwIfError(validateAuthResponse(authServer, client, new URL(window.location.href), state)), redirect_uri, codeVerifier, oauthHttpOptions))), \"signIn\");\n            go(oldUrl);\n            return ret;\n        }\n        catch (e) {\n            if (process.env.NODE_ENV !== \"production\") {\n                // eslint-disable-next-line no-console\n                console.warn(\"Failed to get OAuth2 token using PKCE, removing PKCE and starting a new auth flow\", e);\n            }\n            removeLocal(client);\n        }\n    }\n    // As an arrow function, `scopes` and `postLoginPage` are known at compile time\n    const initiateLoginRedirect = async () => {\n        if (loginPage\n            && window.location.href !== loginPage\n            && window.location.pathname !== loginPage) {\n            saveLocal(client, { oldUrl: postLoginPage });\n            return await go(loginPage);\n        }\n        const state = generateRandomState();\n        const codeVerifier = generateRandomCodeVerifier();\n        const oldUrl = readLocal(client).oldUrl ?? window.location.toString();\n        saveLocal(client, { codeVerifier, state, oldUrl });\n        window.location.assign(`${authServer\n            .authorization_endpoint}?${new URLSearchParams({\n            client_id,\n            response_type: \"code\",\n            state,\n            redirect_uri,\n            code_challenge: await calculatePKCECodeChallenge(codeVerifier),\n            code_challenge_method: \"S256\",\n            scope: [\"offline_access\", ...scopes].join(\" \"),\n        })}`);\n        // Give time for redirect to happen\n        await delay(1000);\n        throw new Error(\"Unable to redirect\");\n    };\n    /** Will throw if there is no token! */\n    async function _signIn() {\n        // 1. Check if we have a refresh token in local storage\n        return await maybeRefresh()\n            // 2. If there is no refresh token we are likely trying to perform the callback\n            ?? await maybeHandleAuthReturn()\n            // 3. If we haven't been able to load the token from one of the two above ways, we need to make the initial auth request\n            ?? await initiateLoginRedirect();\n    }\n    return getToken;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"createPublicOauthClient.js","names":["delay","authorizationCodeGrantRequest","calculatePKCECodeChallenge","customFetch","generateRandomCodeVerifier","generateRandomState","processAuthorizationCodeOAuth2Response","refreshTokenGrantRequest","validateAuthResponse","common","createAuthorizationServer","readLocal","readSession","removeLocal","removeSession","saveLocal","saveSession","throwIfError","processOptionsAndAssignDefaults","createPublicOauthClient","client_id","url","redirect_uri","useHistory","loginPage","postLoginPage","scopes","fetchFn","ctxPath","client","token_endpoint_auth_method","authServer","oauthHttpOptions","makeTokenAndSaveRefresh","getToken","_signIn","maybeRefresh","maybeHandleAuthReturn","initiateLoginRedirect","bind","globalThis","go","x","window","history","replaceState","location","assign","Error","expectRefreshToken","refresh_token","result","pathname","URL","oldUrl","e","process","env","NODE_ENV","console","warn","state","codeVerifier","ret","href","toString","authorization_endpoint","URLSearchParams","response_type","code_challenge","code_challenge_method","scope","join"],"sources":["createPublicOauthClient.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport delay from \"delay\";\nimport { authorizationCodeGrantRequest, calculatePKCECodeChallenge, customFetch, generateRandomCodeVerifier, generateRandomState, processAuthorizationCodeOAuth2Response, refreshTokenGrantRequest, validateAuthResponse, } from \"oauth4webapi\";\nimport { common, createAuthorizationServer, readLocal, readSession, removeLocal, removeSession, saveLocal, saveSession, } from \"./common.js\";\nimport { throwIfError } from \"./throwIfError.js\";\nimport { processOptionsAndAssignDefaults } from \"./utils.js\";\nexport function createPublicOauthClient(client_id, url, redirect_uri, useHistory, loginPage, postLoginPage, scopes, fetchFn, ctxPath) {\n    ({\n        useHistory,\n        loginPage,\n        postLoginPage,\n        scopes,\n        fetchFn,\n        ctxPath,\n    } = processOptionsAndAssignDefaults(url, redirect_uri, useHistory, loginPage, postLoginPage, scopes, fetchFn, ctxPath));\n    const client = { client_id, token_endpoint_auth_method: \"none\" };\n    const authServer = createAuthorizationServer(ctxPath, url);\n    const oauthHttpOptions = { [customFetch]: fetchFn };\n    const { makeTokenAndSaveRefresh, getToken } = common(client, authServer, _signIn, oauthHttpOptions, maybeRefresh.bind(globalThis, true));\n    // as an arrow function, `useHistory` is known to be a boolean\n    const go = async (x) => {\n        if (useHistory) {\n            window.history.replaceState({}, \"\", x);\n            return;\n        }\n        else\n            window.location.assign(x);\n        await delay(1000);\n        throw new Error(\"Unable to redirect\");\n    };\n    async function maybeRefresh(expectRefreshToken) {\n        const { refresh_token } = readLocal(client);\n        if (!refresh_token) {\n            if (expectRefreshToken)\n                throw new Error(\"No refresh token found\");\n            return;\n        }\n        try {\n            // note, we don't use processRefreshTokenResponse because the mp oauth implementation\n            // doesn't do refresh tokens quite right and this lets us skip the id check\n            const result = makeTokenAndSaveRefresh(throwIfError(await processAuthorizationCodeOAuth2Response(authServer, client, await refreshTokenGrantRequest(authServer, client, refresh_token, oauthHttpOptions))), \"refresh\");\n            if (result && window.location.pathname === new URL(redirect_uri).pathname) {\n                const { oldUrl } = readSession(client);\n                // don't block on the redirect\n                void go(oldUrl ?? \"/\");\n            }\n            return result;\n        }\n        catch (e) {\n            if (process.env.NODE_ENV !== \"production\") {\n                // eslint-disable-next-line no-console\n                console.warn(\"Failed to get OAuth2 refresh token. Removing refresh token\", e);\n            }\n            removeLocal(client);\n            if (expectRefreshToken) {\n                throw new Error(\"Could not refresh token\");\n            }\n        }\n    }\n    async function maybeHandleAuthReturn() {\n        const { state, oldUrl, codeVerifier } = readSession(client);\n        if (!codeVerifier)\n            return;\n        try {\n            const ret = makeTokenAndSaveRefresh(throwIfError(await processAuthorizationCodeOAuth2Response(authServer, client, await authorizationCodeGrantRequest(authServer, client, throwIfError(validateAuthResponse(authServer, client, new URL(window.location.href), state)), redirect_uri, codeVerifier, oauthHttpOptions))), \"signIn\");\n            void go(oldUrl);\n            return ret;\n        }\n        catch (e) {\n            if (process.env.NODE_ENV !== \"production\") {\n                // eslint-disable-next-line no-console\n                console.warn(\"Failed to get OAuth2 token using PKCE, removing PKCE and starting a new auth flow\", e);\n            }\n            removeLocal(client);\n            removeSession(client);\n            throw e;\n        }\n    }\n    // As an arrow function, `scopes` and `postLoginPage` are known at compile time\n    const initiateLoginRedirect = async () => {\n        if (loginPage\n            && window.location.href !== loginPage\n            && window.location.pathname !== loginPage) {\n            saveLocal(client, {});\n            saveSession(client, { oldUrl: postLoginPage });\n            await go(loginPage);\n            return;\n        }\n        const state = generateRandomState();\n        const codeVerifier = generateRandomCodeVerifier();\n        const oldUrl = readSession(client).oldUrl ?? window.location.toString();\n        saveLocal(client, {});\n        saveSession(client, { codeVerifier, state, oldUrl });\n        window.location.assign(`${authServer\n            .authorization_endpoint}?${new URLSearchParams({\n            client_id,\n            response_type: \"code\",\n            state,\n            redirect_uri,\n            code_challenge: await calculatePKCECodeChallenge(codeVerifier),\n            code_challenge_method: \"S256\",\n            scope: [\"offline_access\", ...scopes].join(\" \"),\n        })}`);\n        // Give time for redirect to happen\n        await delay(1000);\n        throw new Error(\"Unable to redirect\");\n    };\n    /** Will throw if there is no token! */\n    async function _signIn() {\n        // 1. Check if we have a refresh token in local storage\n        return await maybeRefresh()\n            // 2. If there is no refresh token we are likely trying to perform the callback\n            ?? await maybeHandleAuthReturn()\n            // 3. If we haven't been able to load the token from one of the two above ways, we need to make the initial auth request\n            ?? await initiateLoginRedirect();\n    }\n    return getToken;\n}\n"],"mappings":"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","ignoreList":[]}

package/build/esm/publicOauth.test.js

@@ -42,7 +42,8 @@ vi.mock("./common.js", async importOriginal => {
         makeTokenAndSaveRefresh: hoistedMocks.makeTokenAndSaveRefresh
       };
     }),
-    readLocal: vi.spyOn(original, "readLocal")
+    readLocal: vi.spyOn(original, "readLocal"),
+    readSession: vi.spyOn(original, "readSession")
     // vi.fn(original.readLocal),
   };
 });
@@ -66,6 +67,11 @@ describe(createPublicOauthClient, () => {
     getItem: vi.fn(),
     removeItem: vi.fn()
   };
+  const mockSessionStorage = {
+    setItem: vi.fn(),
+    getItem: vi.fn(),
+    removeItem: vi.fn()
+  };
   beforeEach(() => {
     vi.restoreAllMocks();
     fetchFn.mockRestore();
@@ -77,6 +83,7 @@ describe(createPublicOauthClient, () => {
   beforeAll(() => {
     vi.stubGlobal("window", mockWindow);
     vi.stubGlobal("localStorage", mockLocalStorage);
+    vi.stubGlobal("sessionStorage", mockSessionStorage);
   });
   afterAll(() => {
     vi.unstubAllGlobals();
@@ -155,22 +162,32 @@ describe(createPublicOauthClient, () => {
       }), commonJs.createAuthorizationServer(clientArgs.ctxPath ?? "/multipass", clientArgs.foundryUrl), expect.any(Function), expect.anything(), expect.any(Function));
     });
     describe.each([{
-      refresh_token: "a-refresh-token"
+      localStorage: {
+        refresh_token: "a-refresh-token"
+      },
+      sessionStorage: {}
+    }, {
+      localStorage: {},
+      sessionStorage: {
+        codeVerifier: "hi",
+        state: "mom",
+        oldUrl: "https://someoldurl.local"
+      }
     }, {
-      codeVerifier: "hi",
-      state: "mom",
-      oldUrl: "https://someoldurl.local"
-    }, {}])("Initial Local State: %s", initialLocalState => {
+      localStorage: {},
+      sessionStorage: {}
+    }])("Initial Local State: %s", initialState => {
       const ACCESS_TOKEN = (Math.random() + 1).toString(36).substring(7);
       beforeEach(() => {
-        vi.mocked(commonJs.readLocal).mockImplementation(() => initialLocalState);
+        vi.mocked(commonJs.readLocal).mockImplementation(() => initialState.localStorage);
+        vi.mocked(commonJs.readSession).mockImplementation(() => initialState.sessionStorage);
         hoistedMocks.makeTokenAndSaveRefresh.mockImplementation(() => ({
           access_token: ACCESS_TOKEN,
           expires_at: Date.now(),
           expires_in: 10000
         }));
       });
-      if (Object.keys(initialLocalState).length === 0) {
+      if (Object.keys(initialState.localStorage).length === 0 && Object.keys(initialState.sessionStorage).length === 0) {
         if (should.redirectToLoginPage) {
           it("redirects to login page", async () => {
             const tokenPromise = client();
@@ -178,7 +195,7 @@ describe(createPublicOauthClient, () => {
             if (should.redirectToLoginPage) {
               // expect save local
               await expect(tokenPromise).resolves.toBeUndefined();
-              expect(mockLocalStorage.setItem).toBeCalledWith(`@osdk/oauth : refresh : ${clientArgs.clientId}`, JSON.stringify({
+              expect(mockSessionStorage.setItem).toBeCalledWith(`@osdk/oauth : refresh : ${clientArgs.clientId}`, JSON.stringify({
                 oldUrl: window.location.toString()
               }));
               expect(mockWindow.history.replaceState).toHaveBeenCalledWith({}, "", clientArgs.loginPage);
@@ -191,7 +208,7 @@ describe(createPublicOauthClient, () => {
             if (should.redirectToLoginPage) {
               // expect save local
               await expect(tokenPromise).resolves.toBeUndefined();
-              expect(mockLocalStorage.setItem).toBeCalledWith(`@osdk/oauth : refresh : ${clientArgs.clientId}`, JSON.stringify({
+              expect(mockSessionStorage.setItem).toBeCalledWith(`@osdk/oauth : refresh : ${clientArgs.clientId}`, JSON.stringify({
                 oldUrl: window.location.toString()
               }));
               expect(mockWindow.history.replaceState).toHaveBeenCalledWith({}, "", clientArgs.loginPage);
@@ -210,13 +227,13 @@ describe(createPublicOauthClient, () => {
               redirect_uri: clientArgs.redirectUrl,
               response_type: "code",
               code_challenge_method: "S256",
-              scope: "offline_access api:ontologies-read api:ontologies-write",
+              scope: "offline_access api:read-data api:write-data",
               state: expect.any(String)
             }));
           });
         }
       }
-      if (initialLocalState.codeVerifier) {
+      if (initialState.sessionStorage.codeVerifier) {
         it("tries to auth with return results", async () => {
           await expect(client()).resolves.toEqual(ACCESS_TOKEN);
           expect(hoistedMocks.makeTokenAndSaveRefresh).toHaveBeenCalledTimes(1);
@@ -224,10 +241,10 @@ describe(createPublicOauthClient, () => {
           // this is only because we didn't mock out the internals
           "signIn");
           expect(mockWindow.history.replaceState).toHaveBeenCalledTimes(1);
-          expect(mockWindow.history.replaceState).toBeCalledWith(expect.anything(), expect.anything(), initialLocalState.oldUrl);
+          expect(mockWindow.history.replaceState).toBeCalledWith(expect.anything(), expect.anything(), initialState.sessionStorage.oldUrl);
         });
       }
-      if (initialLocalState.refresh_token) {
+      if (initialState.localStorage.refresh_token) {
         it("refreshes", async () => {
           await expect(client()).resolves.toEqual(ACCESS_TOKEN);
           expect(hoistedMocks.makeTokenAndSaveRefresh).toHaveBeenCalledTimes(1);

package/build/esm/publicOauth.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"publicOauth.test.js","names":["afterAll","afterEach","beforeAll","beforeEach","describe","expect","it","vi","commonJs","createPublicOauthClient","hoistedMocks","hoisted","makeTokenAndSaveRefresh","fn","mock","importOriginal","original","default","ms","opts","common","args","result","readLocal","spyOn","DEFAULT_CUR_URL","URL","fetchFn","mockWindow","location","toString","assign","href","pathname","history","replaceState","mockLocalStorage","setItem","getItem","removeItem","restoreAllMocks","mockRestore","clearAllMocks","mockReset","stubGlobal","unstubAllGlobals","BASE_CLIENT_ARGS","clientId","foundryUrl","redirectUrl","fullLoginUrl","each","name","currentUrl","clientArgs","should","redirectToLoginPage","loginPage","client","useHistory","postLoginPage","scopes","ctxPath","mocked","toHaveBeenCalledWith","objectContaining","client_id","token_endpoint_auth_method","createAuthorizationServer","any","Function","anything","refresh_token","codeVerifier","state","oldUrl","initialLocalState","ACCESS_TOKEN","Math","random","substring","mockImplementation","access_token","expires_at","Date","now","expires_in","Object","keys","length","tokenPromise","toBeCalledTimes","resolves","toBeUndefined","toBeCalledWith","JSON","stringify","window","rejects","toThrowError","Error","toHaveBeenCalledOnce","url","calls","origin","toEqual","fromEntries","searchParams","entries","code_challenge","String","redirect_uri","response_type","code_challenge_method","scope","toHaveBeenCalledTimes","undefined"],"sources":["publicOauth.test.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n/* eslint-disable @typescript-eslint/consistent-type-imports */\nimport { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi, } from \"vitest\";\nimport * as commonJs from \"./common.js\";\nimport { createPublicOauthClient } from \"./createPublicOauthClient.js\";\nconst hoistedMocks = vi.hoisted(() => {\n    return {\n        makeTokenAndSaveRefresh: vi.fn(),\n    };\n});\nvi.mock(\"delay\", async (importOriginal) => {\n    const original = await importOriginal();\n    return {\n        default: vi.fn((ms, opts) => {\n            // speed up the tests\n            return original.default(ms / 100, opts);\n        }),\n    };\n});\nvi.mock(\"./common.js\", async (importOriginal) => {\n    const original = await importOriginal();\n    return {\n        ...original,\n        common: vi.fn((...args) => {\n            const result = original.common(...args);\n            return {\n                ...result,\n                makeTokenAndSaveRefresh: hoistedMocks.makeTokenAndSaveRefresh,\n            };\n        }),\n        readLocal: vi.spyOn(original, \"readLocal\"),\n        // vi.fn(original.readLocal),\n    };\n});\nvi.mock(\"oauth4webapi\");\ndescribe(createPublicOauthClient, () => {\n    const DEFAULT_CUR_URL = new URL(\"https://fauxurl\");\n    const fetchFn = vi.fn();\n    const mockWindow = {\n        location: {\n            toString: vi.fn(() => DEFAULT_CUR_URL),\n            assign: vi.fn(),\n            href: DEFAULT_CUR_URL.href,\n            pathname: DEFAULT_CUR_URL.pathname,\n        },\n        history: {\n            replaceState: vi.fn(),\n        },\n    };\n    const mockLocalStorage = {\n        setItem: vi.fn(),\n        getItem: vi.fn(),\n        removeItem: vi.fn(),\n    };\n    beforeEach((context) => {\n        vi.restoreAllMocks();\n        fetchFn.mockRestore();\n    });\n    afterEach((context) => {\n        vi.clearAllMocks();\n        fetchFn.mockReset();\n    });\n    beforeAll(() => {\n        vi.stubGlobal(\"window\", mockWindow);\n        vi.stubGlobal(\"localStorage\", mockLocalStorage);\n    });\n    afterAll(() => {\n        vi.unstubAllGlobals();\n    });\n    const BASE_CLIENT_ARGS = {\n        clientId: \"this-would-be-client-id\",\n        foundryUrl: \"https://a.foundry.url.local\",\n        redirectUrl: \"https://my.redirect.url.local\",\n        fetchFn,\n    };\n    const fullLoginUrl = new URL(\"/loginPage\", DEFAULT_CUR_URL);\n    describe.each([\n        {\n            name: \"Basic Usage\",\n            currentUrl: DEFAULT_CUR_URL,\n            clientArgs: {\n                ...BASE_CLIENT_ARGS,\n            },\n            should: {\n                redirectToLoginPage: false,\n            },\n        },\n        {\n            name: \"Base w/ full loginPage and curUrl is root\",\n            currentUrl: DEFAULT_CUR_URL,\n            clientArgs: {\n                ...BASE_CLIENT_ARGS,\n                loginPage: fullLoginUrl.toString(),\n            },\n            should: {\n                redirectToLoginPage: true,\n            },\n        },\n        {\n            name: \"Base w/ full loginPage and curUrl is login page\",\n            currentUrl: fullLoginUrl,\n            clientArgs: {\n                ...BASE_CLIENT_ARGS,\n                loginPage: fullLoginUrl.toString(),\n            },\n            should: {\n                redirectToLoginPage: false,\n            },\n        },\n        {\n            name: \"Base w/ short loginPage and curUrl is root\",\n            currentUrl: DEFAULT_CUR_URL,\n            clientArgs: {\n                ...BASE_CLIENT_ARGS,\n                loginPage: \"/loginPage\",\n            },\n            should: {\n                redirectToLoginPage: true,\n            },\n        },\n        {\n            name: \"Base w/ short loginPage and curUrl is loginPage\",\n            currentUrl: new URL(\"/loginPage\", DEFAULT_CUR_URL),\n            clientArgs: {\n                ...BASE_CLIENT_ARGS,\n                loginPage: \"/loginPage\",\n            },\n            should: {\n                redirectToLoginPage: false,\n            },\n        },\n    ])(\"$name\", ({ clientArgs, currentUrl, should }) => {\n        let client;\n        beforeEach(() => {\n            client = createPublicOauthClient(clientArgs.clientId, clientArgs.foundryUrl, clientArgs.redirectUrl, clientArgs.useHistory, clientArgs.loginPage, clientArgs.postLoginPage, clientArgs.scopes, clientArgs.fetchFn, clientArgs.ctxPath);\n            mockWindow.location.href = new URL(currentUrl).href;\n            mockWindow.location.pathname = new URL(currentUrl).pathname;\n        });\n        it(\"calls common with expected values\", () => {\n            expect(vi.mocked(commonJs.common)).toHaveBeenCalledWith(expect.objectContaining({\n                client_id: clientArgs.clientId,\n                token_endpoint_auth_method: \"none\",\n            }), commonJs.createAuthorizationServer(clientArgs.ctxPath ?? \"/multipass\", clientArgs.foundryUrl), expect.any(Function), expect.anything(), expect.any(Function));\n        });\n        describe.each([\n            {\n                refresh_token: \"a-refresh-token\",\n            },\n            {\n                codeVerifier: \"hi\",\n                state: \"mom\",\n                oldUrl: \"https://someoldurl.local\",\n            },\n            {},\n        ])(\"Initial Local State: %s\", (initialLocalState) => {\n            const ACCESS_TOKEN = (Math.random() + 1).toString(36).substring(7);\n            beforeEach(() => {\n                vi.mocked(commonJs.readLocal).mockImplementation(() => initialLocalState);\n                hoistedMocks.makeTokenAndSaveRefresh.mockImplementation(() => ({\n                    access_token: ACCESS_TOKEN,\n                    expires_at: Date.now(),\n                    expires_in: 10000,\n                }));\n            });\n            if (Object.keys(initialLocalState).length === 0) {\n                if (should.redirectToLoginPage) {\n                    it(\"redirects to login page\", async () => {\n                        const tokenPromise = client();\n                        expect(vi.mocked(commonJs.common)).toBeCalledTimes(1);\n                        if (should.redirectToLoginPage) {\n                            // expect save local\n                            await expect(tokenPromise).resolves.toBeUndefined();\n                            expect(mockLocalStorage.setItem).toBeCalledWith(`@osdk/oauth : refresh : ${clientArgs.clientId}`, JSON.stringify({ oldUrl: window.location.toString() }));\n                            expect(mockWindow.history.replaceState).toHaveBeenCalledWith({}, \"\", clientArgs.loginPage);\n                            return;\n                        }\n                    });\n                }\n                else {\n                    it(\"redirects to multipass\", async () => {\n                        const tokenPromise = client();\n                        expect(vi.mocked(commonJs.common)).toBeCalledTimes(1);\n                        if (should.redirectToLoginPage) {\n                            // expect save local\n                            await expect(tokenPromise).resolves.toBeUndefined();\n                            expect(mockLocalStorage.setItem).toBeCalledWith(`@osdk/oauth : refresh : ${clientArgs.clientId}`, JSON.stringify({ oldUrl: window.location.toString() }));\n                            expect(mockWindow.history.replaceState).toHaveBeenCalledWith({}, \"\", clientArgs.loginPage);\n                            return;\n                        }\n                        // we assume window.location.assign will take you away therefore we\n                        // also have to expect in this scenario that the thrown error happens\n                        await expect(tokenPromise)\n                            .rejects.toThrowError(new Error(\"Unable to redirect\"));\n                        expect(mockWindow.location.assign).toHaveBeenCalledOnce();\n                        const url = new URL(mockWindow.location.assign.mock.calls[0][0]);\n                        expect(url.origin).toEqual(clientArgs.foundryUrl);\n                        expect(url.pathname).toEqual(\"/multipass/api/oauth2/authorize\");\n                        expect(Object.fromEntries(url.searchParams.entries())).toEqual(expect.objectContaining({\n                            client_id: clientArgs.clientId,\n                            code_challenge: expect.any(String),\n                            redirect_uri: clientArgs.redirectUrl,\n                            response_type: \"code\",\n                            code_challenge_method: \"S256\",\n                            scope: \"offline_access api:ontologies-read api:ontologies-write\",\n                            state: expect.any(String),\n                        }));\n                    });\n                }\n            }\n            if (initialLocalState.codeVerifier) {\n                it(\"tries to auth with return results\", async () => {\n                    await expect(client()).resolves.toEqual(ACCESS_TOKEN);\n                    expect(hoistedMocks.makeTokenAndSaveRefresh).toHaveBeenCalledTimes(1);\n                    expect(hoistedMocks.makeTokenAndSaveRefresh).toHaveBeenCalledWith(undefined, // this is only because we didn't mock out the internals\n                    \"signIn\");\n                    expect(mockWindow.history.replaceState).toHaveBeenCalledTimes(1);\n                    expect(mockWindow.history.replaceState).toBeCalledWith(expect.anything(), expect.anything(), initialLocalState.oldUrl);\n                });\n            }\n            if (initialLocalState.refresh_token) {\n                it(\"refreshes\", async () => {\n                    await expect(client()).resolves.toEqual(ACCESS_TOKEN);\n                    expect(hoistedMocks.makeTokenAndSaveRefresh).toHaveBeenCalledTimes(1);\n                    expect(hoistedMocks.makeTokenAndSaveRefresh).toHaveBeenCalledWith(undefined, // this is only because we didn't mock out the internals\n                    \"refresh\");\n                });\n            }\n        });\n    });\n});\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,QAAQ,EAAEC,SAAS,EAAEC,SAAS,EAAEC,UAAU,EAAEC,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAS,QAAQ;AAC9F,OAAO,KAAKC,QAAQ,MAAM,aAAa;AACvC,SAASC,uBAAuB,QAAQ,8BAA8B;AACtE,MAAMC,YAAY,GAAGH,EAAE,CAACI,OAAO,CAAC,MAAM;EAClC,OAAO;IACHC,uBAAuB,EAAEL,EAAE,CAACM,EAAE,CAAC;EACnC,CAAC;AACL,CAAC,CAAC;AACFN,EAAE,CAACO,IAAI,CAAC,OAAO,EAAE,MAAOC,cAAc,IAAK;EACvC,MAAMC,QAAQ,GAAG,MAAMD,cAAc,CAAC,CAAC;EACvC,OAAO;IACHE,OAAO,EAAEV,EAAE,CAACM,EAAE,CAAC,CAACK,EAAE,EAAEC,IAAI,KAAK;MACzB;MACA,OAAOH,QAAQ,CAACC,OAAO,CAACC,EAAE,GAAG,GAAG,EAAEC,IAAI,CAAC;IAC3C,CAAC;EACL,CAAC;AACL,CAAC,CAAC;AACFZ,EAAE,CAACO,IAAI,CAAC,aAAa,EAAE,MAAOC,cAAc,IAAK;EAC7C,MAAMC,QAAQ,GAAG,MAAMD,cAAc,CAAC,CAAC;EACvC,OAAO;IACH,GAAGC,QAAQ;IACXI,MAAM,EAAEb,EAAE,CAACM,EAAE,CAAC,CAAC,GAAGQ,IAAI,KAAK;MACvB,MAAMC,MAAM,GAAGN,QAAQ,CAACI,MAAM,CAAC,GAAGC,IAAI,CAAC;MACvC,OAAO;QACH,GAAGC,MAAM;QACTV,uBAAuB,EAAEF,YAAY,CAACE;MAC1C,CAAC;IACL,CAAC,CAAC;IACFW,SAAS,EAAEhB,EAAE,CAACiB,KAAK,CAACR,QAAQ,EAAE,WAAW;IACzC;EACJ,CAAC;AACL,CAAC,CAAC;AACFT,EAAE,CAACO,IAAI,CAAC,cAAc,CAAC;AACvBV,QAAQ,CAACK,uBAAuB,EAAE,MAAM;EACpC,MAAMgB,eAAe,GAAG,IAAIC,GAAG,CAAC,iBAAiB,CAAC;EAClD,MAAMC,OAAO,GAAGpB,EAAE,CAACM,EAAE,CAAC,CAAC;EACvB,MAAMe,UAAU,GAAG;IACfC,QAAQ,EAAE;MACNC,QAAQ,EAAEvB,EAAE,CAACM,EAAE,CAAC,MAAMY,eAAe,CAAC;MACtCM,MAAM,EAAExB,EAAE,CAACM,EAAE,CAAC,CAAC;MACfmB,IAAI,EAAEP,eAAe,CAACO,IAAI;MAC1BC,QAAQ,EAAER,eAAe,CAACQ;IAC9B,CAAC;IACDC,OAAO,EAAE;MACLC,YAAY,EAAE5B,EAAE,CAACM,EAAE,CAAC;IACxB;EACJ,CAAC;EACD,MAAMuB,gBAAgB,GAAG;IACrBC,OAAO,EAAE9B,EAAE,CAACM,EAAE,CAAC,CAAC;IAChByB,OAAO,EAAE/B,EAAE,CAACM,EAAE,CAAC,CAAC;IAChB0B,UAAU,EAAEhC,EAAE,CAACM,EAAE,CAAC;EACtB,CAAC;EACDV,UAAU,CAAC,MAAa;IACpBI,EAAE,CAACiC,eAAe,CAAC,CAAC;IACpBb,OAAO,CAACc,WAAW,CAAC,CAAC;EACzB,CAAC,CAAC;EACFxC,SAAS,CAAC,MAAa;IACnBM,EAAE,CAACmC,aAAa,CAAC,CAAC;IAClBf,OAAO,CAACgB,SAAS,CAAC,CAAC;EACvB,CAAC,CAAC;EACFzC,SAAS,CAAC,MAAM;IACZK,EAAE,CAACqC,UAAU,CAAC,QAAQ,EAAEhB,UAAU,CAAC;IACnCrB,EAAE,CAACqC,UAAU,CAAC,cAAc,EAAER,gBAAgB,CAAC;EACnD,CAAC,CAAC;EACFpC,QAAQ,CAAC,MAAM;IACXO,EAAE,CAACsC,gBAAgB,CAAC,CAAC;EACzB,CAAC,CAAC;EACF,MAAMC,gBAAgB,GAAG;IACrBC,QAAQ,EAAE,yBAAyB;IACnCC,UAAU,EAAE,6BAA6B;IACzCC,WAAW,EAAE,+BAA+B;IAC5CtB;EACJ,CAAC;EACD,MAAMuB,YAAY,GAAG,IAAIxB,GAAG,CAAC,YAAY,EAAED,eAAe,CAAC;EAC3DrB,QAAQ,CAAC+C,IAAI,CAAC,CACV;IACIC,IAAI,EAAE,aAAa;IACnBC,UAAU,EAAE5B,eAAe;IAC3B6B,UAAU,EAAE;MACR,GAAGR;IACP,CAAC;IACDS,MAAM,EAAE;MACJC,mBAAmB,EAAE;IACzB;EACJ,CAAC,EACD;IACIJ,IAAI,EAAE,2CAA2C;IACjDC,UAAU,EAAE5B,eAAe;IAC3B6B,UAAU,EAAE;MACR,GAAGR,gBAAgB;MACnBW,SAAS,EAAEP,YAAY,CAACpB,QAAQ,CAAC;IACrC,CAAC;IACDyB,MAAM,EAAE;MACJC,mBAAmB,EAAE;IACzB;EACJ,CAAC,EACD;IACIJ,IAAI,EAAE,iDAAiD;IACvDC,UAAU,EAAEH,YAAY;IACxBI,UAAU,EAAE;MACR,GAAGR,gBAAgB;MACnBW,SAAS,EAAEP,YAAY,CAACpB,QAAQ,CAAC;IACrC,CAAC;IACDyB,MAAM,EAAE;MACJC,mBAAmB,EAAE;IACzB;EACJ,CAAC,EACD;IACIJ,IAAI,EAAE,4CAA4C;IAClDC,UAAU,EAAE5B,eAAe;IAC3B6B,UAAU,EAAE;MACR,GAAGR,gBAAgB;MACnBW,SAAS,EAAE;IACf,CAAC;IACDF,MAAM,EAAE;MACJC,mBAAmB,EAAE;IACzB;EACJ,CAAC,EACD;IACIJ,IAAI,EAAE,iDAAiD;IACvDC,UAAU,EAAE,IAAI3B,GAAG,CAAC,YAAY,EAAED,eAAe,CAAC;IAClD6B,UAAU,EAAE;MACR,GAAGR,gBAAgB;MACnBW,SAAS,EAAE;IACf,CAAC;IACDF,MAAM,EAAE;MACJC,mBAAmB,EAAE;IACzB;EACJ,CAAC,CACJ,CAAC,CAAC,OAAO,EAAE,CAAC;IAAEF,UAAU;IAAED,UAAU;IAAEE;EAAO,CAAC,KAAK;IAChD,IAAIG,MAAM;IACVvD,UAAU,CAAC,MAAM;MACbuD,MAAM,GAAGjD,uBAAuB,CAAC6C,UAAU,CAACP,QAAQ,EAAEO,UAAU,CAACN,UAAU,EAAEM,UAAU,CAACL,WAAW,EAAEK,UAAU,CAACK,UAAU,EAAEL,UAAU,CAACG,SAAS,EAAEH,UAAU,CAACM,aAAa,EAAEN,UAAU,CAACO,MAAM,EAAEP,UAAU,CAAC3B,OAAO,EAAE2B,UAAU,CAACQ,OAAO,CAAC;MACtOlC,UAAU,CAACC,QAAQ,CAACG,IAAI,GAAG,IAAIN,GAAG,CAAC2B,UAAU,CAAC,CAACrB,IAAI;MACnDJ,UAAU,CAACC,QAAQ,CAACI,QAAQ,GAAG,IAAIP,GAAG,CAAC2B,UAAU,CAAC,CAACpB,QAAQ;IAC/D,CAAC,CAAC;IACF3B,EAAE,CAAC,mCAAmC,EAAE,MAAM;MAC1CD,MAAM,CAACE,EAAE,CAACwD,MAAM,CAACvD,QAAQ,CAACY,MAAM,CAAC,CAAC,CAAC4C,oBAAoB,CAAC3D,MAAM,CAAC4D,gBAAgB,CAAC;QAC5EC,SAAS,EAAEZ,UAAU,CAACP,QAAQ;QAC9BoB,0BAA0B,EAAE;MAChC,CAAC,CAAC,EAAE3D,QAAQ,CAAC4D,yBAAyB,CAACd,UAAU,CAACQ,OAAO,IAAI,YAAY,EAAER,UAAU,CAACN,UAAU,CAAC,EAAE3C,MAAM,CAACgE,GAAG,CAACC,QAAQ,CAAC,EAAEjE,MAAM,CAACkE,QAAQ,CAAC,CAAC,EAAElE,MAAM,CAACgE,GAAG,CAACC,QAAQ,CAAC,CAAC;IACrK,CAAC,CAAC;IACFlE,QAAQ,CAAC+C,IAAI,CAAC,CACV;MACIqB,aAAa,EAAE;IACnB,CAAC,EACD;MACIC,YAAY,EAAE,IAAI;MAClBC,KAAK,EAAE,KAAK;MACZC,MAAM,EAAE;IACZ,CAAC,EACD,CAAC,CAAC,CACL,CAAC,CAAC,yBAAyB,EAAGC,iBAAiB,IAAK;MACjD,MAAMC,YAAY,GAAG,CAACC,IAAI,CAACC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAEjD,QAAQ,CAAC,EAAE,CAAC,CAACkD,SAAS,CAAC,CAAC,CAAC;MAClE7E,UAAU,CAAC,MAAM;QACbI,EAAE,CAACwD,MAAM,CAACvD,QAAQ,CAACe,SAAS,CAAC,CAAC0D,kBAAkB,CAAC,MAAML,iBAAiB,CAAC;QACzElE,YAAY,CAACE,uBAAuB,CAACqE,kBAAkB,CAAC,OAAO;UAC3DC,YAAY,EAAEL,YAAY;UAC1BM,UAAU,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC;UACtBC,UAAU,EAAE;QAChB,CAAC,CAAC,CAAC;MACP,CAAC,CAAC;MACF,IAAIC,MAAM,CAACC,IAAI,CAACZ,iBAAiB,CAAC,CAACa,MAAM,KAAK,CAAC,EAAE;QAC7C,IAAIlC,MAAM,CAACC,mBAAmB,EAAE;UAC5BlD,EAAE,CAAC,yBAAyB,EAAE,YAAY;YACtC,MAAMoF,YAAY,GAAGhC,MAAM,CAAC,CAAC;YAC7BrD,MAAM,CAACE,EAAE,CAACwD,MAAM,CAACvD,QAAQ,CAACY,MAAM,CAAC,CAAC,CAACuE,eAAe,CAAC,CAAC,CAAC;YACrD,IAAIpC,MAAM,CAACC,mBAAmB,EAAE;cAC5B;cACA,MAAMnD,MAAM,CAACqF,YAAY,CAAC,CAACE,QAAQ,CAACC,aAAa,CAAC,CAAC;cACnDxF,MAAM,CAAC+B,gBAAgB,CAACC,OAAO,CAAC,CAACyD,cAAc,CAAC,2BAA2BxC,UAAU,CAACP,QAAQ,EAAE,EAAEgD,IAAI,CAACC,SAAS,CAAC;gBAAErB,MAAM,EAAEsB,MAAM,CAACpE,QAAQ,CAACC,QAAQ,CAAC;cAAE,CAAC,CAAC,CAAC;cACzJzB,MAAM,CAACuB,UAAU,CAACM,OAAO,CAACC,YAAY,CAAC,CAAC6B,oBAAoB,CAAC,CAAC,CAAC,EAAE,EAAE,EAAEV,UAAU,CAACG,SAAS,CAAC;YAE9F;UACJ,CAAC,CAAC;QACN,CAAC,MACI;UACDnD,EAAE,CAAC,wBAAwB,EAAE,YAAY;YACrC,MAAMoF,YAAY,GAAGhC,MAAM,CAAC,CAAC;YAC7BrD,MAAM,CAACE,EAAE,CAACwD,MAAM,CAACvD,QAAQ,CAACY,MAAM,CAAC,CAAC,CAACuE,eAAe,CAAC,CAAC,CAAC;YACrD,IAAIpC,MAAM,CAACC,mBAAmB,EAAE;cAC5B;cACA,MAAMnD,MAAM,CAACqF,YAAY,CAAC,CAACE,QAAQ,CAACC,aAAa,CAAC,CAAC;cACnDxF,MAAM,CAAC+B,gBAAgB,CAACC,OAAO,CAAC,CAACyD,cAAc,CAAC,2BAA2BxC,UAAU,CAACP,QAAQ,EAAE,EAAEgD,IAAI,CAACC,SAAS,CAAC;gBAAErB,MAAM,EAAEsB,MAAM,CAACpE,QAAQ,CAACC,QAAQ,CAAC;cAAE,CAAC,CAAC,CAAC;cACzJzB,MAAM,CAACuB,UAAU,CAACM,OAAO,CAACC,YAAY,CAAC,CAAC6B,oBAAoB,CAAC,CAAC,CAAC,EAAE,EAAE,EAAEV,UAAU,CAACG,SAAS,CAAC;cAC1F;YACJ;YACA;YACA;YACA,MAAMpD,MAAM,CAACqF,YAAY,CAAC,CACrBQ,OAAO,CAACC,YAAY,CAAC,IAAIC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAC1D/F,MAAM,CAACuB,UAAU,CAACC,QAAQ,CAACE,MAAM,CAAC,CAACsE,oBAAoB,CAAC,CAAC;YACzD,MAAMC,GAAG,GAAG,IAAI5E,GAAG,CAACE,UAAU,CAACC,QAAQ,CAACE,MAAM,CAACjB,IAAI,CAACyF,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChElG,MAAM,CAACiG,GAAG,CAACE,MAAM,CAAC,CAACC,OAAO,CAACnD,UAAU,CAACN,UAAU,CAAC;YACjD3C,MAAM,CAACiG,GAAG,CAACrE,QAAQ,CAAC,CAACwE,OAAO,CAAC,iCAAiC,CAAC;YAC/DpG,MAAM,CAACkF,MAAM,CAACmB,WAAW,CAACJ,GAAG,CAACK,YAAY,CAACC,OAAO,CAAC,CAAC,CAAC,CAAC,CAACH,OAAO,CAACpG,MAAM,CAAC4D,gBAAgB,CAAC;cACnFC,SAAS,EAAEZ,UAAU,CAACP,QAAQ;cAC9B8D,cAAc,EAAExG,MAAM,CAACgE,GAAG,CAACyC,MAAM,CAAC;cAClCC,YAAY,EAAEzD,UAAU,CAACL,WAAW;cACpC+D,aAAa,EAAE,MAAM;cACrBC,qBAAqB,EAAE,MAAM;cAC7BC,KAAK,EAAE,yDAAyD;cAChExC,KAAK,EAAErE,MAAM,CAACgE,GAAG,CAACyC,MAAM;YAC5B,CAAC,CAAC,CAAC;UACP,CAAC,CAAC;QACN;MACJ;MACA,IAAIlC,iBAAiB,CAACH,YAAY,EAAE;QAChCnE,EAAE,CAAC,mCAAmC,EAAE,YAAY;UAChD,MAAMD,MAAM,CAACqD,MAAM,CAAC,CAAC,CAAC,CAACkC,QAAQ,CAACa,OAAO,CAAC5B,YAAY,CAAC;UACrDxE,MAAM,CAACK,YAAY,CAACE,uBAAuB,CAAC,CAACuG,qBAAqB,CAAC,CAAC,CAAC;UACrE9G,MAAM,CAACK,YAAY,CAACE,uBAAuB,CAAC,CAACoD,oBAAoB,CAACoD,SAAS;UAAE;UAC7E,QAAQ,CAAC;UACT/G,MAAM,CAACuB,UAAU,CAACM,OAAO,CAACC,YAAY,CAAC,CAACgF,qBAAqB,CAAC,CAAC,CAAC;UAChE9G,MAAM,CAACuB,UAAU,CAACM,OAAO,CAACC,YAAY,CAAC,CAAC2D,cAAc,CAACzF,MAAM,CAACkE,QAAQ,CAAC,CAAC,EAAElE,MAAM,CAACkE,QAAQ,CAAC,CAAC,EAAEK,iBAAiB,CAACD,MAAM,CAAC;QAC1H,CAAC,CAAC;MACN;MACA,IAAIC,iBAAiB,CAACJ,aAAa,EAAE;QACjClE,EAAE,CAAC,WAAW,EAAE,YAAY;UACxB,MAAMD,MAAM,CAACqD,MAAM,CAAC,CAAC,CAAC,CAACkC,QAAQ,CAACa,OAAO,CAAC5B,YAAY,CAAC;UACrDxE,MAAM,CAACK,YAAY,CAACE,uBAAuB,CAAC,CAACuG,qBAAqB,CAAC,CAAC,CAAC;UACrE9G,MAAM,CAACK,YAAY,CAACE,uBAAuB,CAAC,CAACoD,oBAAoB,CAACoD,SAAS;UAAE;UAC7E,SAAS,CAAC;QACd,CAAC,CAAC;MACN;IACJ,CAAC,CAAC;EACN,CAAC,CAAC;AACN,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"publicOauth.test.js","names":["afterAll","afterEach","beforeAll","beforeEach","describe","expect","it","vi","commonJs","createPublicOauthClient","hoistedMocks","hoisted","makeTokenAndSaveRefresh","fn","mock","importOriginal","original","default","ms","opts","common","args","result","readLocal","spyOn","readSession","DEFAULT_CUR_URL","URL","fetchFn","mockWindow","location","toString","assign","href","pathname","history","replaceState","mockLocalStorage","setItem","getItem","removeItem","mockSessionStorage","restoreAllMocks","mockRestore","clearAllMocks","mockReset","stubGlobal","unstubAllGlobals","BASE_CLIENT_ARGS","clientId","foundryUrl","redirectUrl","fullLoginUrl","each","name","currentUrl","clientArgs","should","redirectToLoginPage","loginPage","client","useHistory","postLoginPage","scopes","ctxPath","mocked","toHaveBeenCalledWith","objectContaining","client_id","token_endpoint_auth_method","createAuthorizationServer","any","Function","anything","localStorage","refresh_token","sessionStorage","codeVerifier","state","oldUrl","initialState","ACCESS_TOKEN","Math","random","substring","mockImplementation","access_token","expires_at","Date","now","expires_in","Object","keys","length","tokenPromise","toBeCalledTimes","resolves","toBeUndefined","toBeCalledWith","JSON","stringify","window","rejects","toThrowError","Error","toHaveBeenCalledOnce","url","calls","origin","toEqual","fromEntries","searchParams","entries","code_challenge","String","redirect_uri","response_type","code_challenge_method","scope","toHaveBeenCalledTimes","undefined"],"sources":["publicOauth.test.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n/* eslint-disable @typescript-eslint/consistent-type-imports */\nimport { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi, } from \"vitest\";\nimport * as commonJs from \"./common.js\";\nimport { createPublicOauthClient } from \"./createPublicOauthClient.js\";\nconst hoistedMocks = vi.hoisted(() => {\n    return {\n        makeTokenAndSaveRefresh: vi.fn(),\n    };\n});\nvi.mock(\"delay\", async (importOriginal) => {\n    const original = await importOriginal();\n    return {\n        default: vi.fn((ms, opts) => {\n            // speed up the tests\n            return original.default(ms / 100, opts);\n        }),\n    };\n});\nvi.mock(\"./common.js\", async (importOriginal) => {\n    const original = await importOriginal();\n    return {\n        ...original,\n        common: vi.fn((...args) => {\n            const result = original.common(...args);\n            return {\n                ...result,\n                makeTokenAndSaveRefresh: hoistedMocks.makeTokenAndSaveRefresh,\n            };\n        }),\n        readLocal: vi.spyOn(original, \"readLocal\"),\n        readSession: vi.spyOn(original, \"readSession\"),\n        // vi.fn(original.readLocal),\n    };\n});\nvi.mock(\"oauth4webapi\");\ndescribe(createPublicOauthClient, () => {\n    const DEFAULT_CUR_URL = new URL(\"https://fauxurl\");\n    const fetchFn = vi.fn();\n    const mockWindow = {\n        location: {\n            toString: vi.fn(() => DEFAULT_CUR_URL),\n            assign: vi.fn(),\n            href: DEFAULT_CUR_URL.href,\n            pathname: DEFAULT_CUR_URL.pathname,\n        },\n        history: {\n            replaceState: vi.fn(),\n        },\n    };\n    const mockLocalStorage = {\n        setItem: vi.fn(),\n        getItem: vi.fn(),\n        removeItem: vi.fn(),\n    };\n    const mockSessionStorage = {\n        setItem: vi.fn(),\n        getItem: vi.fn(),\n        removeItem: vi.fn(),\n    };\n    beforeEach((context) => {\n        vi.restoreAllMocks();\n        fetchFn.mockRestore();\n    });\n    afterEach((context) => {\n        vi.clearAllMocks();\n        fetchFn.mockReset();\n    });\n    beforeAll(() => {\n        vi.stubGlobal(\"window\", mockWindow);\n        vi.stubGlobal(\"localStorage\", mockLocalStorage);\n        vi.stubGlobal(\"sessionStorage\", mockSessionStorage);\n    });\n    afterAll(() => {\n        vi.unstubAllGlobals();\n    });\n    const BASE_CLIENT_ARGS = {\n        clientId: \"this-would-be-client-id\",\n        foundryUrl: \"https://a.foundry.url.local\",\n        redirectUrl: \"https://my.redirect.url.local\",\n        fetchFn,\n    };\n    const fullLoginUrl = new URL(\"/loginPage\", DEFAULT_CUR_URL);\n    describe.each([\n        {\n            name: \"Basic Usage\",\n            currentUrl: DEFAULT_CUR_URL,\n            clientArgs: {\n                ...BASE_CLIENT_ARGS,\n            },\n            should: {\n                redirectToLoginPage: false,\n            },\n        },\n        {\n            name: \"Base w/ full loginPage and curUrl is root\",\n            currentUrl: DEFAULT_CUR_URL,\n            clientArgs: {\n                ...BASE_CLIENT_ARGS,\n                loginPage: fullLoginUrl.toString(),\n            },\n            should: {\n                redirectToLoginPage: true,\n            },\n        },\n        {\n            name: \"Base w/ full loginPage and curUrl is login page\",\n            currentUrl: fullLoginUrl,\n            clientArgs: {\n                ...BASE_CLIENT_ARGS,\n                loginPage: fullLoginUrl.toString(),\n            },\n            should: {\n                redirectToLoginPage: false,\n            },\n        },\n        {\n            name: \"Base w/ short loginPage and curUrl is root\",\n            currentUrl: DEFAULT_CUR_URL,\n            clientArgs: {\n                ...BASE_CLIENT_ARGS,\n                loginPage: \"/loginPage\",\n            },\n            should: {\n                redirectToLoginPage: true,\n            },\n        },\n        {\n            name: \"Base w/ short loginPage and curUrl is loginPage\",\n            currentUrl: new URL(\"/loginPage\", DEFAULT_CUR_URL),\n            clientArgs: {\n                ...BASE_CLIENT_ARGS,\n                loginPage: \"/loginPage\",\n            },\n            should: {\n                redirectToLoginPage: false,\n            },\n        },\n    ])(\"$name\", ({ clientArgs, currentUrl, should }) => {\n        let client;\n        beforeEach(() => {\n            client = createPublicOauthClient(clientArgs.clientId, clientArgs.foundryUrl, clientArgs.redirectUrl, clientArgs.useHistory, clientArgs.loginPage, clientArgs.postLoginPage, clientArgs.scopes, clientArgs.fetchFn, clientArgs.ctxPath);\n            mockWindow.location.href = new URL(currentUrl).href;\n            mockWindow.location.pathname = new URL(currentUrl).pathname;\n        });\n        it(\"calls common with expected values\", () => {\n            expect(vi.mocked(commonJs.common)).toHaveBeenCalledWith(expect.objectContaining({\n                client_id: clientArgs.clientId,\n                token_endpoint_auth_method: \"none\",\n            }), commonJs.createAuthorizationServer(clientArgs.ctxPath ?? \"/multipass\", clientArgs.foundryUrl), expect.any(Function), expect.anything(), expect.any(Function));\n        });\n        describe.each([\n            {\n                localStorage: {\n                    refresh_token: \"a-refresh-token\",\n                },\n                sessionStorage: {},\n            },\n            {\n                localStorage: {},\n                sessionStorage: {\n                    codeVerifier: \"hi\",\n                    state: \"mom\",\n                    oldUrl: \"https://someoldurl.local\",\n                },\n            },\n            { localStorage: {}, sessionStorage: {} },\n        ])(\"Initial Local State: %s\", (initialState) => {\n            const ACCESS_TOKEN = (Math.random() + 1).toString(36).substring(7);\n            beforeEach(() => {\n                vi.mocked(commonJs.readLocal).mockImplementation(() => initialState.localStorage);\n                vi.mocked(commonJs.readSession).mockImplementation(() => initialState.sessionStorage);\n                hoistedMocks.makeTokenAndSaveRefresh.mockImplementation(() => ({\n                    access_token: ACCESS_TOKEN,\n                    expires_at: Date.now(),\n                    expires_in: 10000,\n                }));\n            });\n            if (Object.keys(initialState.localStorage).length === 0\n                && Object.keys(initialState.sessionStorage).length === 0) {\n                if (should.redirectToLoginPage) {\n                    it(\"redirects to login page\", async () => {\n                        const tokenPromise = client();\n                        expect(vi.mocked(commonJs.common)).toBeCalledTimes(1);\n                        if (should.redirectToLoginPage) {\n                            // expect save local\n                            await expect(tokenPromise).resolves.toBeUndefined();\n                            expect(mockSessionStorage.setItem).toBeCalledWith(`@osdk/oauth : refresh : ${clientArgs.clientId}`, JSON.stringify({ oldUrl: window.location.toString() }));\n                            expect(mockWindow.history.replaceState).toHaveBeenCalledWith({}, \"\", clientArgs.loginPage);\n                            return;\n                        }\n                    });\n                }\n                else {\n                    it(\"redirects to multipass\", async () => {\n                        const tokenPromise = client();\n                        expect(vi.mocked(commonJs.common)).toBeCalledTimes(1);\n                        if (should.redirectToLoginPage) {\n                            // expect save local\n                            await expect(tokenPromise).resolves.toBeUndefined();\n                            expect(mockSessionStorage.setItem).toBeCalledWith(`@osdk/oauth : refresh : ${clientArgs.clientId}`, JSON.stringify({ oldUrl: window.location.toString() }));\n                            expect(mockWindow.history.replaceState).toHaveBeenCalledWith({}, \"\", clientArgs.loginPage);\n                            return;\n                        }\n                        // we assume window.location.assign will take you away therefore we\n                        // also have to expect in this scenario that the thrown error happens\n                        await expect(tokenPromise)\n                            .rejects.toThrowError(new Error(\"Unable to redirect\"));\n                        expect(mockWindow.location.assign).toHaveBeenCalledOnce();\n                        const url = new URL(mockWindow.location.assign.mock.calls[0][0]);\n                        expect(url.origin).toEqual(clientArgs.foundryUrl);\n                        expect(url.pathname).toEqual(\"/multipass/api/oauth2/authorize\");\n                        expect(Object.fromEntries(url.searchParams.entries())).toEqual(expect.objectContaining({\n                            client_id: clientArgs.clientId,\n                            code_challenge: expect.any(String),\n                            redirect_uri: clientArgs.redirectUrl,\n                            response_type: \"code\",\n                            code_challenge_method: \"S256\",\n                            scope: \"offline_access api:read-data api:write-data\",\n                            state: expect.any(String),\n                        }));\n                    });\n                }\n            }\n            if (initialState.sessionStorage.codeVerifier) {\n                it(\"tries to auth with return results\", async () => {\n                    await expect(client()).resolves.toEqual(ACCESS_TOKEN);\n                    expect(hoistedMocks.makeTokenAndSaveRefresh).toHaveBeenCalledTimes(1);\n                    expect(hoistedMocks.makeTokenAndSaveRefresh).toHaveBeenCalledWith(undefined, // this is only because we didn't mock out the internals\n                    \"signIn\");\n                    expect(mockWindow.history.replaceState).toHaveBeenCalledTimes(1);\n                    expect(mockWindow.history.replaceState).toBeCalledWith(expect.anything(), expect.anything(), initialState.sessionStorage.oldUrl);\n                });\n            }\n            if (initialState.localStorage.refresh_token) {\n                it(\"refreshes\", async () => {\n                    await expect(client()).resolves.toEqual(ACCESS_TOKEN);\n                    expect(hoistedMocks.makeTokenAndSaveRefresh).toHaveBeenCalledTimes(1);\n                    expect(hoistedMocks.makeTokenAndSaveRefresh).toHaveBeenCalledWith(undefined, // this is only because we didn't mock out the internals\n                    \"refresh\");\n                });\n            }\n        });\n    });\n});\n"],"mappings":"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","ignoreList":[]}

package/build/esm/utils.js

@@ -36,7 +36,7 @@ export function processOptionsAndAssignDefaults(url, redirect_uri, useHistory, l
     useHistory: options.useHistory ?? true,
     loginPage: options.loginPage,
     postLoginPage: options.postLoginPage || window.location.toString(),
-    scopes: options.scopes ?? ["api:ontologies-read", "api:ontologies-write"],
+    scopes: options.scopes ?? ["api:read-data", "api:write-data"],
     fetchFn: options.fetchFn ?? globalThis.fetch,
     ctxPath: options.ctxPath ?? "multipass"
   };

package/build/esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","names":["invariant","processOptionsAndAssignDefaults","url","redirect_uri","useHistory","loginPage","postLoginPage","scopes","fetchFn","ctxPath","options","process","env","NODE_ENV","window","location","toString","globalThis","fetch"],"sources":["utils.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport invariant from \"tiny-invariant\";\nexport function processOptionsAndAssignDefaults(url, redirect_uri, useHistory, loginPage, postLoginPage, scopes, fetchFn, ctxPath) {\n    let options = {};\n    if (typeof useHistory === \"object\") {\n        invariant(!loginPage && !postLoginPage && !scopes && !fetchFn && !ctxPath, \"If useHistory is an object, other options should not be provided\");\n        options = useHistory;\n    }\n    else {\n        options = {\n            useHistory,\n            loginPage,\n            postLoginPage,\n            scopes,\n            fetchFn,\n            ctxPath,\n        };\n    }\n    invariant(url, \"url is required\");\n    invariant(redirect_uri, \"redirectUrl is required\");\n    // Assign defaults\n    return {\n        useHistory: options.useHistory ?? true,\n        loginPage: options.loginPage,\n        postLoginPage: options.postLoginPage || window.location.toString(),\n        scopes: options.scopes ?? [\"api:ontologies-read\", \"api:ontologies-write\"],\n        fetchFn: options.fetchFn ?? globalThis.fetch,\n        ctxPath: options.ctxPath ?? \"multipass\",\n    };\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAOA,SAAS,MAAM,gBAAgB;AACtC,OAAO,SAASC,+BAA+BA,CAACC,GAAG,EAAEC,YAAY,EAAEC,UAAU,EAAEC,SAAS,EAAEC,aAAa,EAAEC,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAE;EAC/H,IAAIC,OAAO,GAAG,CAAC,CAAC;EAChB,IAAI,OAAON,UAAU,KAAK,QAAQ,EAAE;IAChC,EAAU,CAACC,SAAS,IAAI,CAACC,aAAa,IAAI,CAACC,MAAM,IAAI,CAACC,OAAO,IAAI,CAACC,OAAO,IAAAE,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAAzEb,SAAS,QAAkE,kEAAkE,IAA7IA,SAAS;IACTU,OAAO,GAAGN,UAAU;EACxB,CAAC,MACI;IACDM,OAAO,GAAG;MACNN,UAAU;MACVC,SAAS;MACTC,aAAa;MACbC,MAAM;MACNC,OAAO;MACPC;IACJ,CAAC;EACL;EACA,CAAUP,GAAG,GAAAS,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAAbb,SAAS,QAAM,iBAAiB,IAAhCA,SAAS;EACT,CAAUG,YAAY,GAAAQ,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAAtBb,SAAS,QAAe,yBAAyB,IAAjDA,SAAS;EACT;EACA,OAAO;IACHI,UAAU,EAAEM,OAAO,CAACN,UAAU,IAAI,IAAI;IACtCC,SAAS,EAAEK,OAAO,CAACL,SAAS;IAC5BC,aAAa,EAAEI,OAAO,CAACJ,aAAa,IAAIQ,MAAM,CAACC,QAAQ,CAACC,QAAQ,CAAC,CAAC;IAClET,MAAM,EAAEG,OAAO,CAACH,MAAM,IAAI,CAAC,qBAAqB,EAAE,sBAAsB,CAAC;IACzEC,OAAO,EAAEE,OAAO,CAACF,OAAO,IAAIS,UAAU,CAACC,KAAK;IAC5CT,OAAO,EAAEC,OAAO,CAACD,OAAO,IAAI;EAChC,CAAC;AACL","ignoreList":[]}
+{"version":3,"file":"utils.js","names":["invariant","processOptionsAndAssignDefaults","url","redirect_uri","useHistory","loginPage","postLoginPage","scopes","fetchFn","ctxPath","options","process","env","NODE_ENV","window","location","toString","globalThis","fetch"],"sources":["utils.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport invariant from \"tiny-invariant\";\nexport function processOptionsAndAssignDefaults(url, redirect_uri, useHistory, loginPage, postLoginPage, scopes, fetchFn, ctxPath) {\n    let options = {};\n    if (typeof useHistory === \"object\") {\n        invariant(!loginPage && !postLoginPage && !scopes && !fetchFn && !ctxPath, \"If useHistory is an object, other options should not be provided\");\n        options = useHistory;\n    }\n    else {\n        options = {\n            useHistory,\n            loginPage,\n            postLoginPage,\n            scopes,\n            fetchFn,\n            ctxPath,\n        };\n    }\n    invariant(url, \"url is required\");\n    invariant(redirect_uri, \"redirectUrl is required\");\n    // Assign defaults\n    return {\n        useHistory: options.useHistory ?? true,\n        loginPage: options.loginPage,\n        postLoginPage: options.postLoginPage || window.location.toString(),\n        scopes: options.scopes ?? [\"api:read-data\", \"api:write-data\"],\n        fetchFn: options.fetchFn ?? globalThis.fetch,\n        ctxPath: options.ctxPath ?? \"multipass\",\n    };\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAOA,SAAS,MAAM,gBAAgB;AACtC,OAAO,SAASC,+BAA+BA,CAACC,GAAG,EAAEC,YAAY,EAAEC,UAAU,EAAEC,SAAS,EAAEC,aAAa,EAAEC,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAE;EAC/H,IAAIC,OAAO,GAAG,CAAC,CAAC;EAChB,IAAI,OAAON,UAAU,KAAK,QAAQ,EAAE;IAChC,EAAU,CAACC,SAAS,IAAI,CAACC,aAAa,IAAI,CAACC,MAAM,IAAI,CAACC,OAAO,IAAI,CAACC,OAAO,IAAAE,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAAzEb,SAAS,QAAkE,kEAAkE,IAA7IA,SAAS;IACTU,OAAO,GAAGN,UAAU;EACxB,CAAC,MACI;IACDM,OAAO,GAAG;MACNN,UAAU;MACVC,SAAS;MACTC,aAAa;MACbC,MAAM;MACNC,OAAO;MACPC;IACJ,CAAC;EACL;EACA,CAAUP,GAAG,GAAAS,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAAbb,SAAS,QAAM,iBAAiB,IAAhCA,SAAS;EACT,CAAUG,YAAY,GAAAQ,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAAtBb,SAAS,QAAe,yBAAyB,IAAjDA,SAAS;EACT;EACA,OAAO;IACHI,UAAU,EAAEM,OAAO,CAACN,UAAU,IAAI,IAAI;IACtCC,SAAS,EAAEK,OAAO,CAACL,SAAS;IAC5BC,aAAa,EAAEI,OAAO,CAACJ,aAAa,IAAIQ,MAAM,CAACC,QAAQ,CAACC,QAAQ,CAAC,CAAC;IAClET,MAAM,EAAEG,OAAO,CAACH,MAAM,IAAI,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAC7DC,OAAO,EAAEE,OAAO,CAACF,OAAO,IAAIS,UAAU,CAACC,KAAK;IAC5CT,OAAO,EAAEC,OAAO,CAACD,OAAO,IAAI;EAChC,CAAC;AACL","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osdk/oauth",
-  "version": "1.1.0-beta.5",
+  "version": "1.1.0-beta.7",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -28,8 +28,8 @@
     "jest-extended": "^4.0.2",
     "typescript": "~5.5.4",
     "@osdk/monorepo.api-extractor": "~0.0.0",
-    "@osdk/monorepo.tsup": "~0.0.0",
-    "@osdk/monorepo.tsconfig": "~0.0.0"
+    "@osdk/monorepo.tsconfig": "~0.0.0",
+    "@osdk/monorepo.tsup": "~0.0.0"
   },
   "publishConfig": {
     "access": "public"