@mu-cabin/opms-permission 0.8.2 → 0.8.4

package/dist/index.cjs

@@ -276,37 +276,29 @@ var Permission = class {
    * Login using code from URL, save userInfo
    */
   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) {
+    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,
+      msg,
+      code: loginCode
+    } = await login(this.baseUrl, authCode);
+    if (loginCode !== 200) {
       return Promise.reject({
-        code: 500,
-        msg: "Internal server error"
+        code: loginCode,
+        msg
       });
     }
+    const { token } = obj;
+    url.searchParams.delete("code");
+    storage.setItem(TOKEN_KEY, token);
+    return token;
   }
   /**
    * Logout and clear userInfo
@@ -332,12 +324,6 @@ var Permission = class {
   async getUserInfo() {
     const data = await getUserInfo(this.baseUrl);
     const { obj, success, msg, code } = data;
-    if (!success) {
-      return Promise.reject({
-        code,
-        msg
-      });
-    }
     this._userInfo = obj;
     return this.userInfo;
   }
@@ -550,7 +536,7 @@ function jumpToSSOLogout({
   }
   const { location } = window;
   const ssoLoginUrl = `${baseUrl}/idp/oauth2/authorize?client_id=${clientId}&response_type=code&redirect_uri=${location.origin}/`;
-  const redirectUrl = encodeURIComponent(redirectToUrl || ssoLoginUrl);
+  const redirectUrl = redirectToUrl || ssoLoginUrl;
   const logoutUrl = new URL(`${baseUrl}/idp/profile/OAUTH2/Redirect/GLO`);
   logoutUrl.searchParams.set("response_type", "code");
   logoutUrl.searchParams.set("entityId", clientId);

package/dist/index.d.mts

@@ -120,7 +120,7 @@ declare function jumpToSSOLogin({ baseUrl, redirectUrl, clientId, }: {
  */
 declare function jumpToSSOLogout({ baseUrl, redirectToUrl, clientId, }: {
     baseUrl: string;
-    redirectToUrl: string;
+    redirectToUrl?: string;
     clientId?: string;
 }): void;
 

package/dist/index.d.ts

@@ -120,7 +120,7 @@ declare function jumpToSSOLogin({ baseUrl, redirectUrl, clientId, }: {
  */
 declare function jumpToSSOLogout({ baseUrl, redirectToUrl, clientId, }: {
     baseUrl: string;
-    redirectToUrl: string;
+    redirectToUrl?: string;
     clientId?: string;
 }): void;
 

package/dist/index.mjs

@@ -238,37 +238,29 @@ var Permission = class {
    * Login using code from URL, save userInfo
    */
   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) {
+    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,
+      msg,
+      code: loginCode
+    } = await login(this.baseUrl, authCode);
+    if (loginCode !== 200) {
       return Promise.reject({
-        code: 500,
-        msg: "Internal server error"
+        code: loginCode,
+        msg
       });
     }
+    const { token } = obj;
+    url.searchParams.delete("code");
+    storage.setItem(TOKEN_KEY, token);
+    return token;
   }
   /**
    * Logout and clear userInfo
@@ -294,12 +286,6 @@ var Permission = class {
   async getUserInfo() {
     const data = await getUserInfo(this.baseUrl);
     const { obj, success, msg, code } = data;
-    if (!success) {
-      return Promise.reject({
-        code,
-        msg
-      });
-    }
     this._userInfo = obj;
     return this.userInfo;
   }
@@ -512,7 +498,7 @@ function jumpToSSOLogout({
   }
   const { location } = window;
   const ssoLoginUrl = `${baseUrl}/idp/oauth2/authorize?client_id=${clientId}&response_type=code&redirect_uri=${location.origin}/`;
-  const redirectUrl = encodeURIComponent(redirectToUrl || ssoLoginUrl);
+  const redirectUrl = redirectToUrl || ssoLoginUrl;
   const logoutUrl = new URL(`${baseUrl}/idp/profile/OAUTH2/Redirect/GLO`);
   logoutUrl.searchParams.set("response_type", "code");
   logoutUrl.searchParams.set("entityId", clientId);

package/package.json

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