npm - @solidxai/core-ui - Versions diffs - 0.1.8-beta.21 → 0.1.8-beta.22 - Mend

@solidxai/core-ui 0.1.8-beta.21 → 0.1.8-beta.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (94) hide show

package/dist/components/auth/FacebookAuthChecking.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"FacebookAuthChecking.d.ts","sourceRoot":"","sources":["../../../src/components/auth/FacebookAuthChecking.tsx"],"names":[],"mappings":"~~AAYA~~,eAAO,MAAM,oBAAoB,+~~CAmDhC~~,CAAA"}
1	+ {"version":3,"file":"FacebookAuthChecking.d.ts","sourceRoot":"","sources":["../../../src/components/auth/FacebookAuthChecking.tsx"],"names":[],"mappings":"AAUA,eAAO,MAAM,oBAAoB,+CAgDhC,CAAA"}

package/dist/components/auth/FacebookAuthChecking.js CHANGED Viewed

@@ -43,8 +43,6 @@ import { useEffect, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { env } from "../../adapters/env";
 import { showToast } from "../../redux/features/toastSlice";
-import { loadSession } from "../../adapters/auth/storage";
-import { hasAnyRole } from "../../helpers/rolesHelper";
 import { SolidSpinner } from "../shad-cn-ui";
 export var FacebookAuthChecking = function () {
     var searchParams = useSearchParams();
@@ -54,40 +52,37 @@ export var FacebookAuthChecking = function () {
     var dispatch = useDispatch();
     useEffect(function () {
         var handleOAuthAuthentication = function () { return __awaiter(void 0, void 0, void 0, function () {
-            var response, session, isAdmin, isDev, redirectUrl, err_1;
-            var _a, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var response, redirectUrl, err_1;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (!accessCode) {
                             dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ERROR_MESSAGES.AUTHENICATION__FAILED }));
                             setError(ERROR_MESSAGES.AUTHENICATION__FAILED);
                             return [2 /*return*/];
                         }
-                        _c.label = 1;
+                        _b.label = 1;
                     case 1:
-                        _c.trys.push([1, 3, , 4]);
+                        _b.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, signInWithOAuthAccessCode({
                                 accessCode: accessCode,
                                 provider: "facebook"
                             })];
                     case 2:
-                        response = _c.sent();
+                        response = _b.sent();
                         if (response === null || response === void 0 ? void 0 : response.error) {
                             dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: response.error }));
                             setError(ERROR_MESSAGES.AUTHENICATION__FAILED);
                         }
                         else {
-                            session = loadSession();
-                            isAdmin = hasAnyRole((_a = session === null || session === void 0 ? void 0 : session.user) === null || _a === void 0 ? void 0 : _a.roles, ["Admin"]);
-                            isDev = env("VITE_SOLIDX_ENV") === "dev";
-                            redirectUrl = isAdmin && isDev ? "/studio" : (env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin");
+                            redirectUrl = env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin";
                             router.push(redirectUrl);
                         }
                         return [3 /*break*/, 4];
                     case 3:
-                        err_1 = _c.sent();
-                        dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ((_b = err_1 === null || err_1 === void 0 ? void 0 : err_1.data) === null || _b === void 0 ? void 0 : _b.message) || ERROR_MESSAGES.AUTHENICATION__FAILED }));
+                        err_1 = _b.sent();
+                        dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ((_a = err_1 === null || err_1 === void 0 ? void 0 : err_1.data) === null || _a === void 0 ? void 0 : _a.message) || ERROR_MESSAGES.AUTHENICATION__FAILED }));
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/];
                 }

package/dist/components/auth/FacebookAuthChecking.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"FacebookAuthChecking.js","sourceRoot":"","sources":["../../../src/components/auth/FacebookAuthChecking.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,~~WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,~~YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,CAAC,IAAM,oBAAoB,GAAG;IAChC,IAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,IAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAElD,IAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IACrB,IAAA,KAAoB,QAAQ,CAAgB,IAAI,CAAC,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAC;IACxD,IAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,SAAS,CAAC;QACN,IAAM,yBAAyB,GAAG;;;;;;wBAC9B,IAAI,CAAC,UAAU,EAAE;4BACb,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;4BAC9H,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;4BAC/C,sBAAO;yBACV;;;;wBAGoB,qBAAM,yBAAyB,CAAC;gCAC7C,UAAU,EAAE,UAAU;gCACtB,QAAQ,EAAE,UAAU;6BACvB,CAAC,EAAA;;wBAHI,QAAQ,GAAG,SAGf;wBAEF,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,EAAE;4BACjB,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;4BACxG,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAA;yBACjD;6BAAM;4BAEG,~~OAAO,GAAG,~~WAAW,~~EAAE,CAAC;4BACxB,OAAO,~~GAAG,~~UAAU,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,0CAAE,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;4BACtD,KAAK,~~GAAG,~~GAAG,~~CAAC,~~iBAAiB,CAAC,KAAK,KAAK,CAAC;4BACzC,WAAW,GAAG,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,~~gCAAgC,CAAC,IAAI,QAAQ,CAAC~~,CAAC~~;~~4BACvG~~,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;yBAC5B;;;;wBAED,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,CAAA,MAAA,KAAG,aAAH,KAAG,uBAAH,KAAG,CAAE,IAAI,0CAAE,OAAO,KAAI,cAAc,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;;;;;aAE3J,CAAC;QAEF,yBAAyB,EAAE,CAAC;IAChC,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAEzB,IAAI,KAAK,EAAE;QACP,OAAO,CACH,cAAK,SAAS,EAAC,+CAA+C,YAC1D,aAAI,SAAS,EAAC,oCAAoC,YAAE,KAAK,GAAM,GAC7D,CACT,CAAC;KACL;IACD,OAAO,CACH,KAAC,YAAY,IAAC,SAAS,EAAC,+CAA+C,GAAG,CAC7E,CAAA;AACL,CAAC,CAAA","sourcesContent":["import { ERROR_MESSAGES } from '../../constants/error-messages';\nimport { signInWithOAuthAccessCode } from \"../../adapters/auth/index\";\nimport { useRouter } from \"../../hooks/useRouter\";\nimport { useSearchParams } from \"../../hooks/useSearchParams\";\nimport { useEffect, useState } from 'react'\nimport { useDispatch } from 'react-redux';\nimport { env } from \"../../adapters/env\";\nimport { showToast } from \"../../redux/features/toastSlice\";\nimport { ~~loadSession } from \"../../adapters/auth/storage\";\nimport { hasAnyRole } from \"../../helpers/rolesHelper\";\nimport {~~ SolidSpinner } from \"../shad-cn-ui\";\n\nexport const FacebookAuthChecking = () => {\n const searchParams = useSearchParams();\n const accessCode = searchParams.get(\"accessCode\");\n\n const router = useRouter();\n const [error, setError] = useState<string \| null>(null);\n const dispatch = useDispatch();\n\n useEffect(() => {\n const handleOAuthAuthentication = async () => {\n if (!accessCode) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ERROR_MESSAGES.AUTHENICATION__FAILED }));\n setError(ERROR_MESSAGES.AUTHENICATION__FAILED);\n return;\n }\n\n try {\n const response = await signInWithOAuthAccessCode({\n accessCode: accessCode,\n provider: \"facebook\"\n });\n\n if (response?.error) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: response.error }));\n setError(ERROR_MESSAGES.AUTHENICATION__FAILED)\n } else {\n // dispatch(showToast({ severity: \"success\", summary: ERROR_MESSAGES.LOGIN_SUCCESS, detail: ERROR_MESSAGES.DASHBOARD_REDIRECTING }));\n const session = loadSession();\n const isAdmin = hasAnyRole(session?.user?.roles, [\"Admin\"]);\n const isDev = env(\"VITE_SOLIDX_ENV\") === \"dev\";\n const redirectUrl = ~~isAdmin && isDev ? \"/studio\" : (~~env(\"NEXT_PUBLIC_LOGIN_REDIRECT_URL\") \|\| \"/admin\");\n router.push(redirectUrl);\n }\n } catch (err: any) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: err?.data?.message \|\| ERROR_MESSAGES.AUTHENICATION__FAILED }));\n }\n };\n\n handleOAuthAuthentication();\n }, [accessCode, router]);\n\n if (error) {\n return (\n <div className=\"flex items-center justify-center min-h-screen\">\n <h2 className=\"text-red-500 text-xl font-semibold\">{error}</h2>\n </div>\n );\n }\n return (\n <SolidSpinner className=\"flex items-center justify-center min-h-screen\" />\n )\n}\n"]}
1	+ {"version":3,"file":"FacebookAuthChecking.js","sourceRoot":"","sources":["../../../src/components/auth/FacebookAuthChecking.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,CAAC,IAAM,oBAAoB,GAAG;IAChC,IAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,IAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAElD,IAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IACrB,IAAA,KAAoB,QAAQ,CAAgB,IAAI,CAAC,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAC;IACxD,IAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,SAAS,CAAC;QACN,IAAM,yBAAyB,GAAG;;;;;;wBAC9B,IAAI,CAAC,UAAU,EAAE;4BACb,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;4BAC9H,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;4BAC/C,sBAAO;yBACV;;;;wBAGoB,qBAAM,yBAAyB,CAAC;gCAC7C,UAAU,EAAE,UAAU;gCACtB,QAAQ,EAAE,UAAU;6BACvB,CAAC,EAAA;;wBAHI,QAAQ,GAAG,SAGf;wBAEF,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,EAAE;4BACjB,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;4BACxG,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAA;yBACjD;6BAAM;4BAEG,WAAW,GAAG,GAAG,CAAC,gCAAgC,CAAC,IAAI,QAAQ,CAAC;4BACtE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;yBAC5B;;;;wBAED,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,CAAA,MAAA,KAAG,aAAH,KAAG,uBAAH,KAAG,CAAE,IAAI,0CAAE,OAAO,KAAI,cAAc,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;;;;;aAE3J,CAAC;QAEF,yBAAyB,EAAE,CAAC;IAChC,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAEzB,IAAI,KAAK,EAAE;QACP,OAAO,CACH,cAAK,SAAS,EAAC,+CAA+C,YAC1D,aAAI,SAAS,EAAC,oCAAoC,YAAE,KAAK,GAAM,GAC7D,CACT,CAAC;KACL;IACD,OAAO,CACH,KAAC,YAAY,IAAC,SAAS,EAAC,+CAA+C,GAAG,CAC7E,CAAA;AACL,CAAC,CAAA","sourcesContent":["import { ERROR_MESSAGES } from '../../constants/error-messages';\nimport { signInWithOAuthAccessCode } from \"../../adapters/auth/index\";\nimport { useRouter } from \"../../hooks/useRouter\";\nimport { useSearchParams } from \"../../hooks/useSearchParams\";\nimport { useEffect, useState } from 'react'\nimport { useDispatch } from 'react-redux';\nimport { env } from \"../../adapters/env\";\nimport { showToast } from \"../../redux/features/toastSlice\";\nimport { SolidSpinner } from \"../shad-cn-ui\";\n\nexport const FacebookAuthChecking = () => {\n const searchParams = useSearchParams();\n const accessCode = searchParams.get(\"accessCode\");\n\n const router = useRouter();\n const [error, setError] = useState<string \| null>(null);\n const dispatch = useDispatch();\n\n useEffect(() => {\n const handleOAuthAuthentication = async () => {\n if (!accessCode) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ERROR_MESSAGES.AUTHENICATION__FAILED }));\n setError(ERROR_MESSAGES.AUTHENICATION__FAILED);\n return;\n }\n\n try {\n const response = await signInWithOAuthAccessCode({\n accessCode: accessCode,\n provider: \"facebook\"\n });\n\n if (response?.error) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: response.error }));\n setError(ERROR_MESSAGES.AUTHENICATION__FAILED)\n } else {\n // dispatch(showToast({ severity: \"success\", summary: ERROR_MESSAGES.LOGIN_SUCCESS, detail: ERROR_MESSAGES.DASHBOARD_REDIRECTING }));\n const redirectUrl = env(\"NEXT_PUBLIC_LOGIN_REDIRECT_URL\") \|\| \"/admin\";\n router.push(redirectUrl);\n }\n } catch (err: any) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: err?.data?.message \|\| ERROR_MESSAGES.AUTHENICATION__FAILED }));\n }\n };\n\n handleOAuthAuthentication();\n }, [accessCode, router]);\n\n if (error) {\n return (\n <div className=\"flex items-center justify-center min-h-screen\">\n <h2 className=\"text-red-500 text-xl font-semibold\">{error}</h2>\n </div>\n );\n }\n return (\n <SolidSpinner className=\"flex items-center justify-center min-h-screen\" />\n )\n}\n"]}

package/dist/components/auth/FacebookAuthChecking.tsx CHANGED Viewed

@@ -6,8 +6,6 @@ import { useEffect, useState } from 'react'
 import { useDispatch } from 'react-redux';
 import { env } from "../../adapters/env";
 import { showToast } from "../../redux/features/toastSlice";
-import { loadSession } from "../../adapters/auth/storage";
-import { hasAnyRole } from "../../helpers/rolesHelper";
 import { SolidSpinner } from "../shad-cn-ui";
 export const FacebookAuthChecking = () => {
@@ -37,10 +35,7 @@ export const FacebookAuthChecking = () => {
                     setError(ERROR_MESSAGES.AUTHENICATION__FAILED)
                 } else {
                     // dispatch(showToast({ severity: "success", summary: ERROR_MESSAGES.LOGIN_SUCCESS, detail: ERROR_MESSAGES.DASHBOARD_REDIRECTING }));
-                    const session = loadSession();
-                    const isAdmin = hasAnyRole(session?.user?.roles, ["Admin"]);
-                    const isDev = env("VITE_SOLIDX_ENV") === "dev";
-                    const redirectUrl = isAdmin && isDev ? "/studio" : (env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin");
+                    const redirectUrl = env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin";
                     router.push(redirectUrl);
                 }
             } catch (err: any) {

package/dist/components/auth/GoogleAuthChecking.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"GoogleAuthChecking.d.ts","sourceRoot":"","sources":["../../../src/components/auth/GoogleAuthChecking.tsx"],"names":[],"mappings":"~~AAYA~~,eAAO,MAAM,kBAAkB,+~~CAiD9B~~,CAAA"}
1	+ {"version":3,"file":"GoogleAuthChecking.d.ts","sourceRoot":"","sources":["../../../src/components/auth/GoogleAuthChecking.tsx"],"names":[],"mappings":"AAUA,eAAO,MAAM,kBAAkB,+CA8C9B,CAAA"}

package/dist/components/auth/GoogleAuthChecking.js CHANGED Viewed

@@ -43,8 +43,6 @@ import { useEffect, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { env } from "../../adapters/env";
 import { showToast } from "../../redux/features/toastSlice";
-import { loadSession } from "../../adapters/auth/storage";
-import { hasAnyRole } from "../../helpers/rolesHelper";
 import { SolidSpinner } from "../shad-cn-ui";
 export var GoogleAuthChecking = function () {
     var searchParams = useSearchParams();
@@ -54,39 +52,36 @@ export var GoogleAuthChecking = function () {
     var dispatch = useDispatch();
     useEffect(function () {
         var handleOAuthAuthentication = function () { return __awaiter(void 0, void 0, void 0, function () {
-            var response, session, isAdmin, isDev, redirectUrl, err_1;
-            var _a, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var response, redirectUrl, err_1;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (!accessCode) {
                             dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ERROR_MESSAGES.AUTHENICATION__FAILED }));
                             setError(ERROR_MESSAGES.AUTHENICATION__FAILED);
                             return [2 /*return*/];
                         }
-                        _c.label = 1;
+                        _b.label = 1;
                     case 1:
-                        _c.trys.push([1, 3, , 4]);
+                        _b.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, signInWithOAuthAccessCode({
                                 accessCode: accessCode,
                             })];
                     case 2:
-                        response = _c.sent();
+                        response = _b.sent();
                         if (response === null || response === void 0 ? void 0 : response.error) {
                             dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: response.error }));
                             setError(ERROR_MESSAGES.AUTHENICATION__FAILED);
                         }
                         else {
-                            session = loadSession();
-                            isAdmin = hasAnyRole((_a = session === null || session === void 0 ? void 0 : session.user) === null || _a === void 0 ? void 0 : _a.roles, ["Admin"]);
-                            isDev = env("VITE_SOLIDX_ENV") === "dev";
-                            redirectUrl = isAdmin && isDev ? "/studio" : (env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin");
+                            redirectUrl = env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin";
                             router.push(redirectUrl);
                         }
                         return [3 /*break*/, 4];
                     case 3:
-                        err_1 = _c.sent();
-                        dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ((_b = err_1 === null || err_1 === void 0 ? void 0 : err_1.data) === null || _b === void 0 ? void 0 : _b.message) || ERROR_MESSAGES.AUTHENICATION__FAILED }));
+                        err_1 = _b.sent();
+                        dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ((_a = err_1 === null || err_1 === void 0 ? void 0 : err_1.data) === null || _a === void 0 ? void 0 : _a.message) || ERROR_MESSAGES.AUTHENICATION__FAILED }));
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/];
                 }

package/dist/components/auth/GoogleAuthChecking.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"GoogleAuthChecking.js","sourceRoot":"","sources":["../../../src/components/auth/GoogleAuthChecking.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,~~WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,~~YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,CAAC,IAAM,kBAAkB,GAAG;IAC9B,IAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,IAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAElD,IAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IACrB,IAAA,KAAoB,QAAQ,CAAgB,IAAI,CAAC,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAC;IACxD,IAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,SAAS,CAAC;QACN,IAAM,yBAAyB,GAAG;;;;;;wBAC9B,IAAI,CAAC,UAAU,EAAE;4BACb,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;4BAC9H,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;4BAC/C,sBAAO;yBACV;;;;wBAGoB,qBAAM,yBAAyB,CAAC;gCAC7C,UAAU,EAAE,UAAU;6BACzB,CAAC,EAAA;;wBAFI,QAAQ,GAAG,SAEf;wBAEF,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,EAAE;4BACjB,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;4BACxG,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAA;yBACjD;6BAAM;4BAEG,~~OAAO,GAAG,~~WAAW,~~EAAE,CAAC;4BACxB,OAAO,~~GAAG,~~UAAU,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,0CAAE,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;4BACtD,KAAK,~~GAAG,~~GAAG,~~CAAC,~~iBAAiB,CAAC,KAAK,KAAK,CAAC;4BACzC,WAAW,GAAG,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,~~gCAAgC,CAAC,IAAI,QAAQ,CAAC~~,CAAC~~;~~4BACvG~~,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;yBAC5B;;;;wBAED,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,CAAA,MAAA,KAAG,aAAH,KAAG,uBAAH,KAAG,CAAE,IAAI,0CAAE,OAAO,KAAI,cAAc,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;;;;;aAE3J,CAAC;QAEF,yBAAyB,EAAE,CAAC;IAChC,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAEzB,IAAI,KAAK,EAAE;QACP,OAAO,CACH,cAAK,SAAS,EAAC,+CAA+C,YAC1D,aAAI,SAAS,EAAC,oCAAoC,YAAE,KAAK,GAAM,GAC7D,CACT,CAAC;KACL;IACD,OAAO,CACH,KAAC,YAAY,IAAC,SAAS,EAAC,+CAA+C,GAAG,CAC7E,CAAA;AACL,CAAC,CAAA","sourcesContent":["import { ERROR_MESSAGES } from '../../constants/error-messages';\nimport { signInWithOAuthAccessCode } from \"../../adapters/auth/index\";\nimport { useRouter } from \"../../hooks/useRouter\";\nimport { useSearchParams } from \"../../hooks/useSearchParams\";\nimport { useEffect, useState } from 'react'\nimport { useDispatch } from 'react-redux';\nimport { env } from \"../../adapters/env\";\nimport { showToast } from \"../../redux/features/toastSlice\";\nimport { ~~loadSession } from \"../../adapters/auth/storage\";\nimport { hasAnyRole } from \"../../helpers/rolesHelper\";\nimport {~~ SolidSpinner } from \"../shad-cn-ui\";\n\nexport const GoogleAuthChecking = () => {\n const searchParams = useSearchParams();\n const accessCode = searchParams.get(\"accessCode\");\n\n const router = useRouter();\n const [error, setError] = useState<string \| null>(null);\n const dispatch = useDispatch();\n useEffect(() => {\n const handleOAuthAuthentication = async () => {\n if (!accessCode) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ERROR_MESSAGES.AUTHENICATION__FAILED }));\n setError(ERROR_MESSAGES.AUTHENICATION__FAILED);\n return;\n }\n\n try {\n const response = await signInWithOAuthAccessCode({\n accessCode: accessCode,\n });\n\n if (response?.error) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: response.error }));\n setError(ERROR_MESSAGES.AUTHENICATION__FAILED)\n } else {\n // dispatch(showToast({ severity: \"success\", summary: ERROR_MESSAGES.LOGIN_SUCCESS, detail: ERROR_MESSAGES.DASHBOARD_REDIRECTING }));\n const session = loadSession();\n const isAdmin = hasAnyRole(session?.user?.roles, [\"Admin\"]);\n const isDev = env(\"VITE_SOLIDX_ENV\") === \"dev\";\n const redirectUrl = ~~isAdmin && isDev ? \"/studio\" : (~~env(\"NEXT_PUBLIC_LOGIN_REDIRECT_URL\") \|\| \"/admin\");\n router.push(redirectUrl);\n }\n } catch (err: any) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: err?.data?.message \|\| ERROR_MESSAGES.AUTHENICATION__FAILED }));\n }\n };\n\n handleOAuthAuthentication();\n }, [accessCode, router]);\n\n if (error) {\n return (\n <div className=\"flex items-center justify-center min-h-screen\">\n <h2 className=\"text-red-500 text-xl font-semibold\">{error}</h2>\n </div>\n );\n }\n return (\n <SolidSpinner className=\"flex items-center justify-center min-h-screen\" />\n )\n}\n"]}
1	+ {"version":3,"file":"GoogleAuthChecking.js","sourceRoot":"","sources":["../../../src/components/auth/GoogleAuthChecking.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,CAAC,IAAM,kBAAkB,GAAG;IAC9B,IAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,IAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAElD,IAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IACrB,IAAA,KAAoB,QAAQ,CAAgB,IAAI,CAAC,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAC;IACxD,IAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,SAAS,CAAC;QACN,IAAM,yBAAyB,GAAG;;;;;;wBAC9B,IAAI,CAAC,UAAU,EAAE;4BACb,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;4BAC9H,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;4BAC/C,sBAAO;yBACV;;;;wBAGoB,qBAAM,yBAAyB,CAAC;gCAC7C,UAAU,EAAE,UAAU;6BACzB,CAAC,EAAA;;wBAFI,QAAQ,GAAG,SAEf;wBAEF,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,EAAE;4BACjB,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;4BACxG,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAA;yBACjD;6BAAM;4BAEG,WAAW,GAAG,GAAG,CAAC,gCAAgC,CAAC,IAAI,QAAQ,CAAC;4BACtE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;yBAC5B;;;;wBAED,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,CAAA,MAAA,KAAG,aAAH,KAAG,uBAAH,KAAG,CAAE,IAAI,0CAAE,OAAO,KAAI,cAAc,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;;;;;aAE3J,CAAC;QAEF,yBAAyB,EAAE,CAAC;IAChC,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAEzB,IAAI,KAAK,EAAE;QACP,OAAO,CACH,cAAK,SAAS,EAAC,+CAA+C,YAC1D,aAAI,SAAS,EAAC,oCAAoC,YAAE,KAAK,GAAM,GAC7D,CACT,CAAC;KACL;IACD,OAAO,CACH,KAAC,YAAY,IAAC,SAAS,EAAC,+CAA+C,GAAG,CAC7E,CAAA;AACL,CAAC,CAAA","sourcesContent":["import { ERROR_MESSAGES } from '../../constants/error-messages';\nimport { signInWithOAuthAccessCode } from \"../../adapters/auth/index\";\nimport { useRouter } from \"../../hooks/useRouter\";\nimport { useSearchParams } from \"../../hooks/useSearchParams\";\nimport { useEffect, useState } from 'react'\nimport { useDispatch } from 'react-redux';\nimport { env } from \"../../adapters/env\";\nimport { showToast } from \"../../redux/features/toastSlice\";\nimport { SolidSpinner } from \"../shad-cn-ui\";\n\nexport const GoogleAuthChecking = () => {\n const searchParams = useSearchParams();\n const accessCode = searchParams.get(\"accessCode\");\n\n const router = useRouter();\n const [error, setError] = useState<string \| null>(null);\n const dispatch = useDispatch();\n useEffect(() => {\n const handleOAuthAuthentication = async () => {\n if (!accessCode) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ERROR_MESSAGES.AUTHENICATION__FAILED }));\n setError(ERROR_MESSAGES.AUTHENICATION__FAILED);\n return;\n }\n\n try {\n const response = await signInWithOAuthAccessCode({\n accessCode: accessCode,\n });\n\n if (response?.error) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: response.error }));\n setError(ERROR_MESSAGES.AUTHENICATION__FAILED)\n } else {\n // dispatch(showToast({ severity: \"success\", summary: ERROR_MESSAGES.LOGIN_SUCCESS, detail: ERROR_MESSAGES.DASHBOARD_REDIRECTING }));\n const redirectUrl = env(\"NEXT_PUBLIC_LOGIN_REDIRECT_URL\") \|\| \"/admin\";\n router.push(redirectUrl);\n }\n } catch (err: any) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: err?.data?.message \|\| ERROR_MESSAGES.AUTHENICATION__FAILED }));\n }\n };\n\n handleOAuthAuthentication();\n }, [accessCode, router]);\n\n if (error) {\n return (\n <div className=\"flex items-center justify-center min-h-screen\">\n <h2 className=\"text-red-500 text-xl font-semibold\">{error}</h2>\n </div>\n );\n }\n return (\n <SolidSpinner className=\"flex items-center justify-center min-h-screen\" />\n )\n}\n"]}

package/dist/components/auth/GoogleAuthChecking.tsx CHANGED Viewed

@@ -6,8 +6,6 @@ import { useEffect, useState } from 'react'
 import { useDispatch } from 'react-redux';
 import { env } from "../../adapters/env";
 import { showToast } from "../../redux/features/toastSlice";
-import { loadSession } from "../../adapters/auth/storage";
-import { hasAnyRole } from "../../helpers/rolesHelper";
 import { SolidSpinner } from "../shad-cn-ui";
 export const GoogleAuthChecking = () => {
@@ -35,10 +33,7 @@ export const GoogleAuthChecking = () => {
                     setError(ERROR_MESSAGES.AUTHENICATION__FAILED)
                 } else {
                     // dispatch(showToast({ severity: "success", summary: ERROR_MESSAGES.LOGIN_SUCCESS, detail: ERROR_MESSAGES.DASHBOARD_REDIRECTING }));
-                    const session = loadSession();
-                    const isAdmin = hasAnyRole(session?.user?.roles, ["Admin"]);
-                    const isDev = env("VITE_SOLIDX_ENV") === "dev";
-                    const redirectUrl = isAdmin && isDev ? "/studio" : (env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin");
+                    const redirectUrl = env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin";
                     router.push(redirectUrl);
                 }
             } catch (err: any) {

package/dist/components/auth/MicrosoftAuthChecking.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MicrosoftAuthChecking.d.ts","sourceRoot":"","sources":["../../../src/components/auth/MicrosoftAuthChecking.tsx"],"names":[],"mappings":"~~AAYA~~,eAAO,MAAM,qBAAqB,+~~CAmDjC~~,CAAA"}
1	+ {"version":3,"file":"MicrosoftAuthChecking.d.ts","sourceRoot":"","sources":["../../../src/components/auth/MicrosoftAuthChecking.tsx"],"names":[],"mappings":"AAUA,eAAO,MAAM,qBAAqB,+CAgDjC,CAAA"}

package/dist/components/auth/MicrosoftAuthChecking.js CHANGED Viewed

@@ -43,8 +43,6 @@ import { useEffect, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { env } from "../../adapters/env";
 import { showToast } from "../../redux/features/toastSlice";
-import { loadSession } from "../../adapters/auth/storage";
-import { hasAnyRole } from "../../helpers/rolesHelper";
 import { SolidSpinner } from "../shad-cn-ui";
 export var MicrosoftAuthChecking = function () {
     var searchParams = useSearchParams();
@@ -54,40 +52,37 @@ export var MicrosoftAuthChecking = function () {
     var dispatch = useDispatch();
     useEffect(function () {
         var handleOAuthAuthentication = function () { return __awaiter(void 0, void 0, void 0, function () {
-            var response, session, isAdmin, isDev, redirectUrl, err_1;
-            var _a, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var response, redirectUrl, err_1;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (!accessCode) {
                             dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ERROR_MESSAGES.AUTHENICATION__FAILED }));
                             setError(ERROR_MESSAGES.AUTHENICATION__FAILED);
                             return [2 /*return*/];
                         }
-                        _c.label = 1;
+                        _b.label = 1;
                     case 1:
-                        _c.trys.push([1, 3, , 4]);
+                        _b.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, signInWithOAuthAccessCode({
                                 accessCode: accessCode,
                                 provider: "microsoft"
                             })];
                     case 2:
-                        response = _c.sent();
+                        response = _b.sent();
                         if (response === null || response === void 0 ? void 0 : response.error) {
                             dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: response.error }));
                             setError(ERROR_MESSAGES.AUTHENICATION__FAILED);
                         }
                         else {
-                            session = loadSession();
-                            isAdmin = hasAnyRole((_a = session === null || session === void 0 ? void 0 : session.user) === null || _a === void 0 ? void 0 : _a.roles, ["Admin"]);
-                            isDev = env("VITE_SOLIDX_ENV") === "dev";
-                            redirectUrl = isAdmin && isDev ? "/studio" : (env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin");
+                            redirectUrl = env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin";
                             router.push(redirectUrl);
                         }
                         return [3 /*break*/, 4];
                     case 3:
-                        err_1 = _c.sent();
-                        dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ((_b = err_1 === null || err_1 === void 0 ? void 0 : err_1.data) === null || _b === void 0 ? void 0 : _b.message) || ERROR_MESSAGES.AUTHENICATION__FAILED }));
+                        err_1 = _b.sent();
+                        dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ((_a = err_1 === null || err_1 === void 0 ? void 0 : err_1.data) === null || _a === void 0 ? void 0 : _a.message) || ERROR_MESSAGES.AUTHENICATION__FAILED }));
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/];
                 }

package/dist/components/auth/MicrosoftAuthChecking.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MicrosoftAuthChecking.js","sourceRoot":"","sources":["../../../src/components/auth/MicrosoftAuthChecking.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,~~WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,~~YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,CAAC,IAAM,qBAAqB,GAAG;IACjC,IAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,IAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAElD,IAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IACrB,IAAA,KAAoB,QAAQ,CAAgB,IAAI,CAAC,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAC;IACxD,IAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,SAAS,CAAC;QACN,IAAM,yBAAyB,GAAG;;;;;;wBAC9B,IAAI,CAAC,UAAU,EAAE;4BACb,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;4BAC9H,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;4BAC/C,sBAAO;yBACV;;;;wBAGoB,qBAAM,yBAAyB,CAAC;gCAC7C,UAAU,EAAE,UAAU;gCACtB,QAAQ,EAAE,WAAW;6BACxB,CAAC,EAAA;;wBAHI,QAAQ,GAAG,SAGf;wBAEF,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,EAAE;4BACjB,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;4BACxG,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAA;yBACjD;6BAAM;4BAEG,~~OAAO,GAAG,~~WAAW,~~EAAE,CAAC;4BACxB,OAAO,~~GAAG,~~UAAU,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,0CAAE,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;4BACtD,KAAK,~~GAAG,~~GAAG,~~CAAC,~~iBAAiB,CAAC,KAAK,KAAK,CAAC;4BACzC,WAAW,GAAG,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,~~gCAAgC,CAAC,IAAI,QAAQ,CAAC~~,CAAC~~;~~4BACvG~~,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;yBAC5B;;;;wBAED,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,CAAA,MAAA,KAAG,aAAH,KAAG,uBAAH,KAAG,CAAE,IAAI,0CAAE,OAAO,KAAI,cAAc,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;;;;;aAE3J,CAAC;QAEF,yBAAyB,EAAE,CAAC;IAChC,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAEzB,IAAI,KAAK,EAAE;QACP,OAAO,CACH,cAAK,SAAS,EAAC,+CAA+C,YAC1D,aAAI,SAAS,EAAC,oCAAoC,YAAE,KAAK,GAAM,GAC7D,CACT,CAAC;KACL;IACD,OAAO,CACH,KAAC,YAAY,IAAC,SAAS,EAAC,+CAA+C,GAAG,CAC7E,CAAA;AACL,CAAC,CAAA","sourcesContent":["import { ERROR_MESSAGES } from '../../constants/error-messages';\nimport { signInWithOAuthAccessCode } from \"../../adapters/auth/index\";\nimport { useRouter } from \"../../hooks/useRouter\";\nimport { useSearchParams } from \"../../hooks/useSearchParams\";\nimport { useEffect, useState } from 'react'\nimport { useDispatch } from 'react-redux';\nimport { env } from \"../../adapters/env\";\nimport { showToast } from \"../../redux/features/toastSlice\";\nimport { ~~loadSession } from \"../../adapters/auth/storage\";\nimport { hasAnyRole } from \"../../helpers/rolesHelper\";\nimport {~~ SolidSpinner } from \"../shad-cn-ui\";\n\nexport const MicrosoftAuthChecking = () => {\n const searchParams = useSearchParams();\n const accessCode = searchParams.get(\"accessCode\");\n\n const router = useRouter();\n const [error, setError] = useState<string \| null>(null);\n const dispatch = useDispatch();\n\n useEffect(() => {\n const handleOAuthAuthentication = async () => {\n if (!accessCode) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ERROR_MESSAGES.AUTHENICATION__FAILED }));\n setError(ERROR_MESSAGES.AUTHENICATION__FAILED);\n return;\n }\n\n try {\n const response = await signInWithOAuthAccessCode({\n accessCode: accessCode,\n provider: \"microsoft\"\n });\n\n if (response?.error) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: response.error }));\n setError(ERROR_MESSAGES.AUTHENICATION__FAILED)\n } else {\n // dispatch(showToast({ severity: \"success\", summary: ERROR_MESSAGES.LOGIN_SUCCESS, detail: ERROR_MESSAGES.DASHBOARD_REDIRECTING }));\n const session = loadSession();\n const isAdmin = hasAnyRole(session?.user?.roles, [\"Admin\"]);\n const isDev = env(\"VITE_SOLIDX_ENV\") === \"dev\";\n const redirectUrl = ~~isAdmin && isDev ? \"/studio\" : (~~env(\"NEXT_PUBLIC_LOGIN_REDIRECT_URL\") \|\| \"/admin\");\n router.push(redirectUrl);\n }\n } catch (err: any) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: err?.data?.message \|\| ERROR_MESSAGES.AUTHENICATION__FAILED }));\n }\n };\n\n handleOAuthAuthentication();\n }, [accessCode, router]);\n\n if (error) {\n return (\n <div className=\"flex items-center justify-center min-h-screen\">\n <h2 className=\"text-red-500 text-xl font-semibold\">{error}</h2>\n </div>\n );\n }\n return (\n <SolidSpinner className=\"flex items-center justify-center min-h-screen\" />\n )\n}\n"]}
1	+ {"version":3,"file":"MicrosoftAuthChecking.js","sourceRoot":"","sources":["../../../src/components/auth/MicrosoftAuthChecking.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,CAAC,IAAM,qBAAqB,GAAG;IACjC,IAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,IAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAElD,IAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IACrB,IAAA,KAAoB,QAAQ,CAAgB,IAAI,CAAC,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAC;IACxD,IAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,SAAS,CAAC;QACN,IAAM,yBAAyB,GAAG;;;;;;wBAC9B,IAAI,CAAC,UAAU,EAAE;4BACb,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;4BAC9H,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;4BAC/C,sBAAO;yBACV;;;;wBAGoB,qBAAM,yBAAyB,CAAC;gCAC7C,UAAU,EAAE,UAAU;gCACtB,QAAQ,EAAE,WAAW;6BACxB,CAAC,EAAA;;wBAHI,QAAQ,GAAG,SAGf;wBAEF,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,EAAE;4BACjB,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;4BACxG,QAAQ,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAA;yBACjD;6BAAM;4BAEG,WAAW,GAAG,GAAG,CAAC,gCAAgC,CAAC,IAAI,QAAQ,CAAC;4BACtE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;yBAC5B;;;;wBAED,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,CAAA,MAAA,KAAG,aAAH,KAAG,uBAAH,KAAG,CAAE,IAAI,0CAAE,OAAO,KAAI,cAAc,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;;;;;aAE3J,CAAC;QAEF,yBAAyB,EAAE,CAAC;IAChC,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAEzB,IAAI,KAAK,EAAE;QACP,OAAO,CACH,cAAK,SAAS,EAAC,+CAA+C,YAC1D,aAAI,SAAS,EAAC,oCAAoC,YAAE,KAAK,GAAM,GAC7D,CACT,CAAC;KACL;IACD,OAAO,CACH,KAAC,YAAY,IAAC,SAAS,EAAC,+CAA+C,GAAG,CAC7E,CAAA;AACL,CAAC,CAAA","sourcesContent":["import { ERROR_MESSAGES } from '../../constants/error-messages';\nimport { signInWithOAuthAccessCode } from \"../../adapters/auth/index\";\nimport { useRouter } from \"../../hooks/useRouter\";\nimport { useSearchParams } from \"../../hooks/useSearchParams\";\nimport { useEffect, useState } from 'react'\nimport { useDispatch } from 'react-redux';\nimport { env } from \"../../adapters/env\";\nimport { showToast } from \"../../redux/features/toastSlice\";\nimport { SolidSpinner } from \"../shad-cn-ui\";\n\nexport const MicrosoftAuthChecking = () => {\n const searchParams = useSearchParams();\n const accessCode = searchParams.get(\"accessCode\");\n\n const router = useRouter();\n const [error, setError] = useState<string \| null>(null);\n const dispatch = useDispatch();\n\n useEffect(() => {\n const handleOAuthAuthentication = async () => {\n if (!accessCode) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: ERROR_MESSAGES.AUTHENICATION__FAILED }));\n setError(ERROR_MESSAGES.AUTHENICATION__FAILED);\n return;\n }\n\n try {\n const response = await signInWithOAuthAccessCode({\n accessCode: accessCode,\n provider: \"microsoft\"\n });\n\n if (response?.error) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: response.error }));\n setError(ERROR_MESSAGES.AUTHENICATION__FAILED)\n } else {\n // dispatch(showToast({ severity: \"success\", summary: ERROR_MESSAGES.LOGIN_SUCCESS, detail: ERROR_MESSAGES.DASHBOARD_REDIRECTING }));\n const redirectUrl = env(\"NEXT_PUBLIC_LOGIN_REDIRECT_URL\") \|\| \"/admin\";\n router.push(redirectUrl);\n }\n } catch (err: any) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: err?.data?.message \|\| ERROR_MESSAGES.AUTHENICATION__FAILED }));\n }\n };\n\n handleOAuthAuthentication();\n }, [accessCode, router]);\n\n if (error) {\n return (\n <div className=\"flex items-center justify-center min-h-screen\">\n <h2 className=\"text-red-500 text-xl font-semibold\">{error}</h2>\n </div>\n );\n }\n return (\n <SolidSpinner className=\"flex items-center justify-center min-h-screen\" />\n )\n}\n"]}

package/dist/components/auth/MicrosoftAuthChecking.tsx CHANGED Viewed

@@ -6,8 +6,6 @@ import { useEffect, useState } from 'react'
 import { useDispatch } from 'react-redux';
 import { env } from "../../adapters/env";
 import { showToast } from "../../redux/features/toastSlice";
-import { loadSession } from "../../adapters/auth/storage";
-import { hasAnyRole } from "../../helpers/rolesHelper";
 import { SolidSpinner } from "../shad-cn-ui";
 export const MicrosoftAuthChecking = () => {
@@ -37,10 +35,7 @@ export const MicrosoftAuthChecking = () => {
                     setError(ERROR_MESSAGES.AUTHENICATION__FAILED)
                 } else {
                     // dispatch(showToast({ severity: "success", summary: ERROR_MESSAGES.LOGIN_SUCCESS, detail: ERROR_MESSAGES.DASHBOARD_REDIRECTING }));
-                    const session = loadSession();
-                    const isAdmin = hasAnyRole(session?.user?.roles, ["Admin"]);
-                    const isDev = env("VITE_SOLIDX_ENV") === "dev";
-                    const redirectUrl = isAdmin && isDev ? "/studio" : (env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin");
+                    const redirectUrl = env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin";
                     router.push(redirectUrl);
                 }
             } catch (err: any) {

package/dist/components/auth/SolidInitialLoginOtp.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SolidInitialLoginOtp.d.ts","sourceRoot":"","sources":["../../../src/components/auth/SolidInitialLoginOtp.tsx"],"names":[],"mappings":"~~AAiBA~~,QAAA,MAAM,oBAAoB,+~~CAsNzB~~,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
1	+ {"version":3,"file":"SolidInitialLoginOtp.d.ts","sourceRoot":"","sources":["../../../src/components/auth/SolidInitialLoginOtp.tsx"],"names":[],"mappings":"AAeA,QAAA,MAAM,oBAAoB,+CAmNzB,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/dist/components/auth/SolidInitialLoginOtp.js CHANGED Viewed

@@ -47,8 +47,6 @@ import { ERROR_MESSAGES } from "../../constants/error-messages";
 import { env } from "../../adapters/env";
 import { showToast } from "../../redux/features/toastSlice";
 import { SolidButton, SolidIcon, SolidMessage, SolidOtpInput } from "../shad-cn-ui";
-import { loadSession } from "../../adapters/auth/storage";
-import { hasAnyRole } from "../../helpers/rolesHelper";
 import { useAuthSettings } from "./AuthSettingsContext";
 var SolidInitialLoginOtp = function () {
     var _a;
@@ -159,19 +157,19 @@ var SolidInitialLoginOtp = function () {
                         }, validationSchema: validationSchema, onSubmit: function (values, _a) {
                             var setSubmitting = _a.setSubmitting, setErrors = _a.setErrors;
                             return __awaiter(void 0, void 0, void 0, function () {
-                                var response, session, isAdmin, isDev, redirectUrl, err_2;
-                                var _b, _c;
-                                return __generator(this, function (_d) {
-                                    switch (_d.label) {
+                                var response, redirectUrl, err_2;
+                                var _b;
+                                return __generator(this, function (_c) {
+                                    switch (_c.label) {
                                         case 0:
-                                            _d.trys.push([0, 2, 3, 4]);
+                                            _c.trys.push([0, 2, 3, 4]);
                                             return [4 /*yield*/, signInWithOtp({
                                                     type: type,
                                                     identifier: identifier,
                                                     otp: values.otp,
                                                 })];
                                         case 1:
-                                            response = _d.sent();
+                                            response = _c.sent();
                                             if (response === null || response === void 0 ? void 0 : response.error) {
                                                 dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.INAVLID_OTP, detail: response.error }));
                                                 setErrors({
@@ -180,16 +178,13 @@ var SolidInitialLoginOtp = function () {
                                             }
                                             else {
                                                 localStorage.removeItem("resendOtpLogin_".concat(identifier));
-                                                session = loadSession();
-                                                isAdmin = hasAnyRole((_b = session === null || session === void 0 ? void 0 : session.user) === null || _b === void 0 ? void 0 : _b.roles, ["Admin"]);
-                                                isDev = env("VITE_SOLIDX_ENV") === "dev";
-                                                redirectUrl = isAdmin && isDev ? "/studio" : (env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin");
+                                                redirectUrl = env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin";
                                                 router.push(redirectUrl);
                                             }
                                             return [3 /*break*/, 4];
                                         case 2:
-                                            err_2 = _d.sent();
-                                            dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: (err_2 === null || err_2 === void 0 ? void 0 : err_2.data) ? (_c = err_2 === null || err_2 === void 0 ? void 0 : err_2.data) === null || _c === void 0 ? void 0 : _c.message : ERROR_MESSAGES.SOMETHING_WRONG }));
+                                            err_2 = _c.sent();
+                                            dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: (err_2 === null || err_2 === void 0 ? void 0 : err_2.data) ? (_b = err_2 === null || err_2 === void 0 ? void 0 : err_2.data) === null || _b === void 0 ? void 0 : _b.message : ERROR_MESSAGES.SOMETHING_WRONG }));
                                             return [3 /*break*/, 4];
                                         case 3:
                                             setSubmitting(false);

package/dist/components/auth/SolidInitialLoginOtp.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SolidInitialLoginOtp.js","sourceRoot":"","sources":["../../../src/components/auth/SolidInitialLoginOtp.tsx"],"names":[],"mappings":"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","sourcesContent":["import { useInitateLoginMutation } from \"../../redux/api/authApi\";\nimport { Form, Formik } from \"formik\";\nimport { useRouter } from \"../../hooks/useRouter\";\nimport { useSearchParams } from \"../../hooks/useSearchParams\";\nimport { useEffect, useState } from \"react\";\nimport { useDispatch } from 'react-redux';\nimport * as Yup from \"yup\";\nimport { signInWithOtp } from \"../../adapters/auth/index\";\nimport { ERROR_MESSAGES } from \"../../constants/error-messages\";\nimport { env } from \"../../adapters/env\";\nimport { showToast } from \"../../redux/features/toastSlice\";\nimport { SolidButton, SolidIcon, SolidMessage, SolidOtpInput } from \"../shad-cn-ui\";\nimport { loadSession } from \"../../adapters/auth/storage\";\nimport { hasAnyRole } from \"../../helpers/rolesHelper\";\nimport { useAuthSettings } from \"./AuthSettingsContext\";\n\n\nconst SolidInitialLoginOtp = () => {\n const searchParams = useSearchParams();\n const tempIdentifier = searchParams.get('identifier');\n const type = searchParams.get('type') \|\| 'email';\n const identifier = tempIdentifier ? decodeURIComponent(tempIdentifier) : '';\n\n const RESEND_OTP_KEY = `resendOtpLogin_${identifier}`;\n const RESEND_OTP_TIMER_MIN = parseFloat(env(\"NEXT_PUBLIC_RESEND_OTP_TIMER\") \|\| '0.5');\n const RESEND_OTP_TIMER = Math.round(RESEND_OTP_TIMER_MIN * 60);\n const { solidSettingsData } = useAuthSettings();\n\n const [initiateResendOTP] = useInitateLoginMutation();\n const dispatch = useDispatch();\n const router = useRouter();\n const [timeLeft, setTimeLeft] = useState(RESEND_OTP_TIMER);\n const [resendEnabled, setResendEnabled] = useState(false);\n\n const getDisplayText = () => {\n switch (type) {\n case \"mobile\":\n return {\n title: \"OTP Verification\",\n subtitle: \"Please enter the OTP sent to your mobile number to complete verification\"\n };\n case \"email\":\n default:\n return {\n title: \"OTP Verification\",\n subtitle: \"Please enter the OTP sent to your email to complete verification\"\n };\n }\n };\n\n const displayText = getDisplayText();\n\n useEffect(() => {\n\n // Set timer if not already set (e.g., after login)\n const storedTime = localStorage.getItem(RESEND_OTP_KEY);\n if (!storedTime) {\n localStorage.setItem(RESEND_OTP_KEY, Date.now().toString());\n }\n\n const lastSent = storedTime ? parseInt(storedTime, 10) : Date.now();\n const elapsed = Math.floor((Date.now() - lastSent) / 1000);\n const remaining = RESEND_OTP_TIMER - elapsed;\n\n if (remaining > 0) {\n setTimeLeft(remaining);\n setResendEnabled(false);\n } else {\n setTimeLeft(0);\n setResendEnabled(true);\n }\n }, [identifier]);\n\n useEffect(() => {\n if (resendEnabled \|\| timeLeft <= 0) return;\n\n const interval = setInterval(() => {\n setTimeLeft((prev) => {\n if (prev <= 1) {\n clearInterval(interval);\n setResendEnabled(true);\n return 0;\n }\n return prev - 1;\n });\n }, 1000);\n\n return () => clearInterval(interval);\n }, [resendEnabled, timeLeft]);\n\n const validationSchema = Yup.object({\n otp: Yup.string()\n .matches(/^\\d{6}$/, ERROR_MESSAGES.OTP_CHARACTER(6))\n .required(ERROR_MESSAGES.FIELD_REUQIRED('OTP')),\n });\n\n const isFormFieldValid = (formik: any, fieldName: string) =>\n formik.touched[fieldName] && formik.errors[fieldName];\n\n\n const handleResendOtp = async () => {\n try {\n const payload = {\n type: type,\n identifier: identifier,\n };\n\n const response = await initiateResendOTP(payload).unwrap();\n\n if (response?.statusCode === 200) {\n dispatch(showToast({ severity: \"success\", summary: ERROR_MESSAGES.OPT_RESEND, detail: response?.data?.message }));\n localStorage.setItem(RESEND_OTP_KEY, Date.now().toString());\n setTimeLeft(RESEND_OTP_TIMER);\n setResendEnabled(false);\n } else {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: response.error }));\n }\n } catch (err: any) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: err?.data?.message \|\| ERROR_MESSAGES.SOMETHING_WRONG }));\n }\n };\n\n return (\n <>\n\n <div className={`auth-container ${solidSettingsData?.data?.authPagesLayout === 'center' ? 'center' : 'side'}`}>\n <h2 className=\"solid-auth-title\">{displayText.title}</h2>\n <p className=\"solid-auth-helper\">\n {displayText.subtitle}{\" \"}\n <span className=\"solid-auth-helper-emphasis\">{identifier}</span>\n </p>\n <>\n <Formik\n initialValues={{\n otp: \"\",\n }}\n validationSchema={validationSchema}\n onSubmit={async (values, { setSubmitting, setErrors }) => {\n try {\n const response = await signInWithOtp({\n type: type,\n identifier: identifier,\n otp: values.otp,\n });\n\n if (response?.error) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.INAVLID_OTP, detail: response.error }));\n setErrors({\n otp: ERROR_MESSAGES.INAVLID_OTP,\n });\n } else {\n localStorage.removeItem(`resendOtpLogin_${identifier}`);\n // dispatch(showToast({ severity: \"success\", summary: ERROR_MESSAGES.LOGIN_SUCCESS, detail: ERROR_MESSAGES.DASHBOARD_REDIRECTING }));\n const session = loadSession();\n const isAdmin = hasAnyRole(session?.user?.roles, [\"Admin\"]);\n const isDev = env(\"VITE_SOLIDX_ENV\") === \"dev\";\n const redirectUrl = isAdmin && isDev ? \"/studio\" : (env(\"NEXT_PUBLIC_LOGIN_REDIRECT_URL\") \|\| \"/admin\");\n router.push(redirectUrl);\n }\n } catch (err: any) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: err?.data ? err?.data?.message : ERROR_MESSAGES.SOMETHING_WRONG }));\n } finally {\n setSubmitting(false);\n }\n }}\n >\n {(formik) => (\n <Form>\n <div className=\"solid-auth-otp-field\">\n <div className=\"solid-auth-otp-top\">\n <label htmlFor=\"otp\" className=\"solid-auth-input-label\">Verification code</label>\n <SolidButton\n type=\"button\"\n variant=\"outline\"\n size=\"sm\"\n className=\"solid-auth-otp-resend\"\n onClick={handleResendOtp}\n disabled={!resendEnabled}\n leftIcon={<SolidIcon name=\"si-refresh\" aria-hidden />}\n >\n Resend code\n </SolidButton>\n </div>\n <SolidOtpInput\n id=\"otp\"\n className=\"solid-auth-otp-input\"\n value={formik.values.otp}\n onChange={(nextValue) => formik.setFieldValue(\"otp\", nextValue)}\n length={6}\n integerOnly\n invalid={!!formik.errors.otp}\n />\n {isFormFieldValid(formik, \"otp\") && (\n <SolidMessage className=\"text-red-500 text-sm\" severity=\"error\" text={formik.errors.otp?.toString()} />\n )}\n <p className=\"solid-auth-otp-time\">\n {resendEnabled\n ? \"You can resend now.\"\n : `Time left: ${Math.floor(timeLeft / 60)\n .toString()\n .padStart(2, \"0\")}:${(timeLeft % 60).toString().padStart(2, \"0\")}`}\n </p>\n </div>\n <div className=\"mt-4\">\n <SolidButton\n type=\"submit\"\n className=\"w-full font-light auth-submit-button\"\n label=\"Verify\"\n disabled={formik.isSubmitting}\n loading={formik.isSubmitting}\n />\n <SolidButton\n type=\"button\"\n label=\"Back\"\n className=\"w-full auth-back-button text-center mt-1\"\n text\n onClick={() => (window.location.href = '/auth/login')}\n />\n </div>\n </Form>\n )}\n </Formik>\n </>\n </div>\n {/* <div className=\"text-center mt-5\">\n <div className=\"text-sm text-400 secondary-dark-color\">\n {'<'} Back to <Link className=\"font-bold\" href=\"/auth/login\">Back</Link>\n </div>\n </div> */}\n </>\n );\n};\n\nexport default SolidInitialLoginOtp;\n"]}
1	+ {"version":3,"file":"SolidInitialLoginOtp.js","sourceRoot":"","sources":["../../../src/components/auth/SolidInitialLoginOtp.tsx"],"names":[],"mappings":"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","sourcesContent":["import { useInitateLoginMutation } from \"../../redux/api/authApi\";\nimport { Form, Formik } from \"formik\";\nimport { useRouter } from \"../../hooks/useRouter\";\nimport { useSearchParams } from \"../../hooks/useSearchParams\";\nimport { useEffect, useState } from \"react\";\nimport { useDispatch } from 'react-redux';\nimport * as Yup from \"yup\";\nimport { signInWithOtp } from \"../../adapters/auth/index\";\nimport { ERROR_MESSAGES } from \"../../constants/error-messages\";\nimport { env } from \"../../adapters/env\";\nimport { showToast } from \"../../redux/features/toastSlice\";\nimport { SolidButton, SolidIcon, SolidMessage, SolidOtpInput } from \"../shad-cn-ui\";\nimport { useAuthSettings } from \"./AuthSettingsContext\";\n\n\nconst SolidInitialLoginOtp = () => {\n const searchParams = useSearchParams();\n const tempIdentifier = searchParams.get('identifier');\n const type = searchParams.get('type') \|\| 'email';\n const identifier = tempIdentifier ? decodeURIComponent(tempIdentifier) : '';\n\n const RESEND_OTP_KEY = `resendOtpLogin_${identifier}`;\n const RESEND_OTP_TIMER_MIN = parseFloat(env(\"NEXT_PUBLIC_RESEND_OTP_TIMER\") \|\| '0.5');\n const RESEND_OTP_TIMER = Math.round(RESEND_OTP_TIMER_MIN * 60);\n const { solidSettingsData } = useAuthSettings();\n\n const [initiateResendOTP] = useInitateLoginMutation();\n const dispatch = useDispatch();\n const router = useRouter();\n const [timeLeft, setTimeLeft] = useState(RESEND_OTP_TIMER);\n const [resendEnabled, setResendEnabled] = useState(false);\n\n const getDisplayText = () => {\n switch (type) {\n case \"mobile\":\n return {\n title: \"OTP Verification\",\n subtitle: \"Please enter the OTP sent to your mobile number to complete verification\"\n };\n case \"email\":\n default:\n return {\n title: \"OTP Verification\",\n subtitle: \"Please enter the OTP sent to your email to complete verification\"\n };\n }\n };\n\n const displayText = getDisplayText();\n\n useEffect(() => {\n\n // Set timer if not already set (e.g., after login)\n const storedTime = localStorage.getItem(RESEND_OTP_KEY);\n if (!storedTime) {\n localStorage.setItem(RESEND_OTP_KEY, Date.now().toString());\n }\n\n const lastSent = storedTime ? parseInt(storedTime, 10) : Date.now();\n const elapsed = Math.floor((Date.now() - lastSent) / 1000);\n const remaining = RESEND_OTP_TIMER - elapsed;\n\n if (remaining > 0) {\n setTimeLeft(remaining);\n setResendEnabled(false);\n } else {\n setTimeLeft(0);\n setResendEnabled(true);\n }\n }, [identifier]);\n\n useEffect(() => {\n if (resendEnabled \|\| timeLeft <= 0) return;\n\n const interval = setInterval(() => {\n setTimeLeft((prev) => {\n if (prev <= 1) {\n clearInterval(interval);\n setResendEnabled(true);\n return 0;\n }\n return prev - 1;\n });\n }, 1000);\n\n return () => clearInterval(interval);\n }, [resendEnabled, timeLeft]);\n\n const validationSchema = Yup.object({\n otp: Yup.string()\n .matches(/^\\d{6}$/, ERROR_MESSAGES.OTP_CHARACTER(6))\n .required(ERROR_MESSAGES.FIELD_REUQIRED('OTP')),\n });\n\n const isFormFieldValid = (formik: any, fieldName: string) =>\n formik.touched[fieldName] && formik.errors[fieldName];\n\n\n const handleResendOtp = async () => {\n try {\n const payload = {\n type: type,\n identifier: identifier,\n };\n\n const response = await initiateResendOTP(payload).unwrap();\n\n if (response?.statusCode === 200) {\n dispatch(showToast({ severity: \"success\", summary: ERROR_MESSAGES.OPT_RESEND, detail: response?.data?.message }));\n localStorage.setItem(RESEND_OTP_KEY, Date.now().toString());\n setTimeLeft(RESEND_OTP_TIMER);\n setResendEnabled(false);\n } else {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: response.error }));\n }\n } catch (err: any) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: err?.data?.message \|\| ERROR_MESSAGES.SOMETHING_WRONG }));\n }\n };\n\n return (\n <>\n\n <div className={`auth-container ${solidSettingsData?.data?.authPagesLayout === 'center' ? 'center' : 'side'}`}>\n <h2 className=\"solid-auth-title\">{displayText.title}</h2>\n <p className=\"solid-auth-helper\">\n {displayText.subtitle}{\" \"}\n <span className=\"solid-auth-helper-emphasis\">{identifier}</span>\n </p>\n <>\n <Formik\n initialValues={{\n otp: \"\",\n }}\n validationSchema={validationSchema}\n onSubmit={async (values, { setSubmitting, setErrors }) => {\n try {\n const response = await signInWithOtp({\n type: type,\n identifier: identifier,\n otp: values.otp,\n });\n\n if (response?.error) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.INAVLID_OTP, detail: response.error }));\n setErrors({\n otp: ERROR_MESSAGES.INAVLID_OTP,\n });\n } else {\n localStorage.removeItem(`resendOtpLogin_${identifier}`);\n // dispatch(showToast({ severity: \"success\", summary: ERROR_MESSAGES.LOGIN_SUCCESS, detail: ERROR_MESSAGES.DASHBOARD_REDIRECTING }));\n const redirectUrl = env(\"NEXT_PUBLIC_LOGIN_REDIRECT_URL\") \|\| \"/admin\";\n router.push(redirectUrl);\n }\n } catch (err: any) {\n dispatch(showToast({ severity: \"error\", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: err?.data ? err?.data?.message : ERROR_MESSAGES.SOMETHING_WRONG }));\n } finally {\n setSubmitting(false);\n }\n }}\n >\n {(formik) => (\n <Form>\n <div className=\"solid-auth-otp-field\">\n <div className=\"solid-auth-otp-top\">\n <label htmlFor=\"otp\" className=\"solid-auth-input-label\">Verification code</label>\n <SolidButton\n type=\"button\"\n variant=\"outline\"\n size=\"sm\"\n className=\"solid-auth-otp-resend\"\n onClick={handleResendOtp}\n disabled={!resendEnabled}\n leftIcon={<SolidIcon name=\"si-refresh\" aria-hidden />}\n >\n Resend code\n </SolidButton>\n </div>\n <SolidOtpInput\n id=\"otp\"\n className=\"solid-auth-otp-input\"\n value={formik.values.otp}\n onChange={(nextValue) => formik.setFieldValue(\"otp\", nextValue)}\n length={6}\n integerOnly\n invalid={!!formik.errors.otp}\n />\n {isFormFieldValid(formik, \"otp\") && (\n <SolidMessage className=\"text-red-500 text-sm\" severity=\"error\" text={formik.errors.otp?.toString()} />\n )}\n <p className=\"solid-auth-otp-time\">\n {resendEnabled\n ? \"You can resend now.\"\n : `Time left: ${Math.floor(timeLeft / 60)\n .toString()\n .padStart(2, \"0\")}:${(timeLeft % 60).toString().padStart(2, \"0\")}`}\n </p>\n </div>\n <div className=\"mt-4\">\n <SolidButton\n type=\"submit\"\n className=\"w-full font-light auth-submit-button\"\n label=\"Verify\"\n disabled={formik.isSubmitting}\n loading={formik.isSubmitting}\n />\n <SolidButton\n type=\"button\"\n label=\"Back\"\n className=\"w-full auth-back-button text-center mt-1\"\n text\n onClick={() => (window.location.href = '/auth/login')}\n />\n </div>\n </Form>\n )}\n </Formik>\n </>\n </div>\n {/* <div className=\"text-center mt-5\">\n <div className=\"text-sm text-400 secondary-dark-color\">\n {'<'} Back to <Link className=\"font-bold\" href=\"/auth/login\">Back</Link>\n </div>\n </div> */}\n </>\n );\n};\n\nexport default SolidInitialLoginOtp;\n"]}

package/dist/components/auth/SolidInitialLoginOtp.tsx CHANGED Viewed

@@ -10,8 +10,6 @@ import { ERROR_MESSAGES } from "../../constants/error-messages";
 import { env } from "../../adapters/env";
 import { showToast } from "../../redux/features/toastSlice";
 import { SolidButton, SolidIcon, SolidMessage, SolidOtpInput } from "../shad-cn-ui";
-import { loadSession } from "../../adapters/auth/storage";
-import { hasAnyRole } from "../../helpers/rolesHelper";
 import { useAuthSettings } from "./AuthSettingsContext";
@@ -151,10 +149,7 @@ const SolidInitialLoginOtp = () => {
                                 } else {
                                     localStorage.removeItem(`resendOtpLogin_${identifier}`);
                                     // dispatch(showToast({ severity: "success", summary: ERROR_MESSAGES.LOGIN_SUCCESS, detail: ERROR_MESSAGES.DASHBOARD_REDIRECTING }));
-                                    const session = loadSession();
-                                    const isAdmin = hasAnyRole(session?.user?.roles, ["Admin"]);
-                                    const isDev = env("VITE_SOLIDX_ENV") === "dev";
-                                    const redirectUrl = isAdmin && isDev ? "/studio" : (env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin");
+                                    const redirectUrl = env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin";
                                     router.push(redirectUrl);
                                 }
                             } catch (err: any) {

package/dist/components/auth/SolidLogin.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SolidLogin.d.ts","sourceRoot":"","sources":["../../../src/components/auth/SolidLogin.tsx"],"names":[],"mappings":"~~AAuBA~~,QAAA,MAAM,UAAU,yDAA0D,GAAG,~~4CAuX5E~~,CAAC;AAEF,eAAe,UAAU,CAAC"}
1	+ {"version":3,"file":"SolidLogin.d.ts","sourceRoot":"","sources":["../../../src/components/auth/SolidLogin.tsx"],"names":[],"mappings":"AAqBA,QAAA,MAAM,UAAU,yDAA0D,GAAG,4CAoX5E,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/components/auth/SolidLogin.js CHANGED Viewed

@@ -48,8 +48,6 @@ import { ERROR_MESSAGES } from "../../constants/error-messages";
 import { env } from "../../adapters/env";
 import { showToast } from "../../redux/features/toastSlice";
 import { AuthTabs } from "./AuthTabs";
-import { loadSession } from "../../adapters/auth/storage";
-import { hasAnyRole } from "../../helpers/rolesHelper";
 import { useDispatch } from "react-redux";
 import { SolidButton, SolidDivider, SolidInput, SolidMessage, SolidPasswordInput, SolidRadioGroup } from "../shad-cn-ui";
 import { useAuthSettings } from "./AuthSettingsContext";
@@ -87,19 +85,19 @@ var SolidLogin = function (_a) {
             }), onSubmit: function (values, _a) {
                 var setSubmitting = _a.setSubmitting, setErrors = _a.setErrors;
                 return __awaiter(void 0, void 0, void 0, function () {
-                    var response, session, isAdmin, isDev, redirectUrl, error_1;
-                    var _b, _c;
-                    return __generator(this, function (_d) {
-                        switch (_d.label) {
+                    var response, redirectUrl, error_1;
+                    var _b;
+                    return __generator(this, function (_c) {
+                        switch (_c.label) {
                             case 0:
-                                _d.trys.push([0, 2, 3, 4]);
+                                _c.trys.push([0, 2, 3, 4]);
                                 return [4 /*yield*/, signIn("credentials", {
                                         redirect: false,
                                         identifier: values.identifier,
                                         password: values.password,
                                     })];
                             case 1:
-                                response = _d.sent();
+                                response = _c.sent();
                                 if (response === null || response === void 0 ? void 0 : response.error) {
                                     dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: response.error }));
                                     setErrors({
@@ -108,16 +106,13 @@ var SolidLogin = function (_a) {
                                     });
                                 }
                                 else {
-                                    session = loadSession();
-                                    isAdmin = hasAnyRole((_b = session === null || session === void 0 ? void 0 : session.user) === null || _b === void 0 ? void 0 : _b.roles, ["Admin"]);
-                                    isDev = env("VITE_SOLIDX_ENV") === "dev";
-                                    redirectUrl = isAdmin && isDev ? "/studio" : (env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin");
+                                    redirectUrl = env("NEXT_PUBLIC_LOGIN_REDIRECT_URL") || "/admin";
                                     router.push(redirectUrl);
                                 }
                                 return [3 /*break*/, 4];
                             case 2:
-                                error_1 = _d.sent();
-                                dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: (error_1 === null || error_1 === void 0 ? void 0 : error_1.data) ? (_c = error_1 === null || error_1 === void 0 ? void 0 : error_1.data) === null || _c === void 0 ? void 0 : _c.message : ERROR_MESSAGES.SOMETHING_WRONG }));
+                                error_1 = _c.sent();
+                                dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.LOGIN_ERROR, detail: (error_1 === null || error_1 === void 0 ? void 0 : error_1.data) ? (_b = error_1 === null || error_1 === void 0 ? void 0 : error_1.data) === null || _b === void 0 ? void 0 : _b.message : ERROR_MESSAGES.SOMETHING_WRONG }));
                                 return [3 /*break*/, 4];
                             case 3:
                                 setSubmitting(false); // Re-enable the button after submission