@darajs/core 1.26.6 → 1.26.8

package/dist/auth/oidc/sso-callback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sso-callback.d.ts","sourceRoot":"","sources":["../../../js/auth/oidc/sso-callback.tsx"],"names":[],"mappings":"AAyCA;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA4BxC;AAED,iBAAS,mBAAmB,IAAI,GAAG,CAAC,OAAO,CAyB1C;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"sso-callback.d.ts","sourceRoot":"","sources":["../../../js/auth/oidc/sso-callback.tsx"],"names":[],"mappings":"AAgBA;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA6BxC;AAED,iBAAS,mBAAmB,IAAI,GAAG,CAAC,OAAO,CAyB1C;AAED,eAAe,mBAAmB,CAAC"}

package/dist/auth/oidc/sso-callback.js

@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jwtDecode } from 'jwt-decode';
 import { useEffect } from 'react';
 import { useLocation, useNavigate } from 'react-router';
 import { HTTP_METHOD } from '@darajs/ui-utils';
@@ -17,31 +16,6 @@ import DefaultFallback from '../../components/fallback/default';
 import { useRouterContext } from '../../router/context';
 import Center from '../../shared/center/center';
 import { handleAuthErrors } from '../auth';
-/**
- * Decode the state parameter which is a JWT containing the redirect URL.
- *
- * @param state The state parameter from the callback URL
- * @returns The redirect URL extracted from the state
- */
-function decodeStateRedirect(state) {
-    var _a;
-    if (!state) {
-        return null;
-    }
-    try {
-        const payload = jwtDecode(state);
-        return (_a = payload.redirect_to) !== null && _a !== void 0 ? _a : null;
-    }
-    catch (_b) {
-        // If decoding fails, try using the raw state as a URL (fallback for non-JWT states)
-        try {
-            return decodeURIComponent(state);
-        }
-        catch (_c) {
-            return null;
-        }
-    }
-}
 /**
  * Makes a call to /sso-callback and returns the post-auth redirect path.
  * Returns null on auth failure.
@@ -66,8 +40,9 @@ export function getSSOCallbackResult(search, defaultPath) {
                 return null;
             }
             if (res.ok) {
+                const responseData = (yield res.json());
                 return {
-                    redirectTo: (_a = decodeStateRedirect(state)) !== null && _a !== void 0 ? _a : defaultPath,
+                    redirectTo: (_a = responseData.redirect_to) !== null && _a !== void 0 ? _a : defaultPath,
                 };
             }
             throw new Error(`${res.status}: ${res.statusText}`);

package/dist/auth/oidc/sso-callback.js.map

@@ -1 +1 @@
-{"version":3,"file":"sso-callback.js","sourceRoot":"","sources":["../../../js/auth/oidc/sso-callback.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"sso-callback.js","sourceRoot":"","sources":["../../../js/auth/oidc/sso-callback.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,MAAM,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAM3C;;;;;GAKG;AACH,MAAM,UAAgB,oBAAoB,CACtC,MAAc,EACd,WAAmB;;;QAEnB,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;YAC3C,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAElC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,wBAAwB,EAAE;gBAChD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACjB,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;oBAC7B,KAAK;iBACR,CAAC;gBACF,MAAM,EAAE,WAAW,CAAC,IAAI;aAC3B,CAAC,CAAC;YAEH,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAC;YACjD,IAAI,YAAY,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;gBACT,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAwB,CAAC;gBAC/D,OAAO;oBACH,UAAU,EAAE,MAAA,YAAY,CAAC,WAAW,mCAAI,WAAW;iBACtD,CAAC;YACN,CAAC;YAED,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;QACxD,CAAC;QAAC,WAAM,CAAC;YACL,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;CAAA;AAED,SAAS,mBAAmB;IACxB,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IAEzC,SAAS,CAAC,GAAG,EAAE;QACX,oBAAoB,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC;aAClD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACb,IAAI,MAAM,EAAE,CAAC;gBACT,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAChC,CAAC;QACL,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACX,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;YACjD,QAAQ,CAAC,SAAS,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACP,uDAAuD;IAC3D,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACH,KAAC,MAAM,cACH,KAAC,eAAe,KAAG,GACd,CACZ,CAAC;AACN,CAAC;AAED,eAAe,mBAAmB,CAAC"}

package/dist/umd/dara.core.umd.cjs

@@ -76455,75 +76455,6 @@ Inferred class string: "${iconClasses}."`
     }, []);
     return /* @__PURE__ */ React.createElement(Center, null, /* @__PURE__ */ React.createElement(DefaultFallback$1, null));
   }
-  class InvalidTokenError extends Error {
-  }
-  InvalidTokenError.prototype.name = "InvalidTokenError";
-  function b64DecodeUnicode(str) {
-    return decodeURIComponent(atob(str).replace(/(.)/g, (m, p2) => {
-      let code = p2.charCodeAt(0).toString(16).toUpperCase();
-      if (code.length < 2) {
-        code = "0" + code;
-      }
-      return "%" + code;
-    }));
-  }
-  function base64UrlDecode(str) {
-    let output = str.replace(/-/g, "+").replace(/_/g, "/");
-    switch (output.length % 4) {
-      case 0:
-        break;
-      case 2:
-        output += "==";
-        break;
-      case 3:
-        output += "=";
-        break;
-      default:
-        throw new Error("base64 string is not of the correct length");
-    }
-    try {
-      return b64DecodeUnicode(output);
-    } catch (err2) {
-      return atob(output);
-    }
-  }
-  function jwtDecode(token, options) {
-    if (typeof token !== "string") {
-      throw new InvalidTokenError("Invalid token specified: must be a string");
-    }
-    options || (options = {});
-    const pos = options.header === true ? 0 : 1;
-    const part = token.split(".")[pos];
-    if (typeof part !== "string") {
-      throw new InvalidTokenError(`Invalid token specified: missing part #${pos + 1}`);
-    }
-    let decoded;
-    try {
-      decoded = base64UrlDecode(part);
-    } catch (e2) {
-      throw new InvalidTokenError(`Invalid token specified: invalid base64 for part #${pos + 1} (${e2.message})`);
-    }
-    try {
-      return JSON.parse(decoded);
-    } catch (e2) {
-      throw new InvalidTokenError(`Invalid token specified: invalid json for part #${pos + 1} (${e2.message})`);
-    }
-  }
-  function decodeStateRedirect(state) {
-    if (!state) {
-      return null;
-    }
-    try {
-      const payload = jwtDecode(state);
-      return payload.redirect_to ?? null;
-    } catch {
-      try {
-        return decodeURIComponent(state);
-      } catch {
-        return null;
-      }
-    }
-  }
   async function getSSOCallbackResult(search, defaultPath) {
     try {
       const params = new URLSearchParams(search);
@@ -76540,8 +76471,9 @@ Inferred class string: "${iconClasses}."`
         return null;
       }
       if (res.ok) {
+        const responseData = await res.json();
         return {
-          redirectTo: decodeStateRedirect(state) ?? defaultPath
+          redirectTo: responseData.redirect_to ?? defaultPath
         };
       }
       throw new Error(`${res.status}: ${res.statusText}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darajs/core",
-  "version": "1.26.6",
+  "version": "1.26.8",
   "description": "Dara Framework core",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -23,7 +23,7 @@
     "prepare-dev": "mkdir -p dist && tsc && cp -R js/assets dist/ && cp js/index.css dist/ && tsc-alias",
     "build-dev": "mkdir -p dist && cp js/index.css dist/ && cp -R js/assets dist/ && tsc && (concurrently \"tsc -w\" \"tsc-alias -w\")",
     "clean": "rimraf api assets components shared types *.js.map *.d.ts '!(*.config).js' *.css",
-    "cypress:open": "cypress open",
+    "cypress:open": "cypress open --e2e",
     "lint": "tsc --noemit && eslint js tests cypress --ext .tsx,.ts --max-warnings 0 && stylelint './js/**/*.tsx'",
     "format": "prettier js --write --list-different",
     "format:check": "prettier js --check",
@@ -31,7 +31,7 @@
     "package": "yarn build && yarn publish --no-git-tag-version",
     "test-watch": "vitest",
     "test": "vitest --run",
-    "test:e2e": "start-server-and-test 'poetry run dara start --config cypress.dara.main:config' http://127.0.0.1:8000/static/index.js 'cypress run'"
+    "test:e2e": "start-server-and-test 'poetry run dara start --config cypress.dara.main:config' http://127.0.0.1:8000/static/index.js 'cypress run --e2e'"
   },
   "prettier": "@darajs/prettier-config",
   "devDependencies": {
@@ -39,9 +39,9 @@
     "@babel/preset-env": "^7.23.0",
     "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.23.0",
-    "@darajs/eslint-config": "1.26.6",
-    "@darajs/prettier-config": "1.26.6",
-    "@darajs/stylelint-config": "1.26.6",
+    "@darajs/eslint-config": "1.26.8",
+    "@darajs/prettier-config": "1.26.8",
+    "@darajs/stylelint-config": "1.26.8",
     "@rollup/plugin-inject": "^4.0.4",
     "@testing-library/dom": "^9.3.0",
     "@testing-library/jest-dom": "^6.0.0",
@@ -60,7 +60,7 @@
     "@types/whatwg-fetch": "^0.0.33",
     "@vitejs/plugin-react": "4.6.0",
     "concurrently": "^8.0.1",
-    "cypress": "9.5.3",
+    "cypress": "10.11.0",
     "msw": "^2.10.5",
     "postcss": "^8.4.35",
     "prettier": "^3.0.0",
@@ -75,10 +75,10 @@
     "whatwg-fetch": "^3.6.20"
   },
   "dependencies": {
-    "@darajs/styled-components": "1.26.6",
-    "@darajs/ui-components": "1.26.6",
-    "@darajs/ui-notifications": "1.26.6",
-    "@darajs/ui-utils": "1.26.6",
+    "@darajs/styled-components": "1.26.8",
+    "@darajs/ui-components": "1.26.8",
+    "@darajs/ui-notifications": "1.26.8",
+    "@darajs/ui-utils": "1.26.8",
     "@fortawesome/fontawesome-free": "~6.4.0",
     "@microsoft/fetch-event-source": "^2.0.1",
     "@recoiljs/refine": "^0.1.1",
@@ -119,5 +119,5 @@
   "engines": {
     "node": ">=20.19.0"
   },
-  "gitHead": "ab3d1dc2ee7186d4d09bc640fde3ec9090a85499"
+  "gitHead": "698c2c09ff8f9ca313f557b6af370a36c9df7254"
 }