@usync/oauth2 0.0.3 → 0.0.4

package/README.md

@@ -4,4 +4,8 @@
 ![License](https://img.shields.io/npm/l/@usync/oauth2.svg)
 [![jsDocs.io](https://img.shields.io/badge/jsDocs.io-reference-blue)](https://www.jsdocs.io/package/@usync/oauth2)
 
-Handling OAuth2 login and generate access tokens.
+OAuth2 support for provider-based authorization flows and token management.
+
+This package focuses on the moving parts around OAuth2: turning provider configuration into authorizers, refreshing access tokens when needed, and completing interactive login flows when a user has not yet authorized access.
+
+The design keeps authorization state and token handling separate from drive or sync logic, so storage adapters can reuse the same auth machinery without duplicating protocol code.

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { OAuth2Authorizer } from './providers';
-import { IOAuth2Account, IOAuth2Options } from './types';
-export * from './common';
-export * from './providers';
-export * from './types';
+import { OAuth2Authorizer } from "./providers";
+import type { IOAuth2Account, IOAuth2Options } from "./types";
+export * from "./common";
+export * from "./providers";
+export * from "./types";
 export declare function getAuthorizer(options: IOAuth2Options, auth: IOAuth2Account): import("./providers").DropboxAuthorizer | import("./providers").GoogleAuthorizer | import("./providers").MicrosoftAuthorizer;
 export declare function ensureAccessToken(authorizer: OAuth2Authorizer, handleOAuth2?: (url: string) => Promise<string>): Promise<string>;

package/dist/index.js

@@ -7,7 +7,7 @@ var t = 1, n = 2, r = 3, i = class extends Error {
 };
 h();
 //#endregion
-//#region ../../node_modules/.pnpm/bignumber.js@11.1.1/node_modules/bignumber.js/dist/bignumber.mjs
+//#region ../../node_modules/.pnpm/bignumber.js@11.1.3/node_modules/bignumber.js/dist/bignumber.mjs
 var a = /^-?(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i, o = Math.ceil, s = Math.floor, c = "[BigNumber Error] ", l = 0x5af3107a4000, u = 14, d = 9007199254740991, f = [
 	1,
 	10,
@@ -499,25 +499,25 @@ function h(e) {
 	}, T.toFixed = function(e, t) {
 		return H(this, e == null ? e : y(e, -m, m) + this.e + 1, t);
 	}, T.toFormat = function(e, t, n) {
-		var r, i, a, o = this;
+		var r, i, a, o, s = this;
 		if (n == null) n = L, e != null && (t == null ? typeof e == "object" && !b(e) && (n = K(e), e = t = null) : typeof t == "object" && (n = K(t), t = null));
 		else if (typeof n != "object") throw Error(c + "Argument not an object: " + n);
 		else n = K(n);
 		if (e != null) if (b(e) && e.length <= 2) {
-			if (r = e[0], i = e[1], e = o.dp(), i != null && e > y(i, 0, m) && (e = i), r != null && y(r, 0, m) !== 0) {
-				if (i != null && r > i) throw Error(c + "Minimum must not exceed maximum");
-				e < r && (e = r);
+			if (i = e[0], a = e[1], e = s.dp(), a != null && e > y(a, 0, m) && (e = a), i != null && y(i, 0, m) !== 0) {
+				if (a != null && i > a) throw Error(c + "Minimum must not exceed maximum");
+				e < i && (e = i);
 			}
 		} else y(e, -m, m);
-		if (a = o.toFixed(e, t), o.s < 0 && (a = a.slice(1)), o.c) {
-			var s, l = a.split("."), u = +n.groupSize, d = +n.secondaryGroupSize, f = n.groupSeparator || "", p = l[0], h = l[1], g = p.length;
-			if (d && (s = u, u = d, d = s, g -= s), u > 0 && g > 0) {
-				for (s = g % u || u, a = p.substr(0, s); s < g; s += u) a += f + p.substr(s, u);
-				d > 0 && (a += f + p.slice(s));
+		if (o = s.toFixed(e, t), r = o.charCodeAt(0) === 45, r && (o = o.slice(1)), s.c) {
+			var l, u = o.split("."), d = +n.groupSize, f = +n.secondaryGroupSize, p = n.groupSeparator || "", h = u[0], g = u[1], _ = h.length;
+			if (f && (l = d, d = f, f = l, _ -= l), d > 0 && _ > 0) {
+				for (l = _ % d || d, o = h.substr(0, l); l < _; l += d) o += p + h.substr(l, d);
+				f > 0 && (o += p + h.slice(l));
 			}
-			h && (s = +n.fractionGroupSize, s && (h = h.replace(RegExp("\\d{" + s + "}\\B", "g"), "$&" + (n.fractionGroupSeparator || ""))), a += (n.decimalSeparator || "") + h);
+			g && (l = +n.fractionGroupSize, l && (g = g.replace(RegExp("\\d{" + l + "}\\B", "g"), "$&" + (n.fractionGroupSeparator || ""))), o += (n.decimalSeparator || "") + g);
 		}
-		return (n.prefix || "") + (o.s < 0 ? n.negativeSign || "" : o.s > 0 && n.positiveSign || "") + a + (n.suffix || "");
+		return (n.prefix || "") + (r ? n.negativeSign || "" : s.s > 0 && n.positiveSign || "") + o + (n.suffix || "");
 	}, T.toFraction = function(e) {
 		var n, r, i, a, o, s, l, d, p, m, h, g, v = this, y = v.c;
 		if (e != null && (l = new z(e), !l.isInteger() && (l.c || l.s !== 1) || l.lt(E))) throw Error(c + "Argument " + (l.isInteger() ? "out of range: " : "not an integer: ") + J(l));
@@ -590,7 +590,7 @@ function C(e, t, n) {
 	return e;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@gera2ld+common@0.0.5/node_modules/@gera2ld/common/dist/index.js
+//#region ../../node_modules/.pnpm/@gera2ld+common@0.0.20/node_modules/@gera2ld/common/dist/index.js
 var w = "=", T = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", E;
 function D() {
 	return E ||= T.slice(0, -2) + "-_", E;
@@ -629,14 +629,34 @@ async function M(e) {
 //#endregion
 //#region src/providers/base.ts
 var N = class {
-	constructor(e) {
-		this.options = e;
+	constructor(e, t) {
+		this.options = e, this._accessToken = null, this._refreshToken = null, t && (this.setRefreshToken(t.refreshToken), this.setAccessToken(t.accessToken));
+	}
+	_getValidToken(e) {
+		return e && (!e.expiresAt || Date.now() < e.expiresAt) ? e.token : void 0;
+	}
+	_updateAccessToken(e) {
+		this.setAccessToken(e), this.options.onSetAccessToken?.(e);
+	}
+	_updateRefreshToken(e) {
+		this.setRefreshToken(e), this.options.onSetRefreshToken?.(e);
+	}
+	getAccessToken() {
+		if (!this._accessToken) throw new i(3);
+		let e = this._getValidToken(this._accessToken);
+		if (!e) throw new i(1);
+		return e;
+	}
+	getRefreshToken() {
+		let e = this._getValidToken(this._refreshToken);
+		if (!e) throw new i(3, "Invalid refresh token");
+		return e;
+	}
+	setAccessToken(e) {
+		this._accessToken = e ?? null;
 	}
-	async getToken() {
-		let e = await this.options.storage.get("accessToken");
-		if (!e) throw new i(3);
-		if (e.expiresAt < Date.now()) throw new i(1);
-		return e.token;
+	setRefreshToken(e) {
+		this._refreshToken = e ?? null;
 	}
 }, P = class extends N {
 	static {
@@ -685,22 +705,21 @@ var N = class {
 			data: a
 		};
 		if (!a.refresh_token) throw new i(2, "Failed to get refresh_token");
-		return await this.options.storage.set("refreshToken", {
+		return this._updateRefreshToken({
 			token: a.refresh_token,
 			scope: a.scope
-		}), await this.options.storage.set("accessToken", {
+		}), this._updateAccessToken({
 			token: a.access_token,
 			expiresAt: Date.now() + a.expires_in * 1e3
 		}), a.access_token;
 	}
 	async refreshToken() {
-		let e = new URLSearchParams(), t = await this.options.storage.get("refreshToken");
-		if (!t) throw new i(3, "Invalid refresh token");
+		let e = new URLSearchParams(), t = this.getRefreshToken();
 		Object.entries({
 			client_id: this.options.clientId,
 			client_secret: this.options.clientSecret,
 			grant_type: "refresh_token",
-			refresh_token: t.token
+			refresh_token: t
 		}).forEach(([t, n]) => {
 			e.append(t, n);
 		});
@@ -712,7 +731,7 @@ var N = class {
 			status: n.status,
 			data: r
 		};
-		return await this.options.storage.set("accessToken", {
+		return this._updateAccessToken({
 			token: r.access_token,
 			expiresAt: Date.now() + r.expires_in * 1e3
 		}), r.access_token;
@@ -770,22 +789,21 @@ var N = class {
 			data: a
 		};
 		if (!a.refresh_token) throw new i(2, "Failed to get refresh_token");
-		return await this.options.storage.set("refreshToken", {
+		return this._updateRefreshToken({
 			token: a.refresh_token,
 			scope: a.scope
-		}), await this.options.storage.set("accessToken", {
+		}), this._updateAccessToken({
 			token: a.access_token,
 			expiresAt: Date.now() + a.expires_in * 1e3
 		}), a.access_token;
 	}
 	async refreshToken() {
-		let e = new URLSearchParams(), t = await this.options.storage.get("refreshToken");
-		if (!t) throw new i(3, "Invalid refresh token");
+		let e = new URLSearchParams(), t = this.getRefreshToken();
 		Object.entries({
 			client_id: this.options.clientId,
 			client_secret: this.options.clientSecret,
 			grant_type: "refresh_token",
-			refresh_token: t.token,
+			refresh_token: t,
 			scope: this.options.scope
 		}).forEach(([t, n]) => {
 			n != null && e.append(t, n);
@@ -798,7 +816,7 @@ var N = class {
 			status: n.status,
 			data: r
 		};
-		return await this.options.storage.set("accessToken", {
+		return this._updateAccessToken({
 			token: r.access_token,
 			expiresAt: Date.now() + r.expires_in * 1e3
 		}), r.access_token;
@@ -854,22 +872,21 @@ var N = class {
 			data: a
 		};
 		if (!a.refresh_token) throw new i(2, "Failed to get refresh_token");
-		return await this.options.storage.set("refreshToken", {
+		return this._updateRefreshToken({
 			token: a.refresh_token,
 			scope: a.scope
-		}), await this.options.storage.set("accessToken", {
+		}), this._updateAccessToken({
 			token: a.access_token,
 			expiresAt: Date.now() + a.expires_in * 1e3
 		}), a.access_token;
 	}
 	async refreshToken() {
-		let e = new URLSearchParams(), t = await this.options.storage.get("refreshToken");
-		if (!t) throw new i(3, "Invalid refresh token");
+		let e = new URLSearchParams(), t = this.getRefreshToken();
 		Object.entries({
 			client_id: this.options.clientId,
 			client_secret: this.options.clientSecret,
 			grant_type: "refresh_token",
-			refresh_token: t.token,
+			refresh_token: t,
 			scope: this.options.scope
 		}).forEach(([t, n]) => {
 			n && e.append(t, n);
@@ -882,7 +899,7 @@ var N = class {
 			status: n.status,
 			data: r
 		};
-		return await this.options.storage.set("accessToken", {
+		return this._updateAccessToken({
 			token: r.access_token,
 			expiresAt: Date.now() + r.expires_in * 1e3
 		}), r.access_token;
@@ -900,7 +917,7 @@ function R(e, t) {
 async function z(e, t) {
 	let n;
 	try {
-		n = await e.getToken();
+		n = e.getAccessToken();
 	} catch (r) {
 		if (!(r instanceof i)) throw r;
 		switch (r.code) {

package/dist/providers/base.d.ts

@@ -1,9 +1,20 @@
-import { IOAuth2Options } from "../types";
+import type { IOAuth2Options, TokenData } from "../types";
 export declare abstract class OAuth2Authorizer {
     protected options: IOAuth2Options;
     abstract buildAuthUrl(): Promise<string>;
     abstract finishAuth(url: URL): Promise<string>;
     abstract refreshToken(): Promise<string>;
-    constructor(options: IOAuth2Options);
-    getToken(): Promise<string>;
+    protected _accessToken: TokenData | null;
+    protected _refreshToken: TokenData | null;
+    constructor(options: IOAuth2Options, initialData?: {
+        accessToken?: TokenData;
+        refreshToken?: TokenData;
+    });
+    protected _getValidToken(value?: TokenData | null): string | undefined;
+    protected _updateAccessToken(value: TokenData | null): void;
+    protected _updateRefreshToken(value: TokenData | null): void;
+    getAccessToken(): string;
+    getRefreshToken(): string;
+    setAccessToken(value?: TokenData | null): void;
+    setRefreshToken(value?: TokenData | null): void;
 }

package/dist/providers/index.d.ts

@@ -1,7 +1,7 @@
-import { DropboxAuthorizer } from './dropbox';
-import { GoogleAuthorizer } from './google';
-import { MicrosoftAuthorizer } from './microsoft';
-export * from './base';
+import { DropboxAuthorizer } from "./dropbox";
+import { GoogleAuthorizer } from "./google";
+import { MicrosoftAuthorizer } from "./microsoft";
+export * from "./base";
 export { DropboxAuthorizer, GoogleAuthorizer, MicrosoftAuthorizer };
 export declare const OAuth2Authorizers: {
     dropbox: typeof DropboxAuthorizer;

package/dist/types.d.ts

@@ -1,14 +1,16 @@
-import { OAuth2Authorizers } from './providers';
-export interface IStorage {
-    get<T>(key: string): Promise<T | undefined>;
-    set<T>(key: string, value: T): Promise<void>;
+import { OAuth2Authorizers } from "./providers";
+export interface TokenData {
+    token: string;
+    expiresAt?: number;
+    scope?: string;
 }
 export interface IOAuth2Options {
     clientId: string;
     clientSecret: string;
     redirectUrl: string;
-    storage: IStorage;
     scope?: string;
+    onSetAccessToken?: (value: TokenData | null) => void;
+    onSetRefreshToken?: (value: TokenData | null) => void;
 }
 export interface IOAuth2Account {
     provider: keyof typeof OAuth2Authorizers;

package/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@usync/oauth2",
-  "version": "0.0.3",
+  "version": "0.0.4",
+  "files": [
+    "dist"
+  ],
   "type": "module",
   "exports": {
     ".": {
@@ -8,15 +11,12 @@
       "types": "./dist/index.d.ts"
     }
   },
-  "files": [
-    "dist"
-  ],
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "nanoid": "^5.1.6"
+    "nanoid": "^5.1.11"
   },
   "scripts": {
     "clean": "del-cli dist tsconfig.tsbuildinfo",