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

package/dist/module.d.mts

@@ -1,22 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
-
-type AuthupRuntimeOptions = {
-    apiURL?: string;
-    apiURLRuntimeKey?: string;
-    /**
-     * Separate apiURL for server side rendering.
-     */
-    apiURLServer?: string;
-    /**
-     * Separate extraction of apiURL for server side rendering.
-     */
-    apiURLServerRuntimeKey?: string;
-    cookieDomain?: string;
-    cookieDomainRuntimeKey?: string;
-    homeRoute?: string;
-    loginRoute?: string;
-    logoutRoute?: string;
-};
+import { AuthupRuntimeOptions } from '../dist/runtime/types.js';
 
 declare const _default: _nuxt_schema.NuxtModule<AuthupRuntimeOptions, AuthupRuntimeOptions, false>;
 

package/dist/module.d.ts

@@ -1,22 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
-
-type AuthupRuntimeOptions = {
-    apiURL?: string;
-    apiURLRuntimeKey?: string;
-    /**
-     * Separate apiURL for server side rendering.
-     */
-    apiURLServer?: string;
-    /**
-     * Separate extraction of apiURL for server side rendering.
-     */
-    apiURLServerRuntimeKey?: string;
-    cookieDomain?: string;
-    cookieDomainRuntimeKey?: string;
-    homeRoute?: string;
-    loginRoute?: string;
-    logoutRoute?: string;
-};
+import { AuthupRuntimeOptions } from '../dist/runtime/types.js';
 
 declare const _default: _nuxt_schema.NuxtModule<AuthupRuntimeOptions, AuthupRuntimeOptions, false>;
 

package/dist/module.json

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

package/dist/module.mjs

@@ -1,4 +1,4 @@
-import { defineNuxtModule, addPlugin, addRouteMiddleware } from '@nuxt/kit';
+import { defineNuxtModule, installModule, addPlugin, addRouteMiddleware } from '@nuxt/kit';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { merge } from 'smob';
@@ -10,13 +10,12 @@ const module = defineNuxtModule({
   },
   defaults: {},
   async setup(options, nuxt) {
+    await installModule("@pinia/nuxt");
     const runtimeDir = fileURLToPath(new URL("./runtime", import.meta.url));
     nuxt.options.build.transpile.push(runtimeDir);
     const runtimeOptions = {
       apiURL: options.apiURL,
       apiURLRuntimeKey: options.apiURLRuntimeKey,
-      apiURLServer: options.apiURLServer,
-      apiURLServerRuntimeKey: options.apiURLServerRuntimeKey,
       cookieDomain: options.cookieDomain,
       cookieDomainRuntimeKey: options.cookieDomainRuntimeKey,
       homeRoute: options.homeRoute,
@@ -32,8 +31,8 @@ const module = defineNuxtModule({
     } else {
       nuxt.options.runtimeConfig.public.authup = runtimeOptions;
     }
-    addPlugin(path.resolve(runtimeDir, "plugins/00.pinia"));
-    addPlugin(path.resolve(runtimeDir, "plugins/01.kit"));
+    addPlugin(path.resolve(runtimeDir, "plugins/kit"));
+    addPlugin(path.resolve(runtimeDir, "plugins/root"));
     addRouteMiddleware({
       name: "loggedIn",
       path: path.resolve(runtimeDir, "middleware/00.session"),

package/dist/runtime/plugins/kit.js

@@ -0,0 +1,95 @@
+import { install } from "@authup/client-web-kit";
+import { getPathValue } from "pathtrace";
+import {
+  defineNuxtPlugin,
+  tryUseNuxtApp,
+  useCookie,
+  useRuntimeConfig
+} from "#imports";
+function buildCookieOptions(runtimeConfig) {
+  const options = runtimeConfig.public.authup;
+  let domain;
+  if (options.cookieDomain) {
+    domain = options.cookieDomain;
+  }
+  if (options.cookieDomainRuntimeKey) {
+    const pathValue = getPathValue(runtimeConfig.public, options.cookieDomainRuntimeKey);
+    if (typeof pathValue === "string") {
+      domain = pathValue;
+    }
+  }
+  if (domain === "127.0.0.1") {
+    domain = "localhost";
+  }
+  const cookieOptions = {};
+  if (domain) {
+    cookieOptions.domain = domain;
+  }
+  return cookieOptions;
+}
+function buildApiUrl(runtimeConfig) {
+  const options = runtimeConfig.public.authup;
+  let url;
+  if (import.meta.server) {
+    if (options.apiURLRuntimeKey) {
+      const pathValue = getPathValue(runtimeConfig, options.apiURLRuntimeKey);
+      if (typeof pathValue === "string") {
+        url = pathValue;
+      }
+    }
+  }
+  if (!url) {
+    if (options.apiURL) {
+      url = options.apiURL;
+    }
+    if (options.apiURLRuntimeKey) {
+      const pathValue = getPathValue(runtimeConfig.public, options.apiURLRuntimeKey);
+      if (typeof pathValue === "string") {
+        url = pathValue;
+      }
+    }
+  }
+  return url || "http://localhost:3010";
+}
+export default defineNuxtPlugin({
+  name: "authup:kit",
+  dependsOn: ["pinia"],
+  setup(ctx) {
+    const runtimeConfig = useRuntimeConfig();
+    const baseURL = buildApiUrl(runtimeConfig);
+    const cookieOptions = buildCookieOptions(runtimeConfig);
+    install(ctx.vueApp, {
+      pinia: ctx.$pinia,
+      baseURL,
+      cookieSet: (key, value, options) => {
+        const app = tryUseNuxtApp();
+        if (app) {
+          const cookie = useCookie(key, {
+            ...cookieOptions,
+            ...options || {}
+          });
+          cookie.value = value;
+        }
+      },
+      cookieUnset: (key, options) => {
+        const app = tryUseNuxtApp();
+        if (app) {
+          const cookie = useCookie(key, {
+            ...cookieOptions,
+            ...options || {}
+          });
+          cookie.value = null;
+        }
+      },
+      cookieGet: (key) => {
+        const app = tryUseNuxtApp();
+        if (app) {
+          const cookie = useCookie(key);
+          return cookie.value;
+        }
+        return null;
+      },
+      isServer: import.meta.server
+    });
+  }
+});

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

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

package/dist/runtime/plugins/root.js

@@ -0,0 +1,7 @@
+import { defineNuxtPlugin } from "#imports";
+export default defineNuxtPlugin({
+  name: "authup",
+  dependsOn: ["authup:kit"],
+  async setup() {
+  }
+});

package/dist/runtime/types.d.ts

@@ -1,14 +1,6 @@
 export type AuthupRuntimeOptions = {
     apiURL?: string;
     apiURLRuntimeKey?: string;
-    /**
-     * Separate apiURL for server side rendering.
-     */
-    apiURLServer?: string;
-    /**
-     * Separate extraction of apiURL for server side rendering.
-     */
-    apiURLServerRuntimeKey?: string;
     cookieDomain?: string;
     cookieDomainRuntimeKey?: string;
     homeRoute?: string;

package/package.json

@@ -1,14 +1,14 @@
 {
     "name": "@authup/client-web-nuxt",
     "type": "module",
-    "version": "1.0.0-beta.20",
+    "version": "1.0.0-beta.22",
     "description": "Nuxt module for the authup ecosystem",
+    "license": "Apache-2.0",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/authup/authup.git",
         "directory": "packages/client-web-nuxt"
     },
-    "license": "Apache-2.0",
     "exports": {
         ".": {
             "types": "./dist/types.d.ts",
@@ -29,18 +29,20 @@
         "lint": "eslint ."
     },
     "dependencies": {
-        "@authup/kit": "^1.0.0-beta.20",
-        "@authup/client-web-kit": "^1.0.0-beta.20",
+        "@authup/kit": "^1.0.0-beta.22",
+        "@authup/client-web-kit": "^1.0.0-beta.22",
         "@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"
     },
     "peerDependencies": {
+        "@pinia/nuxt": "*",
         "pinia": "^2.2.4"
     }
 }

package/dist/runtime/plugins/00.pinia.d.ts

@@ -1,6 +0,0 @@
-declare const _default: import("nuxt/app").Plugin<{
-    pinia: import("pinia").Pinia;
-}> & import("nuxt/app").ObjectPlugin<{
-    pinia: import("pinia").Pinia;
-}>;
-export default _default;

package/dist/runtime/plugins/00.pinia.js

@@ -1,24 +0,0 @@
-import { createPinia, setActivePinia } from "pinia";
-import { defineNuxtPlugin } from "#imports";
-export default defineNuxtPlugin({
-  name: "authupPinia",
-  enforce: "pre",
-  async setup(nuxt) {
-    if (nuxt.$pinia) {
-      return {};
-    }
-    const pinia = createPinia();
-    nuxt.vueApp.use(pinia);
-    setActivePinia(pinia);
-    if (import.meta.server) {
-      nuxt.payload.pinia = pinia.state.value;
-    } else if (nuxt.payload && nuxt.payload.pinia) {
-      pinia.state.value = nuxt.payload.pinia;
-    }
-    return {
-      provide: {
-        pinia
-      }
-    };
-  }
-});

package/dist/runtime/plugins/01.kit.js

@@ -1,90 +0,0 @@
-import { install } from "@authup/client-web-kit";
-import { getPathValue } from "pathtrace";
-import {
-  defineNuxtPlugin,
-  tryUseNuxtApp,
-  useCookie,
-  useRuntimeConfig
-} from "#imports";
-export default defineNuxtPlugin({
-  name: "authupKit",
-  enforce: "pre",
-  dependsOn: ["authupPinia"],
-  setup(ctx) {
-    const runtimeConfig = useRuntimeConfig();
-    let apiURL;
-    let apiURLServer;
-    let cookieDomain;
-    const runtimeOptions = runtimeConfig.public.authup;
-    if (import.meta.server && (runtimeOptions.apiURLServer || runtimeOptions.apiURLServerRuntimeKey)) {
-      if (runtimeOptions.apiURLServer) {
-        apiURLServer = runtimeOptions.apiURLServer;
-      }
-      if (runtimeOptions.apiURLServerRuntimeKey) {
-        let pathValue = getPathValue(runtimeConfig, runtimeOptions.apiURLServerRuntimeKey);
-        if (typeof pathValue === "string") {
-          apiURLServer = pathValue;
-        }
-        pathValue = getPathValue(runtimeConfig.public, runtimeOptions.apiURLServerRuntimeKey);
-        if (typeof pathValue === "string") {
-          apiURLServer = pathValue;
-        }
-      }
-    }
-    if (runtimeOptions.apiURL) {
-      apiURL = runtimeOptions.apiURL;
-    }
-    if (runtimeOptions.apiURLRuntimeKey) {
-      const pathValue = getPathValue(runtimeConfig.public, runtimeOptions.apiURLRuntimeKey);
-      if (typeof pathValue === "string") {
-        apiURL = pathValue;
-      }
-    }
-    if (runtimeOptions.cookieDomain) {
-      cookieDomain = runtimeOptions.cookieDomain;
-    }
-    if (runtimeOptions.cookieDomainRuntimeKey) {
-      const pathValue = getPathValue(runtimeConfig.public, runtimeOptions.cookieDomainRuntimeKey);
-      if (typeof pathValue === "string") {
-        cookieDomain = pathValue;
-      }
-    }
-    if (!cookieDomain) {
-      const { hostname } = new URL(apiURL || "http://localhost:3000");
-      cookieDomain = hostname;
-    }
-    if (cookieDomain === "127.0.0.1") {
-      cookieDomain = "localhost";
-    }
-    const cookieOptions = {
-      domain: cookieDomain || "localhost"
-    };
-    install(ctx.vueApp, {
-      pinia: ctx.$pinia,
-      baseURL: apiURLServer || apiURL || "http://localhost:3000",
-      cookieSet: (key, value) => {
-        const app = tryUseNuxtApp();
-        if (app) {
-          const cookie = useCookie(key, cookieOptions);
-          cookie.value = value;
-        }
-      },
-      cookieUnset: (key) => {
-        const app = tryUseNuxtApp();
-        if (app) {
-          const cookie = useCookie(key, cookieOptions);
-          cookie.value = null;
-        }
-      },
-      cookieGet: (key) => {
-        const app = tryUseNuxtApp();
-        if (app) {
-          const cookie = useCookie(key, cookieOptions);
-          return cookie.value;
-        }
-        return null;
-      },
-      isServer: import.meta.server
-    });
-  }
-});