@inzombieland/nuxt-common 1.16.2 → 1.16.4

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/nuxt-common",
-  "version": "1.16.2",
+  "version": "1.16.4",
   "configKey": "nuxt-common",
   "builder": {
     "@nuxt/module-builder": "0.6.0",

package/dist/module.mjs

@@ -2,7 +2,7 @@ import { fileURLToPath } from 'node:url';
 import { defineNuxtModule, createResolver, addServerHandler, addImportsDir, addPlugin, addComponent } from '@nuxt/kit';
 
 const name = "@inzombieland/nuxt-common";
-const version = "1.16.2";
+const version = "1.16.4";
 
 const module = defineNuxtModule({
   meta: {

package/dist/runtime/api/account/account.get.mjs

@@ -1,13 +1,12 @@
 import { defineEventHandler, getRequestHeader, parseCookies } from "h3";
+import { useRuntimeConfig } from "#imports";
 export default defineEventHandler(async (event) => {
   const cookies = parseCookies(event);
   if (cookies.lin !== "yes") {
     return {};
   }
-  const config = {
-    apiBaseURL: String(import.meta.env.VITE_API_BASE_URL)
-  };
-  const request = String(config.apiBaseURL) + String(event.node.req.url);
+  const config = useRuntimeConfig();
+  const request = String(config.public.apiBaseURL) + String(event.node.req.url);
   const authorization = getRequestHeader(event, "authorization") ?? "";
   try {
     const response = await $fetch.raw(request, {

package/dist/runtime/api/account/authcheck.get.mjs

@@ -1,13 +1,12 @@
 import { defineEventHandler, parseCookies } from "h3";
+import { useRuntimeConfig } from "#imports";
 export default defineEventHandler(async (event) => {
   const cookies = parseCookies(event);
   if (cookies.lin !== "yes") {
     return {};
   }
-  const config = {
-    apiBaseURL: String(import.meta.env.VITE_API_BASE_URL)
-  };
-  const request = String(config.apiBaseURL) + String(event.node.req.url);
+  const config = useRuntimeConfig();
+  const request = String(config.public.apiBaseURL) + String(event.node.req.url);
   try {
     const response = await $fetch(request, {
       headers: event.context.headers
@@ -16,7 +15,7 @@ export default defineEventHandler(async (event) => {
     if (!token) {
       return {};
     }
-    const user = await $fetch(`${config.apiBaseURL}/account`, {
+    const user = await $fetch(`${config.public.apiBaseURL}/account`, {
       headers: { ...event.context.headers, authorization: `JWT ${token}` }
     });
     if (!user) {

package/dist/runtime/api/account/default-handler.mjs

@@ -1,10 +1,9 @@
 import { cookieHelper } from "@inzombieland/nuxt-common/helpers";
 import { appendHeader, defineEventHandler, readBody } from "h3";
+import { useRuntimeConfig } from "#imports";
 export default defineEventHandler(async (event) => {
-  const config = {
-    apiBaseURL: String(import.meta.env.VITE_API_BASE_URL)
-  };
-  const request = String(config.apiBaseURL) + String(event.node.req.url);
+  const config = useRuntimeConfig();
+  const request = String(config.public.apiBaseURL) + String(event.node.req.url);
   try {
     const body = await readBody(event);
     const response = await $fetch.raw(request, {

package/dist/runtime/api/account/middleware.mjs

@@ -1,9 +1,7 @@
 import { defineEventHandler, getRequestHeader } from "h3";
+import { useRuntimeConfig } from "#imports";
 export default defineEventHandler((event) => {
-  const config = {
-    appClientID: String(import.meta.env.VITE_APP_CLIENT_ID),
-    appClientSecret: String(import.meta.env.VITE_APP_CLIENT_SECRET)
-  };
+  const config = useRuntimeConfig();
   let authorization = "";
   if (import.meta.server && String(config.appClientID) && String(config.appClientSecret)) {
     const credentials = btoa(`${config.appClientID}:${config.appClientSecret}`);

package/dist/runtime/api/account/token.get.mjs

@@ -1,14 +1,13 @@
 import { cookieHelper } from "@inzombieland/nuxt-common/helpers";
 import { appendHeader, defineEventHandler, parseCookies } from "h3";
+import { useRuntimeConfig } from "#imports";
 export default defineEventHandler(async (event) => {
   const cookies = parseCookies(event);
   if (cookies.lin !== "yes") {
     return {};
   }
-  const config = {
-    apiBaseURL: String(import.meta.env.VITE_API_BASE_URL)
-  };
-  const request = String(config.apiBaseURL) + String(event.node.req.url);
+  const config = useRuntimeConfig();
+  const request = String(config.public.apiBaseURL) + String(event.node.req.url);
   try {
     const response = await $fetch.raw(request, {
       headers: event.context.headers

package/dist/runtime/middleware/guest.mjs

@@ -1,11 +1,12 @@
 import { defineNuxtRouteMiddleware, navigateTo } from "#app";
 import { useLocalePath } from "#i18n";
+import { useRuntimeConfig } from "#imports";
 import { useUser } from "../composables/use-user.mjs";
 export default defineNuxtRouteMiddleware(() => {
   const user = useUser();
   if (user.value) {
     const localePath = useLocalePath();
-    const baseURL = String(import.meta.env.VITE_BASE_URL);
+    const baseURL = useRuntimeConfig().public.baseURL ?? "";
     return navigateTo(localePath(baseURL));
   }
 });

package/dist/runtime/middleware/locale.global.mjs

@@ -1,16 +1,12 @@
 import { defineNuxtRouteMiddleware, navigateTo } from "#app";
-import { useCookie } from "#imports";
+import { useCookie, useRuntimeConfig } from "#imports";
 import { useUser } from "../composables/use-user.mjs";
 export default defineNuxtRouteMiddleware((to) => {
   if (import.meta.server) return;
   const user = useUser();
   const { value: localeCookie } = useCookie("locale");
   const locale = user.value?.locale ?? localeCookie ?? "en";
-  const config = {
-    routingStrategy: String(import.meta.env.VITE_ROUTING_STRATEGY),
-    defaultLocale: String(import.meta.env.VITE_DEFAULT_LOCALE)
-  };
-  const { routingStrategy, defaultLocale } = config;
+  const { routingStrategy, defaultLocale } = useRuntimeConfig().public;
   if (routingStrategy === "prefix" && to.path === `/${defaultLocale}` && locale !== defaultLocale) {
     return navigateTo(`/${locale}`);
   }

package/dist/runtime/packages/api/api-client.mjs

@@ -1,4 +1,3 @@
-import { useLocalStorage } from "@vueuse/core";
 import bus from "./bus.mjs";
 import { newCometClient } from "./comet-client.mjs";
 import { getVisitor } from "./get-visitor.mjs";
@@ -26,8 +25,6 @@ export const setToken = (newToken) => {
 export const flush = () => {
   setToken(null);
   setUser(null);
-  const loggedIn = useLocalStorage("lin", "no");
-  loggedIn.value = "no";
 };
 const eventHandler = (requestID, eventName) => {
   return new Promise((resolve, reject) => {
@@ -75,7 +72,7 @@ const errorHandler = (error) => {
   return new Error(message);
 };
 const optionsHandler = (options = {}, config) => {
-  const { apiBaseURL, appClientID, appClientSecret, isMobileApp, isDesktopApp, getHostname } = config;
+  const { appClientID, appClientSecret, isMobileApp, isDesktopApp, getHostname } = config;
   const baseURL = "/api";
   const headers = {};
   const visitor = { platform: "web", hostname: getHostname() };
@@ -86,11 +83,11 @@ const optionsHandler = (options = {}, config) => {
     headers.authorization = `Basic ${credentials}`;
   }
   if (isMobileApp) {
-    options.baseURL = apiBaseURL;
+    options.baseURL = baseURL;
     visitor.platform = "mobile";
   }
   if (isDesktopApp) {
-    options.baseURL = apiBaseURL;
+    options.baseURL = baseURL;
     visitor.platform = "desktop";
   }
   if (typeof window !== "undefined") {

package/dist/runtime/packages/api/get-user.mjs

@@ -43,7 +43,8 @@ async function getUserRequest(fetch, config) {
   try {
     const user2 = await fetch("/account", config.useRequestHeaders?.(["cookie", "authorization"]));
     setUser(user2);
-    return { token, user: user2 };
+    const token2 = getToken();
+    return { token: token2, user: user2 };
   } catch {
     flush();
     return { token: null, user: null };

package/dist/runtime/plugin.mjs

@@ -1,6 +1,6 @@
 import { useLocalStorage } from "@vueuse/core";
 import { addRouteMiddleware, defineNuxtPlugin } from "#app";
-import { useRequestHeaders, useState } from "#imports";
+import { useRequestHeaders, useRuntimeConfig, useState } from "#imports";
 import { fetch, getUser } from "./api/index.mjs";
 import { authMiddleware, guestMiddleware, localeMiddleware } from "./middleware/index.mjs";
 import { flush, setToken, setUser } from "./packages/api/api-client.mjs";
@@ -9,11 +9,9 @@ const useAuth = () => {
   return useState("auth", () => null);
 };
 export default defineNuxtPlugin(async (nuxtApp) => {
-  const config = {
-    ssr: import.meta.env.VITE_IS_SSR === "true"
-  };
   const auth = useAuth();
-  if (config.ssr && import.meta.server || !config.ssr) {
+  const runtimeConfig = useRuntimeConfig();
+  if (runtimeConfig.public.ssr && import.meta.server || !runtimeConfig.public.ssr) {
     flush();
     if (import.meta.server) {
       auth.value = await fetch("/account/0/authcheck", {
@@ -24,7 +22,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       auth.value = await getUser();
     }
   }
-  if (auth.value) {
+  if (auth.value?.token && auth.value?.user) {
     setToken(auth.value.token);
     setUser(auth.value.user);
   }

package/dist/runtime/plugins/device.mjs

@@ -1,9 +1,10 @@
 import { defineNuxtPlugin } from "#app";
-import { useNuxtApp } from "#imports";
+import { useNuxtApp, useRuntimeConfig } from "#imports";
 import { device as currentDevice } from "../packages/api/helpers/index.mjs";
 export default defineNuxtPlugin(() => {
   const device = currentDevice;
-  const isMobileApp = import.meta.env.VITE_IS_MOBILE_APP === "true";
+  const runtimeConfig = useRuntimeConfig();
+  const isMobileApp = Boolean(runtimeConfig.public.isMobileApp);
   return {
     provide: {
       device: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/nuxt-common",
-  "version": "1.16.2",
+  "version": "1.16.4",
   "license": "ISC",
   "type": "module",
   "exports": {