@usync/oauth2 0.1.0 → 0.1.2

package/dist/index.js

@@ -1,14 +1,14 @@
 import { nanoid as U } from "nanoid";
 const R = 1, a = 2, d = 3;
 class i extends Error {
-  constructor(e, o) {
-    super(o || `OAuth2Error: code=${e}`), this.code = e;
+  constructor(e, s) {
+    super(s || `OAuth2Error: code=${e}`), this.code = e;
   }
 }
 function O(r) {
   let e = "";
-  for (const o of r)
-    e += String.fromCharCode(o);
+  for (const s of r)
+    e += String.fromCharCode(s);
   return btoa(e).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
 function _() {
@@ -18,15 +18,15 @@ function k() {
   return U(64);
 }
 async function u(r) {
-  const e = "S256", o = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(r));
+  const e = "S256", s = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(r));
   return {
-    codeChallenge: O(new Uint8Array(o)),
+    codeChallenge: O(new Uint8Array(s)),
     codeChallengeMethod: e
   };
 }
 class w {
-  constructor(e, o) {
-    this.options = e, this._accessToken = null, this._refreshToken = null, o && (this.setRefreshToken(o.refreshToken), this.setAccessToken(o.accessToken));
+  constructor(e, s) {
+    this.options = e, this._accessToken = null, this._refreshToken = null, s && (this.setRefreshToken(s.refreshToken), this.setAccessToken(s.accessToken), this.session = s.session);
   }
   _getValidToken(e) {
     return e && (!e.expiresAt || Date.now() < e.expiresAt) ? e.token : void 0;
@@ -61,41 +61,41 @@ const b = "https://www.dropbox.com/oauth2/authorize", A = "https://api.dropbox.c
       state: _(),
       codeVerifier: k()
     };
-    const { codeChallenge: e, codeChallengeMethod: o } = await u(
+    const { codeChallenge: e, codeChallengeMethod: s } = await u(
       this.session.codeVerifier
-    ), s = new URL(b);
+    ), o = new URL(b);
     return Object.entries({
       client_id: this.options.clientId,
       code_challenge: e,
-      code_challenge_method: o,
+      code_challenge_method: s,
       redirect_uri: this.options.redirectUrl,
       response_type: "code",
       token_access_type: "offline",
       scope: this.options.scope,
       state: this.session.state
     }).forEach(([n, t]) => {
-      t && s.searchParams.set(n, t);
-    }), s.href;
+      t && o.searchParams.set(n, t);
+    }), o.href;
   }
   async finishAuth(e) {
     if (!this.session || this.session.state !== e.searchParams.get("state"))
       throw new i(a, "state doesn't match");
-    const o = e.searchParams.get("code");
-    if (!o) throw new i(a, "Invalid code");
-    const s = new URLSearchParams();
+    const s = e.searchParams.get("code");
+    if (!s) throw new i(a, "Invalid code");
+    const o = new URLSearchParams();
     Object.entries({
       client_id: this.options.clientId,
       client_secret: this.options.clientSecret,
-      code: o,
+      code: s,
       code_verifier: this.session.codeVerifier,
       grant_type: "authorization_code",
       redirect_uri: this.options.redirectUrl
     }).forEach(([c, h]) => {
-      h != null && s.append(c, h);
+      h != null && o.append(c, h);
     });
     const n = await fetch(A, {
       method: "POST",
-      body: s
+      body: o
     }), t = await n.json();
     if (!n.ok) throw { status: n.status, data: t };
     if (!t.refresh_token)
@@ -109,20 +109,20 @@ const b = "https://www.dropbox.com/oauth2/authorize", A = "https://api.dropbox.c
     }), t.access_token;
   }
   async refreshToken() {
-    const e = new URLSearchParams(), o = this.getRefreshToken();
+    const e = new URLSearchParams(), s = this.getRefreshToken();
     Object.entries({
       client_id: this.options.clientId,
       client_secret: this.options.clientSecret,
       grant_type: "refresh_token",
-      refresh_token: o
+      refresh_token: s
     }).forEach(([t, c]) => {
       c != null && e.append(t, c);
     });
-    const s = await fetch(A, {
+    const o = await fetch(A, {
       method: "POST",
       body: e
-    }), n = await s.json();
-    if (!s.ok) throw { status: s.status, data: n };
+    }), n = await o.json();
+    if (!o.ok) throw { status: o.status, data: n };
     return this._updateAccessToken({
       token: n.access_token,
       expiresAt: Date.now() + n.expires_in * 1e3
@@ -139,14 +139,14 @@ const S = "https://accounts.google.com/o/oauth2/v2/auth", y = "https://oauth2.go
       state: _(),
       codeVerifier: k()
     };
-    const { codeChallenge: e, codeChallengeMethod: o } = await u(
+    const { codeChallenge: e, codeChallengeMethod: s } = await u(
       this.session.codeVerifier
-    ), s = new URL(S);
+    ), o = new URL(S);
     return Object.entries({
       access_type: "offline",
       client_id: this.options.clientId,
       code_challenge: e,
-      code_challenge_method: o,
+      code_challenge_method: s,
       include_granted_scopes: "true",
       prompt: "consent",
       redirect_uri: this.options.redirectUrl,
@@ -154,28 +154,28 @@ const S = "https://accounts.google.com/o/oauth2/v2/auth", y = "https://oauth2.go
       scope: this.options.scope,
       state: this.session.state
     }).forEach(([n, t]) => {
-      t && s.searchParams.set(n, t);
-    }), s.href;
+      t && o.searchParams.set(n, t);
+    }), o.href;
   }
   async finishAuth(e) {
     if (!this.session || this.session.state !== e.searchParams.get("state"))
       throw new i(a, "state doesn't match");
-    const o = e.searchParams.get("code");
-    if (!o) throw new i(a, "Invalid code");
-    const s = new URLSearchParams();
+    const s = e.searchParams.get("code");
+    if (!s) throw new i(a, "Invalid code");
+    const o = new URLSearchParams();
     Object.entries({
       client_id: this.options.clientId,
       client_secret: this.options.clientSecret,
-      code: o,
+      code: s,
       code_verifier: this.session.codeVerifier,
       grant_type: "authorization_code",
       redirect_uri: this.options.redirectUrl
     }).forEach(([c, h]) => {
-      h != null && s.append(c, h);
+      h != null && o.append(c, h);
     });
     const n = await fetch(y, {
       method: "POST",
-      body: s
+      body: o
     }), t = await n.json();
     if (!n.ok) throw { status: n.status, data: t };
     if (!t.refresh_token)
@@ -189,21 +189,21 @@ const S = "https://accounts.google.com/o/oauth2/v2/auth", y = "https://oauth2.go
     }), t.access_token;
   }
   async refreshToken() {
-    const e = new URLSearchParams(), o = this.getRefreshToken();
+    const e = new URLSearchParams(), s = this.getRefreshToken();
     Object.entries({
       client_id: this.options.clientId,
       client_secret: this.options.clientSecret,
       grant_type: "refresh_token",
-      refresh_token: o,
+      refresh_token: s,
       scope: this.options.scope
     }).forEach(([t, c]) => {
       c != null && e.append(t, c);
     });
-    const s = await fetch(y, {
+    const o = await fetch(y, {
       method: "POST",
       body: e
-    }), n = await s.json();
-    if (!s.ok) throw { status: s.status, data: n };
+    }), n = await o.json();
+    if (!o.ok) throw { status: o.status, data: n };
     return this._updateAccessToken({
       token: n.access_token,
       expiresAt: Date.now() + n.expires_in * 1e3
@@ -225,42 +225,42 @@ const m = class m extends w {
       state: _(),
       codeVerifier: k()
     };
-    const { codeChallenge: e, codeChallengeMethod: o } = await u(
+    const { codeChallenge: e, codeChallengeMethod: s } = await u(
       this.session.codeVerifier
-    ), s = new URL(this.oauth2Url("authorize"));
+    ), o = new URL(this.oauth2Url("authorize"));
     return Object.entries({
       client_id: this.options.clientId,
       code_challenge: e,
-      code_challenge_method: o,
+      code_challenge_method: s,
       redirect_uri: this.options.redirectUrl,
       response_mode: "query",
       response_type: "code",
       scope: this.options.scope,
       state: this.session.state
     }).forEach(([n, t]) => {
-      t && s.searchParams.set(n, t);
-    }), s.href;
+      t && o.searchParams.set(n, t);
+    }), o.href;
   }
   async finishAuth(e) {
     if (!this.session || this.session.state !== e.searchParams.get("state"))
       throw new i(a, "state doesn't match");
-    const o = e.searchParams.get("code");
-    if (!o) throw new i(a, "Invalid code");
-    const s = new URLSearchParams();
+    const s = e.searchParams.get("code");
+    if (!s) throw new i(a, "Invalid code");
+    const o = new URLSearchParams();
     Object.entries({
       client_id: this.options.clientId,
       client_secret: this.options.clientSecret,
-      code: o,
+      code: s,
       code_verifier: this.session.codeVerifier,
       grant_type: "authorization_code",
       redirect_uri: this.options.redirectUrl,
       scope: this.options.scope
     }).forEach(([c, h]) => {
-      h != null && s.append(c, h);
+      h != null && o.append(c, h);
     });
     const n = await fetch(this.oauth2Url("token"), {
       method: "POST",
-      body: s
+      body: o
     }), t = await n.json();
     if (!n.ok) throw { status: n.status, data: t };
     if (!t.refresh_token)
@@ -274,21 +274,21 @@ const m = class m extends w {
     }), t.access_token;
   }
   async refreshToken() {
-    const e = new URLSearchParams(), o = this.getRefreshToken();
+    const e = new URLSearchParams(), s = this.getRefreshToken();
     Object.entries({
       client_id: this.options.clientId,
       client_secret: this.options.clientSecret,
       grant_type: "refresh_token",
-      refresh_token: o,
+      refresh_token: s,
       scope: this.options.scope
     }).forEach(([t, c]) => {
       c != null && e.append(t, c);
     });
-    const s = await fetch(this.oauth2Url("token"), {
+    const o = await fetch(this.oauth2Url("token"), {
       method: "POST",
       body: e
-    }), n = await s.json();
-    if (!s.ok) throw { status: s.status, data: n };
+    }), n = await o.json();
+    if (!o.ok) throw { status: o.status, data: n };
     return this._updateAccessToken({
       token: n.access_token,
       expiresAt: Date.now() + n.expires_in * 1e3
@@ -310,28 +310,28 @@ function x(r, e) {
   return new E[e.provider](r);
 }
 async function I(r, e) {
-  let o;
+  let s;
   try {
-    o = r.getAccessToken();
-  } catch (s) {
-    if (!(s instanceof i))
-      throw s;
-    switch (s.code) {
+    s = r.getAccessToken();
+  } catch (o) {
+    if (!(o instanceof i))
+      throw o;
+    switch (o.code) {
       case d: {
-        if (!e) throw s;
+        if (!e) throw o;
         const n = await r.buildAuthUrl(), t = await e(n);
-        o = await r.finishAuth(new URL(t));
+        s = await r.finishAuth(new URL(t));
         break;
       }
       case R: {
-        o = await r.refreshToken();
+        s = await r.refreshToken();
         break;
       }
       default:
-        throw s;
+        throw o;
     }
   }
-  return o;
+  return s;
 }
 export {
   p as DropboxAuthorizer,

package/dist/providers/base.d.ts

@@ -6,9 +6,17 @@ export declare abstract class OAuth2Authorizer {
     abstract refreshToken(): Promise<string>;
     protected _accessToken: TokenData | null;
     protected _refreshToken: TokenData | null;
+    session: {
+        state: string;
+        codeVerifier: string;
+    } | undefined;
     constructor(options: IOAuth2Options, initialData?: {
         accessToken?: TokenData;
         refreshToken?: TokenData;
+        session?: {
+            state: string;
+            codeVerifier: string;
+        };
     });
     protected _getValidToken(value?: TokenData | null): string | undefined;
     protected _updateAccessToken(value: TokenData | null): void;

package/dist/providers/dropbox.d.ts

@@ -1,6 +1,5 @@
 import { OAuth2Authorizer } from "./base.ts";
 export declare class DropboxAuthorizer extends OAuth2Authorizer {
-    private session;
     /**
      * Ref: https://www.dropbox.com/developers/documentation/http/documentation
      */

package/dist/providers/google.d.ts

@@ -3,7 +3,6 @@ import { OAuth2Authorizer } from "./base.ts";
  * Ref: https://developers.google.com/identity/protocols/oauth2/web-server
  */
 export declare class GoogleAuthorizer extends OAuth2Authorizer {
-    private session;
     /**
      * Ref: https://developers.google.com/identity/protocols/oauth2/scopes
      */

package/dist/providers/microsoft.d.ts

@@ -3,7 +3,6 @@ import { OAuth2Authorizer } from "./base.ts";
  * Ref: https://learn.microsoft.com/en-us/entra/identity-platform/v2-oauth2-auth-code-flow
  */
 export declare class MicrosoftAuthorizer extends OAuth2Authorizer {
-    private session;
     static Scopes: {
         /** Ref: https://learn.microsoft.com/en-us/exchange/client-developer/legacy-protocols/how-to-authenticate-an-imap-pop-smtp-application-by-using-oauth */
         imap: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usync/oauth2",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "files": [
     "dist"
   ],
@@ -23,6 +23,6 @@
     "clean": "del-cli dist tsconfig.tsbuildinfo",
     "build:types": "tsc",
     "build:js": "vite build",
-    "build": "pnpm clean && pnpm /^build:/"
+    "build": "pnpm clean && pnpm build:js && pnpm build:types"
   }
 }