nuxt-directus-sdk 5.0.0-beta.5 → 5.0.0-beta.7

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-directus-sdk",
-  "version": "5.0.0-beta.5",
+  "version": "5.0.0-beta.7",
   "configKey": "directus",
   "compatibility": {
     "nuxt": "^4.0.0"

package/dist/module.mjs

@@ -1,4 +1,4 @@
-import { useLogger, defineNuxtModule, createResolver, addServerHandler, addPlugin, addRouteMiddleware, addImportsDir, addComponentsDir, addImportsSources, addTypeTemplate, hasNuxtModule, installModule } from '@nuxt/kit';
+import { useLogger, defineNuxtModule, createResolver, addServerHandler, addPlugin, tryResolveModule, addRouteMiddleware, addImportsDir, addComponentsDir, addImportsSources, addTypeTemplate, hasNuxtModule, installModule } from '@nuxt/kit';
 import { colors } from 'consola/utils';
 import { defu } from 'defu';
 import { joinURL } from 'ufo';
@@ -6,7 +6,7 @@ import { generateTypes } from '../dist/runtime/types/index.js';
 import { useUrl } from '../dist/runtime/utils/index.js';
 
 const name = "nuxt-directus-sdk";
-const version = "5.0.0-beta.5";
+const version = "5.0.0-beta.7";
 
 const configKey = "directus";
 const logger = useLogger("nuxt-directus-sdk");
@@ -155,7 +155,10 @@ const module = defineNuxtModule({
       });
     }
     addPlugin(resolver.resolve("./runtime/plugin"));
-    addPlugin(resolver.resolve("./runtime/plugins/visual-editor.client"));
+    const hasVisualEditing = options.visualEditor && await tryResolveModule("@directus/visual-editing", new URL(import.meta.url));
+    if (hasVisualEditing) {
+      addPlugin(resolver.resolve("./runtime/plugins/visual-editor.client"));
+    }
     addRouteMiddleware({
       name: "auth",
       path: resolver.resolve("./runtime/middleware/auth"),
@@ -166,12 +169,14 @@ const module = defineNuxtModule({
       path: resolver.resolve("./runtime/middleware/guest")
     });
     addImportsDir(resolver.resolve("./runtime/composables"));
-    addComponentsDir({
-      path: resolver.resolve("./runtime/components"),
-      pathPrefix: false,
-      prefix: "",
-      global: true
-    });
+    if (hasVisualEditing) {
+      addComponentsDir({
+        path: resolver.resolve("./runtime/components"),
+        pathPrefix: false,
+        prefix: "",
+        global: true
+      });
+    }
     const directusSdkImports = {
       from: "@directus/sdk",
       imports: [

package/dist/runtime/composables/auth.d.ts

@@ -10,7 +10,7 @@ export interface DirectusAuth {
     login: (email: string, password: string, options?: LoginOptions & {
         redirect?: boolean | RouteLocationRaw;
     }) => Promise<DirectusUser | null>;
-    loginWithProvider: (provider: string, redirectOnLogin?: string) => Promise<void>;
+    loginWithProvider: (provider: string, redirectOnLogin?: boolean | string) => Promise<void>;
     logout: (redirect?: boolean | RouteLocationRaw) => Promise<void>;
     createUser: (data: RegisterUserInput & Partial<Omit<DirectusUser, 'id' | 'email' | 'password'>>) => Promise<Omit<DirectusUser, 'last_access'>>;
     register: (data: RegisterUserInput & Partial<Omit<DirectusUser, 'id' | 'email' | 'password'>>) => Promise<Omit<DirectusUser, 'last_access'>>;

package/dist/runtime/composables/auth.js

@@ -1,5 +1,5 @@
 import { navigateTo, useRouter, useRuntimeConfig } from "#app";
-import { computed, useState } from "#imports";
+import { computed, useRequestURL, useState } from "#imports";
 import {
   acceptUserInvite as directusAcceptUserInvite,
   createUser as directusCreateUser,
@@ -9,6 +9,7 @@ import {
   readMe as directusReadMe,
   updateMe as directusUpdateMe
 } from "@directus/sdk";
+import { joinURL, withoutTrailingSlash } from "ufo";
 import { useDirectus, useDirectusOriginUrl } from "./directus.js";
 export function useDirectusUser() {
   return useState("directus.user", () => null);
@@ -57,18 +58,28 @@ export function useDirectusAuth() {
     if (redirect !== false) {
       const route = router.currentRoute.value;
       if (typeof redirect !== "boolean") {
-        navigateTo(redirect);
+        await navigateTo(redirect);
       } else if (route?.query?.redirect) {
-        navigateTo({ path: decodeURIComponent(route.query.redirect) });
+        await navigateTo({ path: decodeURIComponent(route.query.redirect) });
       } else {
-        navigateTo(config.public.directus.auth?.redirect?.home ?? "/");
+        await navigateTo(config.public.directus.auth?.redirect?.home ?? "/");
       }
     }
     return user.value;
   }
-  async function loginWithProvider(provider, redirectOnLogin) {
-    const redirect = `${window.location.origin}${redirectOnLogin ?? router.currentRoute.value.fullPath}`;
-    await navigateTo(useDirectusOriginUrl(`/auth/login/${provider}?redirect=${encodeURIComponent(redirect)}`), { external: true });
+  async function loginWithProvider(provider, redirectOnLogin = true) {
+    const { origin, href } = useRequestURL();
+    let redirectPath;
+    if (typeof redirectOnLogin === "boolean") {
+      redirectPath = redirectOnLogin ? config.public.directus.auth.redirect.login : href;
+    } else if (redirectOnLogin) {
+      redirectPath = redirectOnLogin;
+    } else {
+      redirectPath = href;
+    }
+    const redirect = joinURL(origin, redirectPath);
+    const sanitizedRedirect = withoutTrailingSlash(redirect);
+    await navigateTo(useDirectusOriginUrl(`/auth/login/${provider}?redirect=${encodeURIComponent(sanitizedRedirect)}`), { external: true });
   }
   async function createUser(data) {
     const response = await directus.request(directusCreateUser(data));
@@ -96,7 +107,7 @@ export function useDirectusAuth() {
       user.value = null;
     }
     if (redirect) {
-      const defaultRedirect = config.public.directus.auth?.redirect?.logout ?? config.public.directus.auth?.redirect?.home ?? "/";
+      const defaultRedirect = config.public.directus.auth?.redirect?.logout ?? config.public.directus.auth?.redirect?.login ?? "/";
       const redirectTo = typeof redirect === "boolean" ? defaultRedirect : redirect;
       await navigateTo(redirectTo);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-directus-sdk",
   "type": "module",
-  "version": "5.0.0-beta.5",
+  "version": "5.0.0-beta.7",
   "description": "A Directus nuxt module that uses the Directus SDK",
   "author": "Matthew Rollinson <matt@rolley.io>",
   "license": "MIT",
@@ -28,7 +28,7 @@
     "dev:build": "nuxi build playground",
     "dev:prepare": "nuxt-module-build --stub && nuxi prepare playground",
     "release": "npm run lint && npm run prepack && npm publish && git push --follow-tags",
-    "lint": "eslint .",
+    "lint": "eslint . --fix",
     "test": "vitest run",
     "test:watch": "vitest watch",
     "docs:dev": "bun run dev:prepare && vitepress dev docs",
@@ -36,12 +36,15 @@
     "docs:preview": "vitepress preview docs"
   },
   "peerDependencies": {
-    "@directus/sdk": "^20.0.0",
-    "@directus/types": "^13.0.0",
-    "@directus/visual-editing": "^1.1.0",
-    "@nuxt/image": "^2.0.0"
+    "@directus/sdk": ">=20.0.0",
+    "@directus/types": ">=13.0.0",
+    "@directus/visual-editing": ">=1.1.0",
+    "@nuxt/image": ">=2.0.0"
   },
   "peerDependenciesMeta": {
+    "@directus/types": {
+      "optional": true
+    },
     "@directus/visual-editing": {
       "optional": true
     },