@corti/sdk 0.0.0-rc → 0.0.0-rc.2

package/dist/cjs/Client.js

@@ -64,8 +64,8 @@ class CortiClient {
                 "Tenant-Name": _options === null || _options === void 0 ? void 0 : _options.tenantName,
                 "X-Fern-Language": "JavaScript",
                 "X-Fern-SDK-Name": "@corti/sdk",
-                "X-Fern-SDK-Version": "0.0.0-rc",
-                "User-Agent": "@corti/sdk/0.0.0-rc",
+                "X-Fern-SDK-Version": "0.0.0-rc.2",
+                "User-Agent": "@corti/sdk/0.0.0-rc.2",
                 "X-Fern-Runtime": core.RUNTIME.type,
                 "X-Fern-Runtime-Version": core.RUNTIME.version,
             }, _options === null || _options === void 0 ? void 0 : _options.headers) });

package/dist/cjs/custom/CortiClient.js

@@ -92,7 +92,7 @@ class CortiClient {
         /**
          * Patch: resolve tenantName and environment from options or token
          */
-        const { tenantName, environment } = (0, resolveClientOptions_js_1.resolveClientOptions)(_options);
+        const { tenantName, environment, initialTokenResponse } = (0, resolveClientOptions_js_1.resolveClientOptions)(_options);
         this._options = Object.assign(Object.assign({}, _options), { headers: (0, headers_js_1.mergeHeaders)({
                 "Tenant-Name": tenantName,
                 "X-Fern-Language": "JavaScript",
@@ -118,7 +118,7 @@ class CortiClient {
                      */
                     authClient: new CortiAuth_js_1.Auth(this._options),
                 })
-                : new RefreshBearerProvider_js_1.RefreshBearerProvider(_options.auth);
+                : new RefreshBearerProvider_js_1.RefreshBearerProvider(Object.assign(Object.assign({}, _options.auth), { initialTokenResponse }));
     }
     get interactions() {
         var _a;

package/dist/cjs/custom/RefreshBearerProvider.d.ts

@@ -2,8 +2,9 @@
  * RefreshBearerProvider used as a replacement of OAuthTokenProvider, in case when accessToken from outside of library was used instead of Client credentials.
  */
 import * as api from "../api/index.js";
-type ExpectedTokenResponse = Omit<api.GetTokenResponse, 'tokenType'> & {
+export type ExpectedTokenResponse = Omit<api.GetTokenResponse, 'tokenType' | 'expiresIn'> & {
     tokenType?: string;
+    expiresIn?: number;
 };
 type RefreshAccessTokenFunction = (refreshToken?: string) => Promise<ExpectedTokenResponse> | ExpectedTokenResponse;
 export type BearerOptions = Partial<Omit<api.GetTokenResponse, 'accessToken'>> & ({
@@ -12,7 +13,9 @@ export type BearerOptions = Partial<Omit<api.GetTokenResponse, 'accessToken'>> &
 } | {
     refreshAccessToken: RefreshAccessTokenFunction;
     accessToken?: string;
-});
+}) & {
+    initialTokenResponse?: Promise<ExpectedTokenResponse>;
+};
 export declare class RefreshBearerProvider {
     private readonly BUFFER_IN_MINUTES;
     private _accessToken;
@@ -20,7 +23,8 @@ export declare class RefreshBearerProvider {
     private _refreshAccessToken;
     private _expiresAt;
     private _refreshExpiresAt;
-    constructor({ accessToken, refreshAccessToken, refreshToken, refreshExpiresIn, expiresIn, }: BearerOptions);
+    private _initialTokenResponse;
+    constructor({ accessToken, refreshAccessToken, refreshToken, refreshExpiresIn, expiresIn, initialTokenResponse, }: BearerOptions);
     getToken(): Promise<string>;
     private refresh;
     private getExpiresAt;

package/dist/cjs/custom/RefreshBearerProvider.js

@@ -49,23 +49,29 @@ exports.RefreshBearerProvider = void 0;
 const core = __importStar(require("../core/index.js"));
 const decodeToken_js_1 = require("./utils/decodeToken.js");
 class RefreshBearerProvider {
-    constructor({ accessToken, refreshAccessToken, refreshToken, refreshExpiresIn, expiresIn, }) {
+    constructor({ accessToken, refreshAccessToken, refreshToken, refreshExpiresIn, expiresIn, initialTokenResponse, }) {
         this.BUFFER_IN_MINUTES = 2;
         this._accessToken = accessToken || 'no_token';
         this._refreshToken = refreshToken;
-        this._expiresAt = typeof expiresIn === "number"
-            ? this.getExpiresAt(expiresIn, this.BUFFER_IN_MINUTES)
-            : this.parseTokenExpiry(this._accessToken, this.BUFFER_IN_MINUTES) || this.getExpiresAt(0, this.BUFFER_IN_MINUTES);
-        this._refreshExpiresAt = typeof refreshExpiresIn === "number"
-            ? this.getExpiresAt(refreshExpiresIn, 0)
-            : (this._refreshToken && this.parseTokenExpiry(this._refreshToken, 0)) || this.getExpiresAt(0, 0);
+        this._initialTokenResponse = initialTokenResponse;
+        this._expiresAt = this.getExpiresAt(expiresIn, this._accessToken, this.BUFFER_IN_MINUTES);
+        this._refreshExpiresAt = this.getExpiresAt(refreshExpiresIn, this._refreshToken, 0);
         this._refreshAccessToken = refreshAccessToken;
     }
     getToken() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._accessToken && this._expiresAt > new Date()) {
+            if (this._accessToken && this._accessToken !== 'no_token' && this._expiresAt > new Date()) {
                 return core.Supplier.get(this._accessToken);
             }
+            if (this._initialTokenResponse) {
+                const tokenResponse = yield this._initialTokenResponse;
+                this._initialTokenResponse = undefined;
+                this._accessToken = tokenResponse.accessToken;
+                this._expiresAt = this.getExpiresAt(tokenResponse.expiresIn, tokenResponse.accessToken, this.BUFFER_IN_MINUTES);
+                this._refreshToken = tokenResponse.refreshToken;
+                this._refreshExpiresAt = this.getExpiresAt(tokenResponse.refreshExpiresIn, this._refreshToken, 0);
+                return this.getToken();
+            }
             return this.refresh();
         });
     }
@@ -76,19 +82,18 @@ class RefreshBearerProvider {
             }
             const tokenResponse = yield this._refreshAccessToken(this._refreshToken);
             this._accessToken = tokenResponse.accessToken;
-            this._expiresAt = typeof tokenResponse.expiresIn === "number"
-                ? this.getExpiresAt(tokenResponse.expiresIn, this.BUFFER_IN_MINUTES)
-                : this.parseTokenExpiry(tokenResponse.accessToken, this.BUFFER_IN_MINUTES) || this.getExpiresAt(0, this.BUFFER_IN_MINUTES);
+            this._expiresAt = this.getExpiresAt(tokenResponse.expiresIn, tokenResponse.accessToken, this.BUFFER_IN_MINUTES);
             this._refreshToken = tokenResponse.refreshToken;
-            this._refreshExpiresAt = typeof tokenResponse.refreshExpiresIn === "number"
-                ? this.getExpiresAt(tokenResponse.refreshExpiresIn, 0)
-                : this.parseTokenExpiry(this._refreshToken, 0) || this.getExpiresAt(0, 0);
+            this._refreshExpiresAt = this.getExpiresAt(tokenResponse.refreshExpiresIn, this._refreshToken, 0);
             return this._accessToken;
         });
     }
-    getExpiresAt(expiresInSeconds = 0, bufferInMinutes = this.BUFFER_IN_MINUTES) {
-        const now = new Date();
-        return new Date(now.getTime() + expiresInSeconds * 1000 - bufferInMinutes * 60 * 1000);
+    getExpiresAt(expiresIn, token, bufferInMinutes = this.BUFFER_IN_MINUTES) {
+        if (typeof expiresIn === "number") {
+            const now = new Date();
+            return new Date(now.getTime() + expiresIn * 1000 - bufferInMinutes * 60 * 1000);
+        }
+        return this.parseTokenExpiry(token, bufferInMinutes) || this.getExpiresAt(0, token, bufferInMinutes);
     }
     parseTokenExpiry(token, bufferInMinutes) {
         if (!token || token === 'no_token') {

package/dist/cjs/custom/utils/resolveClientOptions.d.ts

@@ -1,9 +1,11 @@
 import * as core from "../../core/index.js";
 import { CortiClient } from "../CortiClient.js";
 import { Environment } from "./getEnvironmentFromString.js";
+import { ExpectedTokenResponse } from "../RefreshBearerProvider.js";
 type ResolvedClientOptions = {
     environment: Environment;
     tenantName: core.Supplier<string>;
+    initialTokenResponse?: Promise<ExpectedTokenResponse>;
 };
 export declare function resolveClientOptions(options: CortiClient.Options): ResolvedClientOptions;
 export {};

package/dist/cjs/custom/utils/resolveClientOptions.js

@@ -94,6 +94,7 @@ function resolveClientOptions(options) {
             ]);
         }
         return {
+            tokenResponse,
             tenantName: decoded.tenantName,
             environment: decoded.environment,
         };
@@ -111,5 +112,6 @@ function resolveClientOptions(options) {
                 return core.Supplier.get(environment);
             });
         },
+        initialTokenResponse: tokenResponsePromise.then(result => result.tokenResponse),
     };
 }

package/dist/cjs/version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "0.0.0-rc";
+export declare const SDK_VERSION = "0.0.0-rc.2";

package/dist/cjs/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SDK_VERSION = void 0;
-exports.SDK_VERSION = "0.0.0-rc";
+exports.SDK_VERSION = "0.0.0-rc.2";

package/dist/esm/Client.mjs

@@ -28,8 +28,8 @@ export class CortiClient {
                 "Tenant-Name": _options === null || _options === void 0 ? void 0 : _options.tenantName,
                 "X-Fern-Language": "JavaScript",
                 "X-Fern-SDK-Name": "@corti/sdk",
-                "X-Fern-SDK-Version": "0.0.0-rc",
-                "User-Agent": "@corti/sdk/0.0.0-rc",
+                "X-Fern-SDK-Version": "0.0.0-rc.2",
+                "User-Agent": "@corti/sdk/0.0.0-rc.2",
                 "X-Fern-Runtime": core.RUNTIME.type,
                 "X-Fern-Runtime-Version": core.RUNTIME.version,
             }, _options === null || _options === void 0 ? void 0 : _options.headers) });

package/dist/esm/custom/CortiClient.mjs

@@ -56,7 +56,7 @@ export class CortiClient {
         /**
          * Patch: resolve tenantName and environment from options or token
          */
-        const { tenantName, environment } = resolveClientOptions(_options);
+        const { tenantName, environment, initialTokenResponse } = resolveClientOptions(_options);
         this._options = Object.assign(Object.assign({}, _options), { headers: mergeHeaders({
                 "Tenant-Name": tenantName,
                 "X-Fern-Language": "JavaScript",
@@ -82,7 +82,7 @@ export class CortiClient {
                      */
                     authClient: new Auth(this._options),
                 })
-                : new RefreshBearerProvider(_options.auth);
+                : new RefreshBearerProvider(Object.assign(Object.assign({}, _options.auth), { initialTokenResponse }));
     }
     get interactions() {
         var _a;

package/dist/esm/custom/RefreshBearerProvider.d.mts

@@ -2,8 +2,9 @@
  * RefreshBearerProvider used as a replacement of OAuthTokenProvider, in case when accessToken from outside of library was used instead of Client credentials.
  */
 import * as api from "../api/index.mjs";
-type ExpectedTokenResponse = Omit<api.GetTokenResponse, 'tokenType'> & {
+export type ExpectedTokenResponse = Omit<api.GetTokenResponse, 'tokenType' | 'expiresIn'> & {
     tokenType?: string;
+    expiresIn?: number;
 };
 type RefreshAccessTokenFunction = (refreshToken?: string) => Promise<ExpectedTokenResponse> | ExpectedTokenResponse;
 export type BearerOptions = Partial<Omit<api.GetTokenResponse, 'accessToken'>> & ({
@@ -12,7 +13,9 @@ export type BearerOptions = Partial<Omit<api.GetTokenResponse, 'accessToken'>> &
 } | {
     refreshAccessToken: RefreshAccessTokenFunction;
     accessToken?: string;
-});
+}) & {
+    initialTokenResponse?: Promise<ExpectedTokenResponse>;
+};
 export declare class RefreshBearerProvider {
     private readonly BUFFER_IN_MINUTES;
     private _accessToken;
@@ -20,7 +23,8 @@ export declare class RefreshBearerProvider {
     private _refreshAccessToken;
     private _expiresAt;
     private _refreshExpiresAt;
-    constructor({ accessToken, refreshAccessToken, refreshToken, refreshExpiresIn, expiresIn, }: BearerOptions);
+    private _initialTokenResponse;
+    constructor({ accessToken, refreshAccessToken, refreshToken, refreshExpiresIn, expiresIn, initialTokenResponse, }: BearerOptions);
     getToken(): Promise<string>;
     private refresh;
     private getExpiresAt;

package/dist/esm/custom/RefreshBearerProvider.mjs

@@ -13,23 +13,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import * as core from "../core/index.mjs";
 import { decodeToken } from "./utils/decodeToken.mjs";
 export class RefreshBearerProvider {
-    constructor({ accessToken, refreshAccessToken, refreshToken, refreshExpiresIn, expiresIn, }) {
+    constructor({ accessToken, refreshAccessToken, refreshToken, refreshExpiresIn, expiresIn, initialTokenResponse, }) {
         this.BUFFER_IN_MINUTES = 2;
         this._accessToken = accessToken || 'no_token';
         this._refreshToken = refreshToken;
-        this._expiresAt = typeof expiresIn === "number"
-            ? this.getExpiresAt(expiresIn, this.BUFFER_IN_MINUTES)
-            : this.parseTokenExpiry(this._accessToken, this.BUFFER_IN_MINUTES) || this.getExpiresAt(0, this.BUFFER_IN_MINUTES);
-        this._refreshExpiresAt = typeof refreshExpiresIn === "number"
-            ? this.getExpiresAt(refreshExpiresIn, 0)
-            : (this._refreshToken && this.parseTokenExpiry(this._refreshToken, 0)) || this.getExpiresAt(0, 0);
+        this._initialTokenResponse = initialTokenResponse;
+        this._expiresAt = this.getExpiresAt(expiresIn, this._accessToken, this.BUFFER_IN_MINUTES);
+        this._refreshExpiresAt = this.getExpiresAt(refreshExpiresIn, this._refreshToken, 0);
         this._refreshAccessToken = refreshAccessToken;
     }
     getToken() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._accessToken && this._expiresAt > new Date()) {
+            if (this._accessToken && this._accessToken !== 'no_token' && this._expiresAt > new Date()) {
                 return core.Supplier.get(this._accessToken);
             }
+            if (this._initialTokenResponse) {
+                const tokenResponse = yield this._initialTokenResponse;
+                this._initialTokenResponse = undefined;
+                this._accessToken = tokenResponse.accessToken;
+                this._expiresAt = this.getExpiresAt(tokenResponse.expiresIn, tokenResponse.accessToken, this.BUFFER_IN_MINUTES);
+                this._refreshToken = tokenResponse.refreshToken;
+                this._refreshExpiresAt = this.getExpiresAt(tokenResponse.refreshExpiresIn, this._refreshToken, 0);
+                return this.getToken();
+            }
             return this.refresh();
         });
     }
@@ -40,19 +46,18 @@ export class RefreshBearerProvider {
             }
             const tokenResponse = yield this._refreshAccessToken(this._refreshToken);
             this._accessToken = tokenResponse.accessToken;
-            this._expiresAt = typeof tokenResponse.expiresIn === "number"
-                ? this.getExpiresAt(tokenResponse.expiresIn, this.BUFFER_IN_MINUTES)
-                : this.parseTokenExpiry(tokenResponse.accessToken, this.BUFFER_IN_MINUTES) || this.getExpiresAt(0, this.BUFFER_IN_MINUTES);
+            this._expiresAt = this.getExpiresAt(tokenResponse.expiresIn, tokenResponse.accessToken, this.BUFFER_IN_MINUTES);
             this._refreshToken = tokenResponse.refreshToken;
-            this._refreshExpiresAt = typeof tokenResponse.refreshExpiresIn === "number"
-                ? this.getExpiresAt(tokenResponse.refreshExpiresIn, 0)
-                : this.parseTokenExpiry(this._refreshToken, 0) || this.getExpiresAt(0, 0);
+            this._refreshExpiresAt = this.getExpiresAt(tokenResponse.refreshExpiresIn, this._refreshToken, 0);
             return this._accessToken;
         });
     }
-    getExpiresAt(expiresInSeconds = 0, bufferInMinutes = this.BUFFER_IN_MINUTES) {
-        const now = new Date();
-        return new Date(now.getTime() + expiresInSeconds * 1000 - bufferInMinutes * 60 * 1000);
+    getExpiresAt(expiresIn, token, bufferInMinutes = this.BUFFER_IN_MINUTES) {
+        if (typeof expiresIn === "number") {
+            const now = new Date();
+            return new Date(now.getTime() + expiresIn * 1000 - bufferInMinutes * 60 * 1000);
+        }
+        return this.parseTokenExpiry(token, bufferInMinutes) || this.getExpiresAt(0, token, bufferInMinutes);
     }
     parseTokenExpiry(token, bufferInMinutes) {
         if (!token || token === 'no_token') {

package/dist/esm/custom/utils/resolveClientOptions.d.mts

@@ -1,9 +1,11 @@
 import * as core from "../../core/index.mjs";
 import { CortiClient } from "../CortiClient.mjs";
 import { Environment } from "./getEnvironmentFromString.mjs";
+import { ExpectedTokenResponse } from "../RefreshBearerProvider.mjs";
 type ResolvedClientOptions = {
     environment: Environment;
     tenantName: core.Supplier<string>;
+    initialTokenResponse?: Promise<ExpectedTokenResponse>;
 };
 export declare function resolveClientOptions(options: CortiClient.Options): ResolvedClientOptions;
 export {};

package/dist/esm/custom/utils/resolveClientOptions.mjs

@@ -58,6 +58,7 @@ export function resolveClientOptions(options) {
             ]);
         }
         return {
+            tokenResponse,
             tenantName: decoded.tenantName,
             environment: decoded.environment,
         };
@@ -75,5 +76,6 @@ export function resolveClientOptions(options) {
                 return core.Supplier.get(environment);
             });
         },
+        initialTokenResponse: tokenResponsePromise.then(result => result.tokenResponse),
     };
 }

package/dist/esm/version.d.mts

@@ -1 +1 @@
-export declare const SDK_VERSION = "0.0.0-rc";
+export declare const SDK_VERSION = "0.0.0-rc.2";

package/dist/esm/version.mjs

@@ -1 +1 @@
-export const SDK_VERSION = "0.0.0-rc";
+export const SDK_VERSION = "0.0.0-rc.2";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@corti/sdk",
-    "version": "0.0.0-rc",
+    "version": "0.0.0-rc.2",
     "private": false,
     "repository": "github:corticph/corti-sdk-javascript",
     "license": "MIT",