@jskit-ai/auth-web 0.1.247 → 0.1.248

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/auth-web",
-  "version": "0.1.247",
+  "version": "0.1.248",
   "type": "module",
   "scripts": {
     "test": "node --test --test-concurrency=1"
@@ -25,10 +25,10 @@
     "@mdi/js": "^7.4.47"
   },
   "peerDependencies": {
-    "@jskit-ai/auth-core": "0.1.243",
-    "@jskit-ai/http-runtime": "0.1.243",
-    "@jskit-ai/kernel": "0.1.245",
-    "@jskit-ai/shell-web": "0.1.251",
+    "@jskit-ai/auth-core": "0.1.244",
+    "@jskit-ai/http-runtime": "0.1.244",
+    "@jskit-ai/kernel": "0.1.246",
+    "@jskit-ai/shell-web": "0.1.252",
     "@tanstack/vue-query": "^5.90.5",
     "pinia": "^4.0.3",
     "vue": "^3.5.44",

package/src/client/composables/loginView/useLoginViewState.js

@@ -1,13 +1,11 @@
 import { computed, ref } from "vue";
 import { normalizeAuthCapabilities } from "@jskit-ai/auth-core/shared/authCapabilities";
 import {
+  resolveAllowedOriginsFromPlacementContext,
   resolveSurfaceIdFromPlacementPathname,
   resolveSurfaceRootPathFromPlacementContext
 } from "@jskit-ai/shell-web/client/placement";
-import {
-  normalizeAuthReturnToPath,
-  resolveAllowedReturnToOriginsFromPlacementContext
-} from "../../lib/returnToPath.js";
+import { normalizeAuthReturnToPath } from "../../lib/returnToPath.js";
 import {
   LOGIN_MODE,
   REGISTER_MODE,
@@ -100,7 +98,7 @@ export function useLoginViewState({ placementContext } = {}) {
   });
   const submitLabel = computed(() => SUBMIT_LABEL_BY_MODE[mode.value] || SUBMIT_LABEL_BY_MODE[LOGIN_MODE]);
   const allowedReturnToOrigins = computed(() =>
-    resolveAllowedReturnToOriginsFromPlacementContext(placementContext?.value)
+    resolveAllowedOriginsFromPlacementContext(placementContext?.value)
   );
   const requestedReturnTo = ref(
     normalizeAuthReturnToPath(

package/src/client/composables/loginView/validationHelpers.js

@@ -4,8 +4,8 @@ function validateCommandSection(commandResource, section, payload) {
   if (!commandResource || !commandResource.operation) {
     return {
       ok: true,
-      fieldErrors: {},
-      globalErrors: []
+      value: payload,
+      fieldErrors: {}
     };
   }
 
@@ -29,12 +29,6 @@ function resolveValidationMessage(validationResult, fallbackMessage = "Validatio
     return String(firstFieldError);
   }
 
-  const globalErrors = Array.isArray(validationResult.globalErrors) ? validationResult.globalErrors : [];
-  const firstGlobalError = globalErrors.find((entry) => String(entry || "").trim().length > 0);
-  if (firstGlobalError) {
-    return String(firstGlobalError);
-  }
-
   return String(fallbackMessage || "Validation failed.");
 }
 

package/src/client/composables/useDefaultSignOutView.js

@@ -2,14 +2,12 @@ import { computed, onMounted, ref } from "vue";
 import { useShellWebErrorRuntime } from "@jskit-ai/shell-web/client/error";
 import {
   useWebPlacementContext,
+  resolveAllowedOriginsFromPlacementContext,
   resolveSurfaceNavigationTargetFromPlacementContext
 } from "@jskit-ai/shell-web/client/placement";
 import { performSignOutRequest } from "../runtime/useSignOut.js";
 import { useAuthGuardRuntime } from "../runtime/inject.js";
-import {
-  normalizeAuthReturnToPath,
-  resolveAllowedReturnToOriginsFromPlacementContext
-} from "../lib/returnToPath.js";
+import { normalizeAuthReturnToPath } from "../lib/returnToPath.js";
 
 function readReturnToPathFromLocation({ allowedOrigins = [] } = {}) {
   if (typeof window !== "object" || !window.location) {
@@ -42,7 +40,7 @@ export function useDefaultSignOutView() {
   const errorMessage = ref("");
   const returnToPath = ref("/");
   const allowedReturnToOrigins = computed(() =>
-    resolveAllowedReturnToOriginsFromPlacementContext(placementContext.value)
+    resolveAllowedOriginsFromPlacementContext(placementContext.value)
   );
 
   function setErrorMessage(message, dedupeKey = "") {

package/src/client/lib/returnToPath.js

@@ -1,14 +1,7 @@
-import {
-  normalizeReturnToPath as normalizeSharedReturnToPath,
-  resolveAllowedOriginsFromPlacementContext
-} from "@jskit-ai/kernel/shared/support";
+import { normalizeReturnToPath as normalizeSharedReturnToPath } from "@jskit-ai/kernel/shared/support";
 
 const AUTH_LOOP_PATHNAMES = Object.freeze(["/auth/login", "/auth/signout"]);
 
-function resolveAllowedReturnToOriginsFromPlacementContext(contextValue = null) {
-  return resolveAllowedOriginsFromPlacementContext(contextValue);
-}
-
 function normalizeAuthReturnToPath(value, fallback = "/", { allowedOrigins = [] } = {}) {
   return normalizeSharedReturnToPath(value, {
     fallback,
@@ -17,4 +10,4 @@ function normalizeAuthReturnToPath(value, fallback = "/", { allowedOrigins = []
   });
 }
 
-export { normalizeAuthReturnToPath, resolveAllowedReturnToOriginsFromPlacementContext };
+export { normalizeAuthReturnToPath };

package/src/client/runtime/authClient.js

@@ -1,6 +1,8 @@
-import { resolveSurfaceNavigationTargetFromPlacementContext } from "@jskit-ai/shell-web/client/placement";
+import {
+  resolveAllowedOriginsFromPlacementContext,
+  resolveSurfaceNavigationTargetFromPlacementContext
+} from "@jskit-ai/shell-web/client/placement";
 
-import { resolveAllowedReturnToOriginsFromPlacementContext } from "../lib/returnToPath.js";
 import { createAuthGuardRuntime } from "./authGuardRuntime.js";
 import { completeOAuthCallbackFromUrl } from "./oauthCallbackRuntime.js";
 import { createPopupOAuthLaunchClient } from "./popupOAuthLaunchClient.js";
@@ -23,7 +25,7 @@ function createMobileCallbackCompleter() {
       return completeOAuthCallbackFromUrl({
         url,
         fallbackReturnTo,
-        allowedReturnToOrigins: resolveAllowedReturnToOriginsFromPlacementContext(placementContext),
+        allowedReturnToOrigins: resolveAllowedOriginsFromPlacementContext(placementContext),
         defaultProvider,
         ...(typeof request === "function" ? { request } : {}),
         refreshSession

package/src/client/runtime/authGuardRuntime.js

@@ -1,3 +1,4 @@
+import { DEFAULT_GUARD_EVALUATOR_KEY } from "@jskit-ai/kernel/client";
 import { isTransientQueryError } from "@jskit-ai/kernel/shared/support";
 import { AUTH_PATHS } from "@jskit-ai/auth-core/shared/authPaths";
 import { isExternalLinkTarget } from "@jskit-ai/kernel/shared/support/linkPath";
@@ -6,7 +7,6 @@ import { createListenerSubscription } from "@jskit-ai/kernel/shared/support/list
 import { normalizePermissionList } from "@jskit-ai/kernel/shared/support/permissions";
 import { normalizeAuthCapabilities } from "@jskit-ai/auth-core/shared/authCapabilities";
 
-const GLOBAL_GUARD_EVALUATOR_KEY = "__JSKIT_WEB_SHELL_GUARD_EVALUATOR__";
 const AUTH_POLICY_AUTHENTICATED = "authenticated";
 const DEFAULT_SESSION_PATH = AUTH_PATHS.SESSION;
 const DEFAULT_LOGIN_ROUTE = "/auth/login";
@@ -273,10 +273,10 @@ function installGuardEvaluator({ loginRoute = DEFAULT_LOGIN_ROUTE, getAuthState
       authState: getAuthState()
     });
   };
-  root[GLOBAL_GUARD_EVALUATOR_KEY] = evaluator;
+  root[DEFAULT_GUARD_EVALUATOR_KEY] = evaluator;
   return () => {
-    if (root[GLOBAL_GUARD_EVALUATOR_KEY] === evaluator) {
-      delete root[GLOBAL_GUARD_EVALUATOR_KEY];
+    if (root[DEFAULT_GUARD_EVALUATOR_KEY] === evaluator) {
+      delete root[DEFAULT_GUARD_EVALUATOR_KEY];
     }
   };
 }

package/test/returnToPath.test.js

@@ -1,10 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
-import {
-  normalizeAuthReturnToPath,
-  resolveAllowedReturnToOriginsFromPlacementContext
-} from "../src/client/lib/returnToPath.js";
+import { normalizeAuthReturnToPath } from "../src/client/lib/returnToPath.js";
 
 test("normalizeAuthReturnToPath keeps valid internal paths", () => {
   assert.equal(normalizeAuthReturnToPath("/dashboard"), "/dashboard");
@@ -37,36 +34,3 @@ test("normalizeAuthReturnToPath falls back for invalid or auth-loop paths", () =
     "/"
   );
 });
-
-test("resolveAllowedReturnToOriginsFromPlacementContext collects current + surface origins", () => {
-  const originalWindow = globalThis.window;
-  globalThis.window = {
-    location: {
-      origin: "https://current.example.com"
-    }
-  };
-
-  try {
-    const origins = resolveAllowedReturnToOriginsFromPlacementContext({
-      surfaceConfig: {
-        surfacesById: {
-          home: { origin: "https://home.example.com" },
-          app: { origin: "https://app.example.com" },
-          auth: { origin: "https://home.example.com" }
-        }
-      }
-    });
-
-    assert.deepEqual(origins, [
-      "https://current.example.com",
-      "https://home.example.com",
-      "https://app.example.com"
-    ]);
-  } finally {
-    if (typeof originalWindow === "undefined") {
-      delete globalThis.window;
-    } else {
-      globalThis.window = originalWindow;
-    }
-  }
-});