nocal-auth-sdk 0.1.6 → 0.1.8

package/dist/NocalAuth.d.ts

@@ -1,37 +1,10 @@
-export type PopupResult<T = Record<string, unknown>> = {
-    type: "success";
-    data: T;
-} | {
-    type: "error";
-    error: string;
-} | {
-    type: "closed";
-};
 export interface NocalAuthOptions {
-    clientId: string;
-    redirectUri: string;
-    scope?: string;
-    state?: string;
-    issuerOrigin?: string;
-    responseType?: "code" | "token";
-    popupFeatures?: string;
-    extraParams?: Record<string, string | number | boolean | undefined>;
-}
-export interface PopupOptions {
-    width?: number;
-    height?: number;
-    popupName?: string;
+    authorizeUrl?: string;
+    [key: string]: any;
 }
 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;
+    [key: string]: any;
+    constructor(options?: NocalAuthOptions);
+    loginWithPopup(): Promise<unknown>;
 }

package/dist/NocalAuth.js

@@ -1,129 +1,54 @@
-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.authorizeUrl = options.authorizeUrl || "";
     }
-    getAuthorizeUrl() {
-        const baseUrl = `${this.issuerOrigin}`;
-        const query = buildQuery({
-            client_id: this.clientId,
-            redirect_uri: this.redirectUri,
-            response_type: this.responseType,
-            scope: this.scope,
-            state: this.state,
-            ...this.extraParams,
-        });
-        return `${baseUrl}${query}`;
-    }
-    async loginWithPopup(popupOptions = {}) {
+    loginWithPopup() {
+        // Thêm check an toàn nếu chạy ở môi trường SSR (Next.js/Nuxt) không có window
         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?.();
         return new Promise((resolve, reject) => {
+            const width = 500;
+            const height = 700;
+            const left = window.screenX + (window.innerWidth - width) / 2;
+            const top = window.screenY + (window.innerHeight - height) / 2;
+            const features = `width=${width},height=${height},left=${left},top=${top},resizable=yes,scrollbars=yes`;
+            const popup = window.open(this.authorizeUrl, "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") {
+                if (!payload || payload.type !== "nocal_auth_result")
                     return;
-                }
-                if (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 || "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 (e) {
+                    // Bỏ qua lỗi Cross-Origin khi popup chuyển hướng
                 }
             }, 500);
         });

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export { NocalAuth } from './NocalAuth';
-export type { NocalAuthOptions, PopupOptions, PopupResult } from './NocalAuth';
+export { NocalAuth } from "./NocalAuth";
+export type { NocalAuthOptions } from "./NocalAuth";

package/dist/index.js

@@ -1 +1 @@
-export { NocalAuth } from './NocalAuth';
+export { NocalAuth } from "./NocalAuth";

package/package.json

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