nocal-auth-sdk 0.1.7 → 0.1.9

package/dist/NocalAuth.d.ts

@@ -1,37 +1,30 @@
-export type PopupResult<T = Record<string, unknown>> = {
-    type: "success";
-    data: T;
-} | {
-    type: "error";
-    error: string;
-} | {
-    type: "closed";
-};
 export interface NocalAuthOptions {
-    clientId: string;
-    redirectUri: string;
+    authorizeUrl?: string;
+    clientId?: string;
+    redirectUri?: string;
     scope?: string;
     state?: string;
-    issuerOrigin?: string;
-    responseType?: "code" | "token";
-    popupFeatures?: string;
-    extraParams?: Record<string, string | number | boolean | undefined>;
+    [key: string]: any;
 }
-export interface PopupOptions {
+export interface NocalPopupResult {
+    success: boolean;
+    data?: Record<string, any>;
+    error?: string;
+    message?: string;
+}
+export interface LoginWithPopupOptions {
+    url?: string;
+    popupName?: string;
     width?: number;
     height?: number;
-    popupName?: string;
+    features?: string;
 }
 export declare class NocalAuth {
-    private readonly clientId;
-    private readonly redirectUri;
-    private readonly scope?;
-    private readonly state?;
-    private readonly issuerOrigin;
-    private readonly responseType;
-    private readonly popupFeatures?;
-    private readonly extraParams?;
-    constructor(options: NocalAuthOptions);
-    private getAuthorizeUrl;
-    loginWithPopup(popupOptions?: PopupOptions): Promise<Record<string, unknown>>;
+    private authorizeUrl;
+    private options;
+    constructor(options?: NocalAuthOptions);
+    static notifyPopupResult(result: NocalPopupResult, targetWindow?: Window | null): boolean;
+    getAuthorizeUrl(): string;
+    static loginWithPopup(options?: LoginWithPopupOptions): Promise<unknown>;
+    loginWithPopup(options?: LoginWithPopupOptions): Promise<unknown>;
 }

package/dist/NocalAuth.js

@@ -1,131 +1,104 @@
-function buildQuery(params) {
-    const qs = Object.entries(params)
-        .filter(([, value]) => value !== undefined && value !== null && value !== "")
-        .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`)
-        .join("&");
-    return qs ? `?${qs}` : "";
-}
 export class NocalAuth {
-    constructor(options) {
-        if (!options.clientId) {
-            throw new Error("NocalAuth requires a clientId");
-        }
-        if (!options.redirectUri) {
-            throw new Error("NocalAuth requires a redirectUri");
-        }
-        this.clientId = options.clientId;
-        this.redirectUri = options.redirectUri;
-        this.scope = options.scope;
-        this.state = options.state;
-        this.issuerOrigin = (options.issuerOrigin ?? "https://auth.nocal.vn").replace(/\/$/, "");
-        this.responseType = options.responseType ?? "code";
-        this.popupFeatures = options.popupFeatures;
-        this.extraParams = options.extraParams;
+    constructor(options = {}) {
+        this.options = options;
+        this.authorizeUrl =
+            options.authorizeUrl || "https://auth.nocal.vn/oauth/authorize";
+    }
+    static notifyPopupResult(result, targetWindow = typeof window !== "undefined"
+        ? window.opener
+        : null) {
+        if (typeof window === "undefined")
+            return false;
+        const opener = targetWindow ?? window.opener;
+        if (!opener)
+            return false;
+        const payload = {
+            type: "nocal_auth_result",
+            success: result.success,
+            ...(result.success
+                ? { data: result.data ?? {} }
+                : {
+                    error: result.error || "AUTH_FAILED",
+                    message: result.message || result.error || "AUTH_FAILED",
+                }),
+        };
+        opener.postMessage(payload, "*");
+        return true;
     }
     getAuthorizeUrl() {
-        const baseUrl = `${this.issuerOrigin}/dang-nhap`;
-        const query = buildQuery({
-            client_id: this.clientId,
-            redirect_uri: this.redirectUri,
-            response_type: this.responseType,
-            scope: this.scope,
-            state: this.state,
-            ...this.extraParams,
+        const url = new URL(this.authorizeUrl || "https://auth.nocal.vn/oauth/authorize");
+        const params = {
+            client_id: this.options.clientId,
+            redirect_uri: this.options.redirectUri,
+            scope: this.options.scope,
+            state: this.options.state,
+            ...this.options,
+        };
+        Object.entries(params).forEach(([key, value]) => {
+            if (value === undefined || value === null || value === "")
+                return;
+            if (key === "authorizeUrl")
+                return;
+            url.searchParams.set(key, String(value));
         });
-        return `${baseUrl}${query}`;
+        return url.toString();
     }
-    async loginWithPopup(popupOptions = {}) {
+    static loginWithPopup(options = {}) {
         if (typeof window === "undefined") {
-            throw new Error("loginWithPopup() can only be used in a browser environment");
-        }
-        const width = popupOptions.width ?? 500;
-        const height = popupOptions.height ?? 700;
-        const popupName = popupOptions.popupName ?? "nocal_auth_popup";
-        const dualScreenLeft = window.screenLeft ?? window.screenX ?? 0;
-        const dualScreenTop = window.screenTop ?? window.screenY ?? 0;
-        const screenWidth = window.innerWidth ??
-            document.documentElement.clientWidth ??
-            window.screen.width ??
-            1280;
-        const screenHeight = window.innerHeight ??
-            document.documentElement.clientHeight ??
-            window.screen.height ??
-            720;
-        const left = Math.round(dualScreenLeft + (screenWidth - width) / 2);
-        const top = Math.round(dualScreenTop + (screenHeight - height) / 2);
-        const features = [
-            `width=${width}`,
-            `height=${height}`,
-            `left=${left}`,
-            `top=${top}`,
-            "resizable=yes",
-            "scrollbars=yes",
-            this.popupFeatures ?? "",
-        ]
-            .filter(Boolean)
-            .join(",");
-        // Xây dựng URL với tham số display=popup và các tham số khác
-        const authUrl = new URL(this.getAuthorizeUrl());
-        authUrl.searchParams.set("display", "popup");
-        const popup = window.open(authUrl.toString(), popupName, features);
-        if (!popup) {
-            throw new Error("POPUP_BLOCKED");
+            return Promise.reject(new Error("loginWithPopup() can only be used in a browser environment"));
         }
-        popup.focus?.();
+        const url = options.url || "https://auth.nocal.vn/oauth/authorize";
+        const width = options.width ?? 500;
+        const height = options.height ?? 700;
+        const left = window.screenX + (window.innerWidth - width) / 2;
+        const top = window.screenY + (window.innerHeight - height) / 2;
+        const features = options.features ??
+            `width=${width},height=${height},left=${left},top=${top},resizable=yes,scrollbars=yes`;
         return new Promise((resolve, reject) => {
+            const popup = window.open(url, options.popupName ?? "nocal_auth_popup", features);
+            if (!popup)
+                return reject(new Error("POPUP_BLOCKED"));
+            popup.focus();
             let settled = false;
-            let checkInterval = undefined;
+            let timer = null;
             const cleanup = () => {
-                settled = true;
-                window.removeEventListener("message", handleMessage);
-                if (checkInterval) {
-                    clearInterval(checkInterval);
-                }
-            };
-            const rejectWith = (message) => {
                 if (settled)
                     return;
-                cleanup();
-                reject(new Error(message));
+                settled = true;
+                window.removeEventListener("message", handleMessage);
+                if (timer)
+                    clearInterval(timer);
             };
             const handleMessage = (event) => {
-                if (settled)
-                    return;
-                // Kiểm tra origin bảo mật
-                if (event.origin !== this.issuerOrigin) {
-                    return;
-                }
                 const payload = event.data;
-                if (!payload || typeof payload !== "object") {
-                    return;
-                }
-                if (payload.type !== "nocal_auth_result") {
+                if (!payload || payload.type !== "nocal_auth_result")
                     return;
-                }
                 cleanup();
-                if (payload.success === false || payload.error) {
-                    rejectWith(typeof payload.error === "string" ? payload.error : "AUTH_FAILED");
-                    return;
+                if (payload.success) {
+                    resolve(payload.data ?? {});
                 }
-                const rawData = payload.data ?? payload;
-                const data = {
-                    token: rawData.accessToken ?? rawData.token ?? rawData.access_token,
-                    refreshToken: rawData.refreshToken,
-                    user: rawData.user,
-                    state: rawData.state,
-                };
-                if (!data || Object.keys(data).length === 0) {
-                    rejectWith("AUTH_DATA_MISSING");
-                    return;
+                else {
+                    reject(new Error(payload.error || payload.message || "AUTH_FAILED"));
                 }
-                resolve(data);
             };
-            window.addEventListener("message", handleMessage, false);
-            checkInterval = window.setInterval(() => {
-                if (popup.closed) {
-                    rejectWith("POPUP_CLOSED");
+            window.addEventListener("message", handleMessage);
+            timer = setInterval(() => {
+                try {
+                    if (popup.closed) {
+                        cleanup();
+                        reject(new Error("POPUP_CLOSED"));
+                    }
+                }
+                catch {
+                    // Ignore cross-origin checks while popup is redirecting.
                 }
             }, 500);
         });
     }
+    loginWithPopup(options = {}) {
+        return NocalAuth.loginWithPopup({
+            ...options,
+            url: options.url || this.getAuthorizeUrl(),
+        });
+    }
 }

package/dist/index.d.mts

@@ -0,0 +1,46 @@
+import * as _supabase_auth_js from '@supabase/auth-js';
+import { User, Session } from '@supabase/supabase-js';
+export { Session, User } from '@supabase/supabase-js';
+
+interface NocalClientConfig {
+    clientId: string;
+    redirectUri: string;
+}
+type NocalOAuthProvider = "google" | "facebook" | "github" | "apple";
+interface OAuthLoginReq {
+    provider?: NocalOAuthProvider;
+    redirectTo?: string;
+}
+
+declare class NocalAuthSDK {
+    private supabase;
+    private clientId;
+    private redirectUri;
+    constructor(config: NocalClientConfig);
+    /**
+     * Mở Popup UI Đăng nhập/Đăng ký tập trung của Nocal
+     */
+    signInWithNocal(req?: OAuthLoginReq): Promise<User>;
+    /**
+     * Lấy thông tin User hiện tại
+     */
+    getUser(): Promise<User | null>;
+    /**
+     * Lấy Session / Access Token hiện tại
+     */
+    getSession(): Promise<Session | null>;
+    /**
+     * Đăng xuất khỏi hệ thống
+     */
+    signOut(): Promise<void>;
+    /**
+     * Lắng nghe sự kiện đăng nhập / đăng xuất
+     */
+    onAuthStateChange(callback: (event: string, session: Session | null) => void): {
+        data: {
+            subscription: _supabase_auth_js.Subscription;
+        };
+    };
+}
+
+export { NocalAuthSDK, type NocalClientConfig, type NocalOAuthProvider, type OAuthLoginReq };

package/dist/index.d.ts

@@ -1,2 +1,32 @@
-export { NocalAuth } from './NocalAuth';
-export type { NocalAuthOptions, PopupOptions, PopupResult } from './NocalAuth';
+import { NocalClientConfig, OAuthLoginReq, User as NocalUser, Session as NocalSession } from "./types";
+export declare class NocalAuthSDK {
+    private supabase;
+    private clientId;
+    private redirectUri;
+    constructor(config: NocalClientConfig);
+    /**
+     * Mở Popup UI Đăng nhập/Đăng ký tập trung của Nocal
+     */
+    signInWithNocal(req?: OAuthLoginReq): Promise<NocalUser>;
+    /**
+     * Lấy thông tin User hiện tại
+     */
+    getUser(): Promise<NocalUser | null>;
+    /**
+     * Lấy Session / Access Token hiện tại
+     */
+    getSession(): Promise<NocalSession | null>;
+    /**
+     * Đăng xuất khỏi hệ thống
+     */
+    signOut(): Promise<void>;
+    /**
+     * Lắng nghe sự kiện đăng nhập / đăng xuất
+     */
+    onAuthStateChange(callback: (event: string, session: NocalSession | null) => void): {
+        data: {
+            subscription: import("@supabase/auth-js").Subscription;
+        };
+    };
+}
+export * from "./types";

package/dist/index.js

@@ -1 +1,109 @@
-export { NocalAuth } from './NocalAuth';
+import { createClient, } from "@supabase/supabase-js";
+const NOCAL_AUTH_SERVER_URL = "https://hldymiruucsqqzicnwdv.supabase.co";
+const NOCAL_ANON_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImhsZHltaXJ1dWNzcXF6aWNud2R2Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3ODk2MTQ2NzAsImV4cCI6MjEwNTE5MDY3MH0.dLaPWdgTV8mRVToNT1XLg1EUjHvyvRRK2qc0DQAu8YI";
+export class NocalAuthSDK {
+    constructor(config) {
+        this.clientId = config.clientId;
+        this.redirectUri = config.redirectUri;
+        this.supabase = createClient(NOCAL_AUTH_SERVER_URL, NOCAL_ANON_KEY, {
+            auth: {
+                autoRefreshToken: true,
+                persistSession: true,
+                detectSessionInUrl: true,
+            },
+        });
+    }
+    /**
+     * Mở Popup UI Đăng nhập/Đăng ký tập trung của Nocal
+     */
+    async signInWithNocal(req) {
+        const targetRedirect = req?.redirectTo || this.redirectUri;
+        const provider = (req?.provider || "google");
+        // 1. Gọi Supabase SDK để sinh URL ủy quyền chuẩn OAuth 2.0 / PKCE
+        const { data, error } = await this.supabase.auth.signInWithOAuth({
+            provider,
+            options: {
+                redirectTo: targetRedirect,
+                skipBrowserRedirect: true, // Lấy URL trả về, không nhảy trang tab chính
+                queryParams: {
+                    client_id: this.clientId, // Gắn Client ID để Auth Server nhận diện App
+                },
+            },
+        });
+        if (error)
+            throw error;
+        if (!data?.url)
+            throw new Error("CANNOT_GENERATE_AUTH_URL");
+        // 2. Tính toán kích thước và căn giữa màn hình Popup
+        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;
+        // 3. Mở Cửa sổ Popup chứa UI đăng nhập Nocal
+        const popup = window.open(data.url, "NocalAuthPopup", `width=${width},height=${height},left=${left},top=${top},status=yes,scrollbars=yes`);
+        if (!popup) {
+            throw new Error("POPUP_BLOCKED");
+        }
+        // 4. Lắng nghe và kiểm tra khi Popup đóng
+        return new Promise((resolve, reject) => {
+            const isPopupClosed = () => {
+                try {
+                    return popup.closed;
+                }
+                catch (e) {
+                    return false;
+                }
+            };
+            const timer = setInterval(async () => {
+                if (isPopupClosed()) {
+                    clearInterval(timer);
+                    // Sau khi popup đóng, lấy session đã đăng nhập
+                    const { data: sessionData } = await this.supabase.auth.getSession();
+                    if (sessionData?.session?.user) {
+                        resolve(sessionData.session.user);
+                    }
+                    else {
+                        reject(new Error("LOGIN_CANCELLED_OR_FAILED"));
+                    }
+                }
+            }, 500);
+        });
+    }
+    /**
+     * Lấy thông tin User hiện tại
+     */
+    async getUser() {
+        const { data: { user }, error, } = await this.supabase.auth.getUser();
+        if (error)
+            throw error;
+        return user;
+    }
+    /**
+     * Lấy Session / Access Token hiện tại
+     */
+    async getSession() {
+        const { data: { session }, error, } = await this.supabase.auth.getSession();
+        if (error)
+            throw error;
+        return session;
+    }
+    /**
+     * Đăng xuất khỏi hệ thống
+     */
+    async signOut() {
+        const { error } = await this.supabase.auth.signOut();
+        if (error)
+            throw error;
+    }
+    /**
+     * Lắng nghe sự kiện đăng nhập / đăng xuất
+     */
+    onAuthStateChange(callback) {
+        return this.supabase.auth.onAuthStateChange(callback);
+    }
+}
+export * from "./types";

package/dist/index.mjs

@@ -0,0 +1,110 @@
+// src/index.ts
+import {
+  createClient
+} from "@supabase/supabase-js";
+var NOCAL_AUTH_SERVER_URL = "https://hldymiruucsqqzicnwdv.supabase.co";
+var NOCAL_ANON_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImhsZHltaXJ1dWNzcXF6aWNud2R2Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3ODk2MTQ2NzAsImV4cCI6MjEwNTE5MDY3MH0.dLaPWdgTV8mRVToNT1XLg1EUjHvyvRRK2qc0DQAu8YI";
+var NocalAuthSDK = class {
+  constructor(config) {
+    this.clientId = config.clientId;
+    this.redirectUri = config.redirectUri;
+    this.supabase = createClient(NOCAL_AUTH_SERVER_URL, NOCAL_ANON_KEY, {
+      auth: {
+        autoRefreshToken: true,
+        persistSession: true,
+        detectSessionInUrl: true
+      }
+    });
+  }
+  /**
+   * Mở Popup UI Đăng nhập/Đăng ký tập trung của Nocal
+   */
+  async signInWithNocal(req) {
+    const targetRedirect = req?.redirectTo || this.redirectUri;
+    const provider = req?.provider || "google";
+    const { data, error } = await this.supabase.auth.signInWithOAuth({
+      provider,
+      options: {
+        redirectTo: targetRedirect,
+        skipBrowserRedirect: true,
+        // Lấy URL trả về, không nhảy trang tab chính
+        queryParams: {
+          client_id: this.clientId
+          // Gắn Client ID để Auth Server nhận diện App
+        }
+      }
+    });
+    if (error) throw error;
+    if (!data?.url) throw new Error("CANNOT_GENERATE_AUTH_URL");
+    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 popup = window.open(
+      data.url,
+      "NocalAuthPopup",
+      `width=${width},height=${height},left=${left},top=${top},status=yes,scrollbars=yes`
+    );
+    if (!popup) {
+      throw new Error("POPUP_BLOCKED");
+    }
+    return new Promise((resolve, reject) => {
+      const isPopupClosed = () => {
+        try {
+          return popup.closed;
+        } catch (e) {
+          return false;
+        }
+      };
+      const timer = setInterval(async () => {
+        if (isPopupClosed()) {
+          clearInterval(timer);
+          const { data: sessionData } = await this.supabase.auth.getSession();
+          if (sessionData?.session?.user) {
+            resolve(sessionData.session.user);
+          } else {
+            reject(new Error("LOGIN_CANCELLED_OR_FAILED"));
+          }
+        }
+      }, 500);
+    });
+  }
+  /**
+   * Lấy thông tin User hiện tại
+   */
+  async getUser() {
+    const {
+      data: { user },
+      error
+    } = await this.supabase.auth.getUser();
+    if (error) throw error;
+    return user;
+  }
+  /**
+   * Lấy Session / Access Token hiện tại
+   */
+  async getSession() {
+    const {
+      data: { session },
+      error
+    } = await this.supabase.auth.getSession();
+    if (error) throw error;
+    return session;
+  }
+  /**
+   * Đăng xuất khỏi hệ thống
+   */
+  async signOut() {
+    const { error } = await this.supabase.auth.signOut();
+    if (error) throw error;
+  }
+  /**
+   * Lắng nghe sự kiện đăng nhập / đăng xuất
+   */
+  onAuthStateChange(callback) {
+    return this.supabase.auth.onAuthStateChange(callback);
+  }
+};
+export {
+  NocalAuthSDK
+};

package/dist/types.d.ts

@@ -0,0 +1,11 @@
+import { User, Session } from "@supabase/supabase-js";
+export interface NocalClientConfig {
+    clientId: string;
+    redirectUri: string;
+}
+export type NocalOAuthProvider = "google" | "facebook" | "github" | "apple";
+export interface OAuthLoginReq {
+    provider?: NocalOAuthProvider;
+    redirectTo?: string;
+}
+export type { User, Session };

package/dist/types.js

@@ -0,0 +1 @@
+export {};

package/package.json

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