@mu-cabin/opms-permission 0.7.0 → 0.8.1

package/dist/index.cjs

@@ -272,18 +272,38 @@ var Permission = class {
   /**
    * Login using code from URL, save userInfo
    */
-  async login() {
-    const url = new URL(window.location.href);
-    const code = url.searchParams.get("code");
-    if (!code) throw new Error("No code found in URL");
-    const { obj, success, msg } = await login(this.baseUrl, code);
-    if (!success) {
-      throw new Error(msg);
+  async login(code) {
+    try {
+      const url = new URL(window.location.href);
+      const authCode = code || url.searchParams.get("code");
+      if (!authCode) {
+        return Promise.reject({
+          code: 400,
+          msg: "No code found in URL"
+        });
+      }
+      const {
+        obj,
+        success,
+        msg,
+        code: loginCode
+      } = await login(this.baseUrl, authCode);
+      if (!success || loginCode !== 200) {
+        return Promise.reject({
+          code: loginCode,
+          msg
+        });
+      }
+      const { token } = obj;
+      url.searchParams.delete("code");
+      storage.setItem(TOKEN_KEY, token);
+      return token;
+    } catch (error) {
+      return Promise.reject({
+        code: 500,
+        msg: "Internal server error"
+      });
     }
-    const { token } = obj;
-    url.searchParams.delete("code");
-    storage.setItem(TOKEN_KEY, token);
-    return token;
   }
   /**
    * Logout and clear userInfo
@@ -308,9 +328,12 @@ var Permission = class {
   }
   async getUserInfo() {
     const data = await getUserInfo(this.baseUrl);
-    const { obj, success, msg } = data;
+    const { obj, success, msg, code } = data;
     if (!success) {
-      return Promise.reject(new Error(msg));
+      return Promise.reject({
+        code,
+        msg
+      });
     }
     this._userInfo = obj;
     return this.userInfo;
@@ -330,11 +353,14 @@ var Permission = class {
         menuMap: menuMap2
       };
     }
-    const { obj, success, msg } = await queryResource(this.baseUrl, {
+    const { obj, success, msg, code } = await queryResource(this.baseUrl, {
       systemId: this.systemId
     });
     if (!success) {
-      return Promise.reject(new Error(msg));
+      return Promise.reject({
+        code,
+        msg
+      });
     }
     const resources = obj;
     const { resourceMap, widgetMap } = createResourceMap(resources);
@@ -371,9 +397,12 @@ var Permission = class {
         systemId: this.systemId,
         name: "COS"
       });
-      const { obj, success, msg } = data;
+      const { obj, success, msg, code } = data;
       if (!success) {
-        return Promise.reject(new Error(msg));
+        return Promise.reject({
+          code,
+          msg
+        });
       }
       const orgTree = obj;
       const newTree = iterateNestedArray([orgTree], (item) => {
@@ -399,7 +428,9 @@ var Permission = class {
     try {
       let orgCompanyList = storage.getItem(ORG_COMPANY_KEY);
       if (!orgCompanyList) {
-        const { obj } = await queryOrgCompanies(this.baseUrl, { queryAllBranches: true });
+        const { obj } = await queryOrgCompanies(this.baseUrl, {
+          queryAllBranches: true
+        });
         orgCompanyList = obj;
         storage.setItem(ORG_COMPANY_KEY, orgCompanyList);
       }
@@ -414,6 +445,9 @@ var Permission = class {
   getToken() {
     return storage.getItem(TOKEN_KEY);
   }
+  setToken(token) {
+    storage.setItem(TOKEN_KEY, token);
+  }
   // --- Getters ---
   get userInfo() {
     if (!this._userInfo) {

package/dist/index.d.mts

@@ -61,7 +61,7 @@ declare class Permission {
     /**
      * Login using code from URL, save userInfo
      */
-    login(): Promise<string>;
+    login(code?: string): Promise<string>;
     /**
      * Logout and clear userInfo
      */
@@ -88,7 +88,8 @@ declare class Permission {
     queryOrgs(): Promise<any>;
     queryCompanies(): Promise<void>;
     isLogin(): boolean;
-    getToken(): unknown;
+    getToken(): string | null;
+    setToken(token: string): void;
     get userInfo(): UserInfo | null;
     get hasRootAuth(): boolean;
     get userOrganizations(): UserOrganization[];

package/dist/index.d.ts

@@ -61,7 +61,7 @@ declare class Permission {
     /**
      * Login using code from URL, save userInfo
      */
-    login(): Promise<string>;
+    login(code?: string): Promise<string>;
     /**
      * Logout and clear userInfo
      */
@@ -88,7 +88,8 @@ declare class Permission {
     queryOrgs(): Promise<any>;
     queryCompanies(): Promise<void>;
     isLogin(): boolean;
-    getToken(): unknown;
+    getToken(): string | null;
+    setToken(token: string): void;
     get userInfo(): UserInfo | null;
     get hasRootAuth(): boolean;
     get userOrganizations(): UserOrganization[];

package/dist/index.mjs

@@ -234,18 +234,38 @@ var Permission = class {
   /**
    * Login using code from URL, save userInfo
    */
-  async login() {
-    const url = new URL(window.location.href);
-    const code = url.searchParams.get("code");
-    if (!code) throw new Error("No code found in URL");
-    const { obj, success, msg } = await login(this.baseUrl, code);
-    if (!success) {
-      throw new Error(msg);
+  async login(code) {
+    try {
+      const url = new URL(window.location.href);
+      const authCode = code || url.searchParams.get("code");
+      if (!authCode) {
+        return Promise.reject({
+          code: 400,
+          msg: "No code found in URL"
+        });
+      }
+      const {
+        obj,
+        success,
+        msg,
+        code: loginCode
+      } = await login(this.baseUrl, authCode);
+      if (!success || loginCode !== 200) {
+        return Promise.reject({
+          code: loginCode,
+          msg
+        });
+      }
+      const { token } = obj;
+      url.searchParams.delete("code");
+      storage.setItem(TOKEN_KEY, token);
+      return token;
+    } catch (error) {
+      return Promise.reject({
+        code: 500,
+        msg: "Internal server error"
+      });
     }
-    const { token } = obj;
-    url.searchParams.delete("code");
-    storage.setItem(TOKEN_KEY, token);
-    return token;
   }
   /**
    * Logout and clear userInfo
@@ -270,9 +290,12 @@ var Permission = class {
   }
   async getUserInfo() {
     const data = await getUserInfo(this.baseUrl);
-    const { obj, success, msg } = data;
+    const { obj, success, msg, code } = data;
     if (!success) {
-      return Promise.reject(new Error(msg));
+      return Promise.reject({
+        code,
+        msg
+      });
     }
     this._userInfo = obj;
     return this.userInfo;
@@ -292,11 +315,14 @@ var Permission = class {
         menuMap: menuMap2
       };
     }
-    const { obj, success, msg } = await queryResource(this.baseUrl, {
+    const { obj, success, msg, code } = await queryResource(this.baseUrl, {
       systemId: this.systemId
     });
     if (!success) {
-      return Promise.reject(new Error(msg));
+      return Promise.reject({
+        code,
+        msg
+      });
     }
     const resources = obj;
     const { resourceMap, widgetMap } = createResourceMap(resources);
@@ -333,9 +359,12 @@ var Permission = class {
         systemId: this.systemId,
         name: "COS"
       });
-      const { obj, success, msg } = data;
+      const { obj, success, msg, code } = data;
       if (!success) {
-        return Promise.reject(new Error(msg));
+        return Promise.reject({
+          code,
+          msg
+        });
       }
       const orgTree = obj;
       const newTree = iterateNestedArray([orgTree], (item) => {
@@ -361,7 +390,9 @@ var Permission = class {
     try {
       let orgCompanyList = storage.getItem(ORG_COMPANY_KEY);
       if (!orgCompanyList) {
-        const { obj } = await queryOrgCompanies(this.baseUrl, { queryAllBranches: true });
+        const { obj } = await queryOrgCompanies(this.baseUrl, {
+          queryAllBranches: true
+        });
         orgCompanyList = obj;
         storage.setItem(ORG_COMPANY_KEY, orgCompanyList);
       }
@@ -376,6 +407,9 @@ var Permission = class {
   getToken() {
     return storage.getItem(TOKEN_KEY);
   }
+  setToken(token) {
+    storage.setItem(TOKEN_KEY, token);
+  }
   // --- Getters ---
   get userInfo() {
     if (!this._userInfo) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mu-cabin/opms-permission",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "description": "Frontend SDK for OPMS permission and auth management.",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",