@authup/client-web-nuxt 1.0.0-beta.22 → 1.0.0-beta.24

package/dist/module.d.mts

@@ -1,6 +1,15 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { AuthupRuntimeOptions } from '../dist/runtime/types.js';
+import { HookResult } from '@nuxt/schema';
+import { MiddlewareHookPayload, RuntimeOptions } from '../dist/runtime/types.js';
 
-declare const _default: _nuxt_schema.NuxtModule<AuthupRuntimeOptions, AuthupRuntimeOptions, false>;
+declare module '#app' {
+    interface RuntimeNuxtHooks {
+        'authup:middleware:start': (data: MiddlewareHookPayload) => HookResult;
+        'authup:middleware:redirect': (data: MiddlewareHookPayload) => HookResult;
+        'authup:middleware:end': (data: MiddlewareHookPayload) => HookResult;
+    }
+}
+
+declare const _default: _nuxt_schema.NuxtModule<RuntimeOptions, RuntimeOptions, false>;
 
 export { _default as default };

package/dist/module.d.ts

@@ -1,6 +1,15 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { AuthupRuntimeOptions } from '../dist/runtime/types.js';
+import { HookResult } from '@nuxt/schema';
+import { MiddlewareHookPayload, RuntimeOptions } from '../dist/runtime/types.js';
 
-declare const _default: _nuxt_schema.NuxtModule<AuthupRuntimeOptions, AuthupRuntimeOptions, false>;
+declare module '#app' {
+    interface RuntimeNuxtHooks {
+        'authup:middleware:start': (data: MiddlewareHookPayload) => HookResult;
+        'authup:middleware:redirect': (data: MiddlewareHookPayload) => HookResult;
+        'authup:middleware:end': (data: MiddlewareHookPayload) => HookResult;
+    }
+}
+
+declare const _default: _nuxt_schema.NuxtModule<RuntimeOptions, RuntimeOptions, false>;
 
 export { _default as default };

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@authup/client-web-nuxt",
   "configKey": "authup",
-  "version": "1.0.0-beta.22",
+  "version": "1.0.0-beta.24",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/module.mjs

@@ -34,8 +34,8 @@ const module = defineNuxtModule({
     addPlugin(path.resolve(runtimeDir, "plugins/kit"));
     addPlugin(path.resolve(runtimeDir, "plugins/root"));
     addRouteMiddleware({
-      name: "loggedIn",
-      path: path.resolve(runtimeDir, "middleware/00.session"),
+      name: "authup",
+      path: path.resolve(runtimeDir, "middleware/00.root"),
       global: true
     });
   }

package/dist/runtime/helpers/index.d.ts

@@ -1,2 +1 @@
-export * from './route-path.js';
-export * from './route-permissions.js';
+export * from './routing-interceptor.js';

package/dist/runtime/helpers/index.js

@@ -1,2 +1 @@
-export * from "./route-path.js";
-export * from "./route-permissions.js";
+export * from "./routing-interceptor.js";

package/dist/runtime/helpers/routing-interceptor.d.ts

@@ -0,0 +1,18 @@
+import { type Store, type StoreToRefs } from '@authup/client-web-kit';
+import type { RouteLocationAsPathGeneric, RouteLocationNormalized } from 'vue-router';
+import type { NuxtApp } from '#app';
+export declare class RoutingInterceptor {
+    protected store: Store;
+    protected storeRefs: StoreToRefs<Store>;
+    protected homeRoute: string;
+    protected loginRoute: string;
+    constructor(nuxtApp: NuxtApp);
+    execute(to: RouteLocationNormalized, from: RouteLocationNormalized): Promise<RouteLocationAsPathGeneric | undefined>;
+    protected hasLoggedInCondition(route: RouteLocationNormalized): boolean;
+    protected validateLoggedInCondition(route: RouteLocationNormalized): boolean;
+    protected hasLoggedOutCondition(route: RouteLocationNormalized): boolean;
+    protected validateLoggedOutCondition(route: RouteLocationNormalized): boolean;
+    protected hasPermissionCondition(route: RouteLocationNormalized): boolean;
+    protected validatePermissionCondition(route: RouteLocationNormalized): Promise<boolean>;
+    protected hasQueryRedirectProperty(route: RouteLocationNormalized): boolean;
+}

package/dist/runtime/helpers/routing-interceptor.js

@@ -0,0 +1,138 @@
+import {
+  injectStore,
+  storeToRefs
+} from "@authup/client-web-kit";
+import { hasOwnProperty } from "@authup/kit";
+import { RouteMetaKey } from "../constants.js";
+export class RoutingInterceptor {
+  store;
+  storeRefs;
+  homeRoute;
+  loginRoute;
+  constructor(nuxtApp) {
+    this.store = injectStore(nuxtApp.$pinia, nuxtApp.vueApp);
+    this.storeRefs = storeToRefs(this.store);
+    const runtimeOptions = nuxtApp.$config.public.authup;
+    this.homeRoute = runtimeOptions.homeRoute || "/";
+    this.loginRoute = runtimeOptions.loginRoute || "/login";
+  }
+  async execute(to, from) {
+    try {
+      await this.store.resolve();
+    } catch (e) {
+      await this.store.logout();
+      if (to.fullPath.startsWith(this.loginRoute)) {
+        return void 0;
+      }
+      return {
+        path: this.loginRoute,
+        query: {
+          ...!this.hasLoggedOutCondition(to) && !this.hasQueryRedirectProperty(to) ? { redirect: to.fullPath } : {}
+        }
+      };
+    }
+    let isValid = this.validateLoggedInCondition(to);
+    if (!isValid) {
+      return {
+        path: this.loginRoute,
+        query: {
+          ...!this.hasQueryRedirectProperty(to) ? { redirect: to.fullPath } : {}
+        }
+      };
+    }
+    isValid = this.validateLoggedOutCondition(to);
+    if (!isValid) {
+      await this.store.logout();
+      return void 0;
+    }
+    isValid = await this.validatePermissionCondition(to);
+    if (!isValid) {
+      if (from.path === to.path) {
+        await this.store.logout();
+        return {
+          path: this.loginRoute
+        };
+      }
+      if (this.hasLoggedOutCondition(from)) {
+        await this.store.logout();
+        return {
+          path: from.fullPath
+        };
+      }
+      return {
+        path: from.fullPath
+      };
+    }
+    return void 0;
+  }
+  hasLoggedInCondition(route) {
+    return route.matched.some(
+      (matched) => !!matched.meta[RouteMetaKey.REQUIRED_LOGGED_IN]
+    );
+  }
+  validateLoggedInCondition(route) {
+    if (!this.hasLoggedInCondition(route)) {
+      return true;
+    }
+    return !!this.storeRefs.loggedIn.value;
+  }
+  hasLoggedOutCondition(route) {
+    return route.matched.some(
+      (matched) => matched.meta[RouteMetaKey.REQUIRED_LOGGED_OUT]
+    );
+  }
+  validateLoggedOutCondition(route) {
+    if (!this.hasLoggedOutCondition(route)) {
+      return true;
+    }
+    return !this.storeRefs.loggedIn.value;
+  }
+  hasPermissionCondition(route) {
+    return route.matched.some(
+      (matched) => !!matched.meta[RouteMetaKey.REQUIRED_PERMISSIONS]
+    );
+  }
+  async validatePermissionCondition(route) {
+    if (!this.hasPermissionCondition(route)) {
+      return true;
+    }
+    let identity;
+    if (this.storeRefs.userId.value) {
+      identity = {
+        type: "user",
+        id: this.storeRefs.userId.value
+      };
+    }
+    for (let i = 0; i < route.matched.length; i++) {
+      const match = route.matched[i];
+      if (!match.meta || !hasOwnProperty(match.meta, RouteMetaKey.REQUIRED_PERMISSIONS)) {
+        continue;
+      }
+      let permissions = [];
+      if (match.meta[RouteMetaKey.REQUIRED_PERMISSIONS]) {
+        if (Array.isArray(match.meta[RouteMetaKey.REQUIRED_PERMISSIONS])) {
+          permissions = match.meta[RouteMetaKey.REQUIRED_PERMISSIONS];
+        } else if (typeof match.meta[RouteMetaKey.REQUIRED_PERMISSIONS] === "string") {
+          permissions = [match.meta[RouteMetaKey.REQUIRED_PERMISSIONS]];
+        }
+      }
+      if (permissions.length === 0) {
+        continue;
+      }
+      try {
+        await this.store.permissionChecker.preCheckOneOf({
+          name: permissions,
+          data: {
+            identity
+          }
+        });
+      } catch (e) {
+        return false;
+      }
+    }
+    return true;
+  }
+  hasQueryRedirectProperty(route) {
+    return route.query && !!route.query.redirect;
+  }
+}

package/dist/runtime/middleware/00.root.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("#app").RouteMiddleware;
+export default _default;

package/dist/runtime/middleware/00.root.js

@@ -0,0 +1,20 @@
+import { defineNuxtRouteMiddleware, navigateTo, useNuxtApp } from "#imports";
+import { RoutingInterceptor } from "../helpers/index.js";
+export default defineNuxtRouteMiddleware(
+  async (to, from) => {
+    const nuxtApp = useNuxtApp();
+    const interceptor = new RoutingInterceptor(nuxtApp);
+    const hookPayload = {
+      to,
+      from
+    };
+    await nuxtApp.callHook("authup:middleware:start", hookPayload);
+    const redirectRoute = await interceptor.execute(to, from);
+    if (redirectRoute) {
+      await nuxtApp.callHook("authup:middleware:redirect", hookPayload);
+      return navigateTo(redirectRoute);
+    }
+    await nuxtApp.callHook("authup:middleware:end", hookPayload);
+    return void 0;
+  }
+);

package/dist/runtime/plugins/kit.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("nuxt/app").Plugin<Record<string, unknown>> & import("nuxt/app").ObjectPlugin<Record<string, unknown>>;
+declare const _default: import("#app").Plugin<Record<string, unknown>> & import("#app").ObjectPlugin<Record<string, unknown>>;
 export default _default;

package/dist/runtime/plugins/root.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("nuxt/app").Plugin<Record<string, unknown>> & import("nuxt/app").ObjectPlugin<Record<string, unknown>>;
+declare const _default: import("#app").Plugin<Record<string, unknown>> & import("#app").ObjectPlugin<Record<string, unknown>>;
 export default _default;

package/dist/runtime/types.d.ts

@@ -1,4 +1,4 @@
-export type AuthupRuntimeOptions = {
+export type RuntimeOptions = {
     apiURL?: string;
     apiURLRuntimeKey?: string;
     cookieDomain?: string;
@@ -7,3 +7,11 @@ export type AuthupRuntimeOptions = {
     loginRoute?: string;
     logoutRoute?: string;
 };
+export type MiddlewareHookPayload = {
+    to: {
+        fullPath: string;
+    };
+    from: {
+        fullPath: string;
+    };
+};

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@authup/client-web-nuxt",
     "type": "module",
-    "version": "1.0.0-beta.22",
+    "version": "1.0.0-beta.24",
     "description": "Nuxt module for the authup ecosystem",
     "license": "Apache-2.0",
     "repository": {
@@ -29,17 +29,18 @@
         "lint": "eslint ."
     },
     "dependencies": {
-        "@authup/kit": "^1.0.0-beta.22",
-        "@authup/client-web-kit": "^1.0.0-beta.22",
+        "@authup/kit": "^1.0.0-beta.24",
+        "@authup/client-web-kit": "^1.0.0-beta.24",
         "@nuxt/kit": "^3.13.2",
         "pathtrace": "^1.1.0",
         "smob": "^1.5.0"
     },
     "devDependencies": {
         "@nuxt/module-builder": "^0.8.4",
-        "@pinia/nuxt": "^0.5.5",
-        "nuxt": "^3.13.2",
-        "pinia": "^2.2.4"
+        "@pinia/nuxt": "^0.9.0",
+        "nuxt": "^3.15.2",
+        "pinia": "^2.2.4",
+        "vue-router": "^4.4.5"
     },
     "peerDependencies": {
         "@pinia/nuxt": "*",

package/dist/runtime/helpers/route-path.d.ts

@@ -1,7 +0,0 @@
-import type { RouteLocationNormalized } from 'vue-router';
-type RoutePathBuildOptions = {
-    location?: RouteLocationNormalized;
-    excluded?: string[];
-};
-export declare function buildRoutePath(context?: RoutePathBuildOptions): string | undefined;
-export {};

package/dist/runtime/helpers/route-path.js

@@ -1,13 +0,0 @@
-export function buildRoutePath(context = {}) {
-  if (!context.location || context.location.query.redirect) {
-    return void 0;
-  }
-  if (context.excluded) {
-    for (let i = 0; i < context.excluded.length; i++) {
-      if (context.location.fullPath.startsWith(context.excluded[i])) {
-        return void 0;
-      }
-    }
-  }
-  return context.location.fullPath;
-}

package/dist/runtime/helpers/route-permissions.d.ts

@@ -1,8 +0,0 @@
-import { type Store } from '@authup/client-web-kit';
-import type { RouteLocationNormalized } from 'vue-router';
-type RoutePermissionsCheckOptions = {
-    routeLocation: RouteLocationNormalized;
-    store: Store;
-};
-export declare function checkRoutePermissions(context: RoutePermissionsCheckOptions): Promise<boolean>;
-export {};

package/dist/runtime/helpers/route-permissions.js

@@ -1,41 +0,0 @@
-import { storeToRefs } from "@authup/client-web-kit";
-import { hasOwnProperty } from "@authup/kit";
-import { RouteMetaKey } from "../constants.js";
-export async function checkRoutePermissions(context) {
-  const storeRefs = storeToRefs(context.store);
-  let identity;
-  if (storeRefs.userId.value) {
-    identity = {
-      type: "user",
-      id: storeRefs.userId.value
-    };
-  }
-  for (let i = 0; i < context.routeLocation.matched.length; i++) {
-    const match = context.routeLocation.matched[i];
-    if (!match.meta || !hasOwnProperty(match.meta, RouteMetaKey.REQUIRED_PERMISSIONS)) {
-      continue;
-    }
-    let permissions = [];
-    if (match.meta[RouteMetaKey.REQUIRED_PERMISSIONS]) {
-      if (Array.isArray(match.meta[RouteMetaKey.REQUIRED_PERMISSIONS])) {
-        permissions = match.meta[RouteMetaKey.REQUIRED_PERMISSIONS];
-      } else if (typeof match.meta[RouteMetaKey.REQUIRED_PERMISSIONS] === "string") {
-        permissions = [match.meta[RouteMetaKey.REQUIRED_PERMISSIONS]];
-      }
-    }
-    if (permissions.length === 0) {
-      continue;
-    }
-    try {
-      await context.store.permissionChecker.preCheckOneOf({
-        name: permissions,
-        data: {
-          identity
-        }
-      });
-    } catch (e) {
-      return false;
-    }
-  }
-  return true;
-}

package/dist/runtime/middleware/00.session.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("nuxt/app").RouteMiddleware;
-export default _default;

package/dist/runtime/middleware/00.session.js

@@ -1,78 +0,0 @@
-import { storeToRefs, useStore } from "@authup/client-web-kit";
-import { defineNuxtRouteMiddleware, navigateTo, useRuntimeConfig } from "#imports";
-import { RouteMetaKey } from "../constants.js";
-import { buildRoutePath, checkRoutePermissions } from "../helpers/index.js";
-export default defineNuxtRouteMiddleware(
-  async (to, from) => {
-    const store = useStore();
-    const storeRefs = storeToRefs(store);
-    const runtimeConfig = useRuntimeConfig();
-    const runtimeOptions = runtimeConfig.public.authup;
-    const homeRoute = runtimeOptions.homeRoute || "/";
-    const loginRoute = runtimeOptions.loginRoute || "/login";
-    const logoutRoute = runtimeOptions.logoutRoute || "/logout";
-    try {
-      await store.resolve();
-    } catch (e) {
-      store.logout();
-      const redirect = buildRoutePath({
-        location: to,
-        excluded: [
-          logoutRoute,
-          loginRoute
-        ]
-      });
-      if (redirect) {
-        return navigateTo({
-          path: loginRoute,
-          query: {
-            redirect
-          }
-        });
-      }
-      return void 0;
-    }
-    const hasLoggedInProtection = to.matched.some(
-      (matched) => !!matched.meta[RouteMetaKey.REQUIRED_LOGGED_IN]
-    );
-    if (hasLoggedInProtection && !storeRefs.loggedIn.value) {
-      const redirect = buildRoutePath({
-        location: to,
-        excluded: [
-          logoutRoute,
-          loginRoute
-        ]
-      });
-      return navigateTo({
-        path: loginRoute,
-        query: {
-          ...redirect ? { redirect } : {}
-        }
-      });
-    }
-    const hasPermissionProtection = to.matched.some(
-      (matched) => !!matched.meta[RouteMetaKey.REQUIRED_PERMISSIONS]
-    );
-    if (hasPermissionProtection) {
-      const hasPermissions = await checkRoutePermissions({
-        store,
-        routeLocation: to
-      });
-      if (!hasPermissions) {
-        return navigateTo({
-          path: from ? from.fullPath : homeRoute
-        });
-      }
-    }
-    const hasLoggedOutProtection = to.matched.some(
-      (matched) => matched.meta[RouteMetaKey.REQUIRED_LOGGED_OUT]
-    );
-    if (hasLoggedOutProtection && storeRefs.loggedIn.value) {
-      store.logout();
-      return navigateTo({
-        path: to.fullPath
-      });
-    }
-    return void 0;
-  }
-);