nocal-auth-sdk 0.2.0 → 0.2.2

package/dist/index.d.ts

@@ -7,16 +7,17 @@ export declare class NocalAuthSDK {
     private currentUser;
     constructor(config: NocalClientConfig);
     /**
-     * Mở Popup UI Đăng nhập & Ủy quyền OAuth 2.0 với PKCE
+     * Mở Popup UI Đăng nhập & Ủy quyền chuẩn Supabase Native OAuth 2.0 với PKCE
      */
     signInWithNocal(req?: OAuthLoginReq): Promise<{
         user: NocalUser;
         session: NocalSession;
     }>;
-    private exchangeCodeForToken;
+    exchangeCodeForToken(code: string, codeVerifier: string): Promise<NocalSession>;
     private fetchUserInfo;
     getUser(): Promise<NocalUser | null>;
     getSession(): Promise<NocalSession | null>;
     signOut(): Promise<void>;
 }
+export { NocalAuthSDK as NocalAuth };
 export * from "./types";

package/dist/index.js

@@ -1,4 +1,4 @@
-const DEFAULT_AUTH_SERVER_URL = "http://localhost:3001";
+const DEFAULT_AUTH_SERVER_URL = "https://hldymiruucsqqzicnwdv.supabase.co";
 // Helper for PKCE crypto
 function base64URLEncode(buffer) {
     let binary = "";
@@ -45,13 +45,13 @@ export class NocalAuthSDK {
         }
     }
     /**
-     * Mở Popup UI Đăng nhập & Ủy quyền OAuth 2.0 với PKCE
+     * Mở Popup UI Đăng nhập & Ủy quyền chuẩn Supabase Native OAuth 2.0 với PKCE
      */
     async signInWithNocal(req) {
         const state = req?.state || generateRandomString(16);
         const codeVerifier = generateRandomString(32);
         const codeChallenge = await generateCodeChallenge(codeVerifier);
-        const authUrl = new URL(`${this.authServerUrl}/oauth/authorize`);
+        const authUrl = new URL(`${this.authServerUrl}/auth/v1/oauth/authorize`);
         authUrl.searchParams.set("client_id", this.clientId);
         authUrl.searchParams.set("redirect_uri", this.redirectUri);
         authUrl.searchParams.set("response_type", "code");
@@ -60,8 +60,12 @@ export class NocalAuthSDK {
         authUrl.searchParams.set("code_challenge_method", "S256");
         const width = 480;
         const height = 680;
-        const left = typeof window !== "undefined" ? window.screenX + (window.outerWidth - width) / 2 : 0;
-        const top = typeof window !== "undefined" ? window.screenY + (window.outerHeight - height) / 2 : 0;
+        const left = typeof window !== "undefined"
+            ? window.screenX + (window.outerWidth - width) / 2
+            : 0;
+        const top = typeof window !== "undefined"
+            ? window.screenY + (window.outerHeight - height) / 2
+            : 0;
         const popup = window.open(authUrl.toString(), "NocalAuthPopup", `width=${width},height=${height},left=${left},top=${top},status=yes,scrollbars=yes`);
         if (!popup) {
             throw new Error("POPUP_BLOCKED");
@@ -72,7 +76,9 @@ export class NocalAuthSDK {
                 if (event.origin !== allowedOrigin)
                     return;
                 const data = event.data;
-                if (!data || (data.type !== "NOCAL_OAUTH_CODE" && data.type !== "NOCAL_OAUTH_ERROR")) {
+                if (!data ||
+                    (data.type !== "NOCAL_OAUTH_CODE" &&
+                        data.type !== "NOCAL_OAUTH_ERROR")) {
                     return;
                 }
                 window.removeEventListener("message", messageListener);
@@ -95,7 +101,6 @@ export class NocalAuthSDK {
                 }
                 try {
                     popup.close();
-                    // Đổi code lấy token
                     const session = await this.exchangeCodeForToken(code, codeVerifier);
                     const user = await this.fetchUserInfo(session.access_token);
                     this.currentSession = session;
@@ -117,6 +122,40 @@ export class NocalAuthSDK {
                         window.removeEventListener("message", messageListener);
                         reject(new Error("POPUP_CLOSED_BY_USER"));
                     }
+                    else {
+                        try {
+                            const popupUrl = new URL(popup.location.href);
+                            if (popupUrl.origin === new URL(this.redirectUri).origin) {
+                                const code = popupUrl.searchParams.get("code");
+                                const error = popupUrl.searchParams.get("error");
+                                if (code || error) {
+                                    clearInterval(checkClosedTimer);
+                                    window.removeEventListener("message", messageListener);
+                                    popup.close();
+                                    if (error) {
+                                        reject(new Error(error));
+                                        return;
+                                    }
+                                    if (code) {
+                                        this.exchangeCodeForToken(code, codeVerifier)
+                                            .then(async (session) => {
+                                            const user = await this.fetchUserInfo(session.access_token);
+                                            this.currentSession = session;
+                                            this.currentUser = user;
+                                            if (typeof window !== "undefined") {
+                                                localStorage.setItem("nocal_auth_session", JSON.stringify({ session, user }));
+                                            }
+                                            resolve({ user, session });
+                                        })
+                                            .catch(reject);
+                                    }
+                                }
+                            }
+                        }
+                        catch (e) {
+                            // Cross-origin check
+                        }
+                    }
                 }
                 catch (e) {
                     // ignore
@@ -125,25 +164,27 @@ export class NocalAuthSDK {
         });
     }
     async exchangeCodeForToken(code, codeVerifier) {
-        const res = await fetch(`${this.authServerUrl}/api/oauth/token`, {
+        const params = new URLSearchParams();
+        params.set("grant_type", "authorization_code");
+        params.set("client_id", this.clientId);
+        params.set("redirect_uri", this.redirectUri);
+        params.set("code", code);
+        params.set("code_verifier", codeVerifier); // PKCE xác thực thay cho secret
+        const response = await fetch(`${this.authServerUrl}/auth/v1/oauth/token`, {
             method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({
-                grant_type: "authorization_code",
-                code,
-                client_id: this.clientId,
-                redirect_uri: this.redirectUri,
-                code_verifier: codeVerifier,
-            }),
+            headers: {
+                "Content-Type": "application/x-www-form-urlencoded",
+            },
+            body: params.toString(),
         });
-        const data = await res.json();
-        if (!res.ok) {
-            throw new Error(data.error_description || data.error || "FAILED_TO_EXCHANGE_TOKEN");
+        if (!response.ok) {
+            const errorData = await response.json();
+            throw new Error(`Supabase Auth Error: ${errorData.error_description || errorData.error}`);
         }
-        return data;
+        return (await response.json());
     }
     async fetchUserInfo(accessToken) {
-        const res = await fetch(`${this.authServerUrl}/api/oauth/userinfo`, {
+        const res = await fetch(`${this.authServerUrl}/auth/v1/oauth/userinfo`, {
             headers: {
                 Authorization: `Bearer ${accessToken}`,
             },
@@ -168,4 +209,5 @@ export class NocalAuthSDK {
         }
     }
 }
+export { NocalAuthSDK as NocalAuth };
 export * from "./types";

package/dist/types.d.ts

@@ -2,9 +2,12 @@ export interface NocalClientConfig {
     clientId: string;
     redirectUri: string;
     authServerUrl?: string;
+    storageKey?: string;
 }
 export interface OAuthLoginReq {
     state?: string;
+    provider?: string;
+    redirectTo?: string;
 }
 export interface NocalUser {
     sub: string;
@@ -12,12 +15,13 @@ export interface NocalUser {
     phone?: string;
     email_confirmed?: boolean;
     phone_confirmed?: boolean;
-    user_metadata?: Record<string, any>;
-    [key: string]: any;
+    user_metadata?: Record<string, unknown>;
+    [key: string]: unknown;
 }
 export interface NocalSession {
     access_token: string;
     refresh_token: string;
     token_type: string;
     expires_in: number;
+    expires_at?: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nocal-auth-sdk",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Nocal Auth - client-side SDK for Login with Nocal (popup flow)",
   "type": "module",
   "main": "dist/index.js",