@tanglemedia/svelte-starter-directus-api 0.0.11 → 0.0.12

package/dist/auth.d.ts

@@ -1,8 +1,9 @@
 import type { DirectusClient, RestClient } from '@directus/sdk';
 declare class ApiAuthDirectus {
     private baseURL;
+    private storageMode;
     private directus;
-    constructor(baseURL: string);
+    constructor(baseURL: string, storageMode?: 'json' | 'cookie');
     private init;
     getConfig<T extends object>(): DirectusClient<T> & RestClient<object>;
     refresh<T>(): Promise<T>;

package/dist/auth.js

@@ -1,7 +1,8 @@
 import { authentication, createDirectus, readMe, refresh, rest, updateMe, memoryStorage } from '@directus/sdk';
-import { browser } from '$app/environment';
+import { BROWSER } from 'esm-env';
+import cookie from 'js-cookie';
 const localDirectusStorage = (storageKey = 'access_token_directus') => {
-    if (!browser || !window.localStorage) {
+    if (!BROWSER || !window.localStorage) {
         console.warn('Defaulting to memory storage');
         return memoryStorage();
     }
@@ -21,24 +22,50 @@ const localDirectusStorage = (storageKey = 'access_token_directus') => {
         }
     };
 };
+const cookieDirectusStorage = (cookieKey = 'access_token_directus') => {
+    return {
+        get: async () => {
+            const data = JSON.parse(cookie.get(cookieKey)) || '{}';
+            return data ? data : null;
+        },
+        set: async (value) => {
+            cookie.set(cookieKey, JSON.stringify(value));
+        }
+    };
+};
 const authenticationConfig = {
     storage: localDirectusStorage(),
     autoRefresh: true,
     msRefreshBeforeExpires: 30000,
     credentials: 'include'
 };
+const authenticationCookieConfig = {
+    storage: cookieDirectusStorage(),
+    autoRefresh: true,
+    msRefreshBeforeExpires: 30000,
+    credentials: 'include'
+};
 class ApiAuthDirectus {
     baseURL;
+    storageMode;
     directus;
-    constructor(baseURL) {
+    constructor(baseURL, storageMode = 'json') {
         this.baseURL = baseURL;
+        this.storageMode = storageMode;
         this.init();
     }
     init() {
         try {
-            this.directus = createDirectus(this.baseURL)
-                .with(rest({ credentials: 'include' }))
-                .with(authentication('json', authenticationConfig));
+            if (this.storageMode === 'json') {
+                this.directus = createDirectus(this.baseURL)
+                    .with(rest({ credentials: 'include' }))
+                    .with(authentication('json', authenticationConfig));
+            }
+            else {
+                this.directus = createDirectus(this.baseURL)
+                    .with(rest({ credentials: 'include' }))
+                    .with(authentication('cookie', authenticationCookieConfig));
+            }
         }
         catch (error) {
             console.error(`Error initializing Directus:`, error);

package/dist/client.d.ts

@@ -3,8 +3,9 @@ type BaseApiMethods = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
 type ApiId = string | number;
 declare class ApiClientDirectus implements ApiAdapterInterface {
     private baseURL;
+    private storageMode;
     private directus;
-    constructor(baseURL: string);
+    constructor(baseURL: string, storageMode?: 'json' | 'cookie');
     private init;
     getConfig<T extends object>(configuration?: unknown): BaseApiAdapterConfig;
     request<T>(method: BaseApiMethods, url: string, query?: Record<string, unknown>): Promise<T>;

package/dist/client.js

@@ -1,5 +1,6 @@
 import { aggregate, authentication, createDirectus, createItem, deleteItem, readItem, readItems, rest, updateItem, uploadFiles, memoryStorage } from '@directus/sdk';
 import { browser } from '$app/environment';
+import cookie from 'js-cookie';
 const localDirectusStorage = (storageKey = 'access_token_directus') => {
     if (!browser || !window.localStorage) {
         console.warn('Defaulting to memory storage');
@@ -21,24 +22,50 @@ const localDirectusStorage = (storageKey = 'access_token_directus') => {
         }
     };
 };
+const cookieDirectusStorage = (cookieKey = 'access_token_directus') => {
+    return {
+        get: async () => {
+            const data = JSON.parse(cookie.get(cookieKey)) || '{}';
+            return data ? data : null;
+        },
+        set: async (value) => {
+            cookie.set(cookieKey, JSON.stringify(value));
+        }
+    };
+};
 const authenticationConfig = {
     storage: localDirectusStorage(),
     autoRefresh: true,
     msRefreshBeforeExpires: 30000,
     credentials: 'include'
 };
+const authenticationCookieConfig = {
+    storage: cookieDirectusStorage(),
+    autoRefresh: true,
+    msRefreshBeforeExpires: 30000,
+    credentials: 'include'
+};
 class ApiClientDirectus {
     baseURL;
+    storageMode;
     directus;
-    constructor(baseURL) {
+    constructor(baseURL, storageMode = 'json') {
         this.baseURL = baseURL;
+        this.storageMode = storageMode;
         this.init();
     }
     init() {
         try {
-            this.directus = createDirectus(this.baseURL)
-                .with(rest({ credentials: 'include' }))
-                .with(authentication('json', authenticationConfig));
+            if (this.storageMode === 'json') {
+                this.directus = createDirectus(this.baseURL)
+                    .with(rest({ credentials: 'include' }))
+                    .with(authentication('json', authenticationConfig));
+            }
+            else {
+                this.directus = createDirectus(this.baseURL)
+                    .with(rest({ credentials: 'include' }))
+                    .with(authentication('cookie', authenticationCookieConfig));
+            }
         }
         catch (error) {
             console.error(`Error initializing Directus:`, error);

package/dist/load-directus-api-povider.d.ts

@@ -1,9 +1,10 @@
 import { type ApiAdapterProviderInterface, type ApiAdapterInterface, type ApiAdapterRequestConfig, type BaseApiAdapterConfig, type Config, type ApiConfigSchema } from '@tanglemedia/svelte-starter-core';
 declare class LoadDirectusApiProvider implements ApiAdapterProviderInterface {
     private readonly configLoader;
+    private storageMode;
     constructor(configLoader: () => Promise<Config<{
         api?: ApiConfigSchema;
-    }>>);
+    }>>, storageMode?: 'json' | 'cookie');
     loadAdapter(key?: string | undefined): Promise<ApiAdapterInterface<BaseApiAdapterConfig, ApiAdapterRequestConfig, string>>;
 }
 export { LoadDirectusApiProvider };

package/dist/load-directus-api-povider.js

@@ -3,8 +3,10 @@ import { ApiStaticDirectus } from './static';
 import {} from '@tanglemedia/svelte-starter-core';
 class LoadDirectusApiProvider {
     configLoader;
-    constructor(configLoader) {
+    storageMode;
+    constructor(configLoader, storageMode = 'json') {
         this.configLoader = configLoader;
+        this.storageMode = storageMode;
     }
     async loadAdapter(key) {
         const conf = await this.configLoader();
@@ -21,7 +23,7 @@ class LoadDirectusApiProvider {
             if (directusType === 'client') {
                 const protocol = config(`api.adapters.${apiAdapterKey}.protocol`) || '';
                 const host = config(`api.adapters.${apiAdapterKey}.host`) || '';
-                return new ApiClientDirectus(`${protocol}://${host}`.trim());
+                return new ApiClientDirectus(`${protocol}://${host}`.trim(), this.storageMode);
             }
             else {
                 console.log('static');
@@ -35,7 +37,7 @@ class LoadDirectusApiProvider {
             console.log('client');
             const protocol = config(`api.adapters.${apiAdapterKey}.protocol`) || '';
             const host = config(`api.adapters.${apiAdapterKey}.host`) || '';
-            return new ApiClientDirectus(`${protocol}://${host}`.trim());
+            return new ApiClientDirectus(`${protocol}://${host}`.trim(), this.storageMode);
         }
         console.log('This should be unreachable');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanglemedia/svelte-starter-directus-api",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "description": "directus API wrapper for all the directus sdk functionality",
@@ -28,6 +28,7 @@
     "@testing-library/jest-dom": "^6.2.0",
     "@testing-library/svelte": "^4.0.5",
     "@vitest/coverage-v8": "^1.2.0",
+    "js-cookie": "^3.0.5",
     "jsdom": "^23.2.0",
     "msw": "^2.1.0",
     "svelte": "^4.2.8",
@@ -38,6 +39,7 @@
   },
   "dependencies": {
     "@directus/sdk": "^14.0.0",
+    "esm-env": "^1.0.0",
     "@tanglemedia/svelte-starter-core": "0.0.15"
   },
   "peerDependencies": {
@@ -50,6 +52,8 @@
     "lint": "prettier --check --ignore-path=../../.prettierignore . && eslint \".\" --ignore-path=../../.prettierignore",
     "format": "prettier --write --ignore-path=../../.prettierignore . && eslint \".\" --ignore-path=../../.prettierignore",
     "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
+    "test": "vitest",
+    "test:debug": "vitest --test-timeout=0 --reporter=verbose --coverage",
     "clean": "rimraf ./dist && rimraf ./coverage"
   }
 }

package/src/auth.ts

@@ -1,4 +1,4 @@
-import type { AuthenticationConfig, AuthenticationData } from '@directus/sdk';
+import type { AuthenticationClient, AuthenticationConfig, AuthenticationData } from '@directus/sdk';
 import {
   authentication,
   createDirectus,
@@ -11,10 +11,12 @@ import {
 
 import type { DirectusClient, RestClient } from '@directus/sdk';
 
-import { browser } from '$app/environment';
+import { BROWSER } from 'esm-env';
+
+import cookie from 'js-cookie';
 
 const localDirectusStorage = (storageKey: string = 'access_token_directus') => {
-  if (!browser || !window.localStorage) {
+  if (!BROWSER || !window.localStorage) {
     console.warn('Defaulting to memory storage');
     return memoryStorage();
   }
@@ -36,6 +38,19 @@ const localDirectusStorage = (storageKey: string = 'access_token_directus') => {
   };
 };
 
+const cookieDirectusStorage = (cookieKey: string = 'access_token_directus') => {
+  return {
+    get: async (): Promise<AuthenticationData | null> => {
+      const data = JSON.parse(cookie.get(cookieKey)) || '{}';
+      return data ? (data as AuthenticationData) : null;
+
+    },
+    set: async (value: AuthenticationData | null): Promise<void> => {
+      cookie.set(cookieKey, JSON.stringify(value))
+    }
+  };
+}
+
 const authenticationConfig: AuthenticationConfig = {
   storage: localDirectusStorage(),
   autoRefresh: true,
@@ -43,20 +58,35 @@ const authenticationConfig: AuthenticationConfig = {
   credentials: 'include'
 };
 
+const authenticationCookieConfig: AuthenticationConfig = {
+  storage: cookieDirectusStorage(),
+  autoRefresh: true,
+  msRefreshBeforeExpires: 30000,
+  credentials: 'include'
+};
+
 class ApiAuthDirectus {
   private baseURL: string;
-  private directus: DirectusClient<object> & RestClient<object>;
+  private storageMode: 'json' | 'cookie';
+  private directus: DirectusClient<object> & RestClient<object> & AuthenticationClient<object>;
 
-  constructor(baseURL: string) {
+  constructor(baseURL: string, storageMode: 'json' | 'cookie' = 'json') {
     this.baseURL = baseURL;
+    this.storageMode = storageMode;
     this.init();
   }
 
   private init<T extends object>(): void {
     try {
-      this.directus = createDirectus<T>(this.baseURL)
+      if(this.storageMode === 'json'){
+        this.directus = createDirectus<T>(this.baseURL)
         .with(rest({ credentials: 'include' }))
         .with(authentication('json', authenticationConfig));
+      }else {
+        this.directus = createDirectus<T>(this.baseURL)
+        .with(rest({ credentials: 'include' }))
+        .with(authentication('cookie', authenticationCookieConfig));
+      }
     } catch (error) {
       console.error(`Error initializing Directus:`, error);
       throw error;

package/src/client.ts

@@ -22,6 +22,8 @@ import type {
 
 import { browser } from '$app/environment';
 
+import cookie from 'js-cookie';
+
 const localDirectusStorage = (storageKey: string = 'access_token_directus') => {
   if (!browser || !window.localStorage) {
     console.warn('Defaulting to memory storage');
@@ -45,6 +47,19 @@ const localDirectusStorage = (storageKey: string = 'access_token_directus') => {
   };
 };
 
+const cookieDirectusStorage = (cookieKey: string = 'access_token_directus') => {
+  return {
+    get: async (): Promise<AuthenticationData | null> => {
+      const data = JSON.parse(cookie.get(cookieKey)) || '{}';
+      return data ? (data as AuthenticationData) : null;
+
+    },
+    set: async (value: AuthenticationData | null): Promise<void> => {
+      cookie.set(cookieKey, JSON.stringify(value))
+    }
+  };
+}
+
 const authenticationConfig: AuthenticationConfig = {
   storage: localDirectusStorage(),
   autoRefresh: true,
@@ -52,24 +67,39 @@ const authenticationConfig: AuthenticationConfig = {
   credentials: 'include'
 };
 
+const authenticationCookieConfig: AuthenticationConfig = {
+  storage: cookieDirectusStorage(),
+  autoRefresh: true,
+  msRefreshBeforeExpires: 30000,
+  credentials: 'include'
+};
+
 type BaseApiMethods = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
 
 type ApiId = string | number;
 
 class ApiClientDirectus implements ApiAdapterInterface {
   private baseURL: string;
+  private storageMode: 'json' | 'cookie';
   private directus: DirectusClient<object> & RestClient<object>;
 
-  constructor(baseURL: string) {
+  constructor(baseURL: string, storageMode: 'json' | 'cookie' = 'json') {
     this.baseURL = baseURL;
+    this.storageMode = storageMode;
     this.init();
   }
 
   private init<T extends object>(): void {
     try {
-      this.directus = createDirectus<T>(this.baseURL)
+      if(this.storageMode === 'json'){
+        this.directus = createDirectus<T>(this.baseURL)
         .with(rest({ credentials: 'include' }))
         .with(authentication('json', authenticationConfig));
+      }else {
+        this.directus = createDirectus<T>(this.baseURL)
+        .with(rest({ credentials: 'include' }))
+        .with(authentication('cookie', authenticationCookieConfig));
+      }
     } catch (error) {
       console.error(`Error initializing Directus:`, error);
       throw error;

package/src/load-directus-api-povider.ts

@@ -10,7 +10,7 @@ import {
 } from '@tanglemedia/svelte-starter-core';
 
 class LoadDirectusApiProvider implements ApiAdapterProviderInterface {
-  constructor(private readonly configLoader: () => Promise<Config<{ api?: ApiConfigSchema }>>) {}
+  constructor(private readonly configLoader: () => Promise<Config<{ api?: ApiConfigSchema }>>, private storageMode: 'json' | 'cookie' = 'json') {}
 
   async loadAdapter(
     key?: string | undefined
@@ -31,7 +31,7 @@ class LoadDirectusApiProvider implements ApiAdapterProviderInterface {
       if (directusType === 'client') {
         const protocol: string = config(`api.adapters.${apiAdapterKey}.protocol`) || '';
         const host: string = config(`api.adapters.${apiAdapterKey}.host`) || '';
-        return new ApiClientDirectus(`${protocol}://${host}`.trim());
+        return new ApiClientDirectus(`${protocol}://${host}`.trim(), this.storageMode);
       } else {
         console.log('static');
         const protocol: string = config(`api.adapters.${apiAdapterKey}.protocol`) || '';
@@ -43,7 +43,7 @@ class LoadDirectusApiProvider implements ApiAdapterProviderInterface {
       console.log('client');
       const protocol: string = config(`api.adapters.${apiAdapterKey}.protocol`) || '';
       const host: string = config(`api.adapters.${apiAdapterKey}.host`) || '';
-      return new ApiClientDirectus(`${protocol}://${host}`.trim());
+      return new ApiClientDirectus(`${protocol}://${host}`.trim(), this.storageMode);
     }
 
     console.log('This should be unreachable');