@bagelink/auth 1.1.43 → 1.1.47

package/dist/index.cjs

@@ -1,11 +1,22 @@
 'use strict';
 
 const axios = require('axios');
+const vue = require('vue');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const axios__default = /*#__PURE__*/_interopDefaultCompat(axios);
 
+function createAxiosInstance(baseURL = "") {
+  return axios__default.create({
+    baseURL: baseURL || "",
+    headers: {
+      "Content-Type": "application/json",
+      "withCredentials": true
+    }
+  });
+}
+
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => {
@@ -13,14 +24,9 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 class AuthApi {
-  constructor(baseURL) {
+  constructor(axiosInstance, baseURL = "") {
     __publicField(this, "api");
-    this.api = axios__default.create({
-      baseURL,
-      headers: {
-        "Content-Type": "application/json"
-      }
-    });
+    this.api = axiosInstance || createAxiosInstance(baseURL);
     this.setupInterceptors();
   }
   setupInterceptors() {
@@ -76,13 +82,17 @@ class AuthApi {
     return this.api.patch("/users/me", user);
   }
   async setUserStatus(userId, isActive) {
-    return this.api.patch(`/users/${userId}`, { is_active: isActive });
+    return this.api.patch(`/users/${userId}`, {
+      is_active: isActive
+    });
   }
   async deleteUser(userId) {
     return this.api.delete(`/users/${userId}`);
   }
   async getUsers(limit = 100, skip) {
-    return this.api.get("/users/", { params: { skip, limit } });
+    return this.api.get("/users/", {
+      params: { skip, limit }
+    });
   }
   async createUser(user) {
     return this.api.post("/users/", user);
@@ -93,22 +103,20 @@ class AuthApi {
 }
 
 let authApi = null;
-const currentUser = {
-  value: {
-    id: "",
-    email: "",
-    first_name: "",
-    last_name: "",
-    is_superuser: false,
-    is_active: false
-  },
-  set: (newValue) => {
-    currentUser.value = newValue;
-  }
-};
-function initAuth(baseURL) {
+const currentUser = vue.ref({
+  id: "",
+  email: "",
+  first_name: "",
+  last_name: "",
+  is_superuser: false,
+  is_active: false
+});
+function initAuth({
+  axios,
+  baseURL
+}) {
   if (!authApi) {
-    authApi = new AuthApi(baseURL);
+    authApi = new AuthApi(axios, baseURL);
   }
   return {
     install(app) {
@@ -131,7 +139,10 @@ function useAuth() {
   }
   async function login(credentials) {
     try {
-      await authApi.login(credentials.email.toLowerCase(), credentials.password);
+      await authApi.login(
+        credentials.email.toLowerCase(),
+        credentials.password
+      );
       await checkAuth();
     } catch (error) {
       throw error;
@@ -141,7 +152,7 @@ function useAuth() {
     try {
       if (!getIsLoggedIn()) {
         const { data } = await authApi.getCurrentUser();
-        currentUser.set(data);
+        currentUser.value = data;
       }
     } catch (error) {
       return false;
@@ -154,7 +165,7 @@ function useAuth() {
         throw new Error("Passwords do not match");
       }
       const { data } = await authApi.signup(user);
-      currentUser.set(data);
+      currentUser.value = data;
     } catch (error) {
       throw error;
     }
@@ -186,7 +197,7 @@ function useAuth() {
   async function updateProfile(user) {
     try {
       const { data } = await authApi.updateUserProfile(user);
-      currentUser.set({ ...currentUser.value, ...data });
+      currentUser.value = { ...currentUser.value, ...data };
     } catch (error) {
       throw error;
     }

package/dist/index.d.cts

@@ -1,4 +1,5 @@
-import { AxiosResponse } from 'axios';
+import { AxiosResponse, AxiosInstance } from 'axios';
+import * as vue from 'vue';
 import { App } from 'vue';
 
 interface User {
@@ -23,12 +24,6 @@ interface UpdatePasswordForm {
     new_password: string;
     confirmNewPassword: string;
 }
-interface ReactiveFactory {
-    <T>(initial: T): {
-        value: T;
-        set: (newValue: T) => void;
-    };
-}
 interface Token {
     access_token: string;
 }
@@ -89,7 +84,7 @@ type SignupResponse = AxiosResponse<SanitizedUserOut>;
 
 declare class AuthApi {
     private api;
-    constructor(baseURL?: string);
+    constructor(axiosInstance?: AxiosInstance, baseURL?: string);
     private setupInterceptors;
     login(username: string, password: string): Promise<LoginResponse>;
     logout(): void;
@@ -106,14 +101,28 @@ declare class AuthApi {
     getUser(userId: string): Promise<GetUserResponse>;
 }
 
-declare function initAuth(baseURL?: string): {
+declare function initAuth({ axios, baseURL, }: {
+    axios: AxiosInstance;
+    baseURL?: string;
+}): {
     install(app: App): void;
 };
 declare function useAuth(): {
-    currentUser: {
-        value: User;
-        set: (newValue: User) => void;
-    };
+    currentUser: vue.Ref<{
+        id: string;
+        email: string;
+        first_name?: string | undefined;
+        last_name?: string | undefined;
+        is_superuser?: boolean | undefined;
+        is_active?: boolean | undefined;
+    }, User | {
+        id: string;
+        email: string;
+        first_name?: string | undefined;
+        last_name?: string | undefined;
+        is_superuser?: boolean | undefined;
+        is_active?: boolean | undefined;
+    }>;
     getFullName: () => string;
     getIsLoggedIn: () => boolean;
     logout: () => Promise<void>;
@@ -131,4 +140,4 @@ declare function useAuth(): {
     deleteUser: (userId: string) => Promise<void>;
 };
 
-export { AuthApi, type CreateUserResponse, type DeleteUserResponse, type GetMeResponse, type GetUserResponse, type GetUsersResponse, type LoginResponse, type NewPassword, type NewUser, type PasswordRecovery, type PasswordRecoveryResponse, type ReactiveFactory, type ResetPasswordResponse, type SanitizedUserList, type SanitizedUserOut, type SignupResponse, type Token, type UpdateMeResponse, type UpdatePassword, type UpdatePasswordForm, type UpdatePasswordResponse, type UpdateUserResponse, type User, type UserCreate, type UserRegister, type UserUpdate, type UserUpdateMe, initAuth, useAuth };
+export { AuthApi, type CreateUserResponse, type DeleteUserResponse, type GetMeResponse, type GetUserResponse, type GetUsersResponse, type LoginResponse, type NewPassword, type NewUser, type PasswordRecovery, type PasswordRecoveryResponse, type ResetPasswordResponse, type SanitizedUserList, type SanitizedUserOut, type SignupResponse, type Token, type UpdateMeResponse, type UpdatePassword, type UpdatePasswordForm, type UpdatePasswordResponse, type UpdateUserResponse, type User, type UserCreate, type UserRegister, type UserUpdate, type UserUpdateMe, initAuth, useAuth };

package/dist/index.d.mts

@@ -1,4 +1,5 @@
-import { AxiosResponse } from 'axios';
+import { AxiosResponse, AxiosInstance } from 'axios';
+import * as vue from 'vue';
 import { App } from 'vue';
 
 interface User {
@@ -23,12 +24,6 @@ interface UpdatePasswordForm {
     new_password: string;
     confirmNewPassword: string;
 }
-interface ReactiveFactory {
-    <T>(initial: T): {
-        value: T;
-        set: (newValue: T) => void;
-    };
-}
 interface Token {
     access_token: string;
 }
@@ -89,7 +84,7 @@ type SignupResponse = AxiosResponse<SanitizedUserOut>;
 
 declare class AuthApi {
     private api;
-    constructor(baseURL?: string);
+    constructor(axiosInstance?: AxiosInstance, baseURL?: string);
     private setupInterceptors;
     login(username: string, password: string): Promise<LoginResponse>;
     logout(): void;
@@ -106,14 +101,28 @@ declare class AuthApi {
     getUser(userId: string): Promise<GetUserResponse>;
 }
 
-declare function initAuth(baseURL?: string): {
+declare function initAuth({ axios, baseURL, }: {
+    axios: AxiosInstance;
+    baseURL?: string;
+}): {
     install(app: App): void;
 };
 declare function useAuth(): {
-    currentUser: {
-        value: User;
-        set: (newValue: User) => void;
-    };
+    currentUser: vue.Ref<{
+        id: string;
+        email: string;
+        first_name?: string | undefined;
+        last_name?: string | undefined;
+        is_superuser?: boolean | undefined;
+        is_active?: boolean | undefined;
+    }, User | {
+        id: string;
+        email: string;
+        first_name?: string | undefined;
+        last_name?: string | undefined;
+        is_superuser?: boolean | undefined;
+        is_active?: boolean | undefined;
+    }>;
     getFullName: () => string;
     getIsLoggedIn: () => boolean;
     logout: () => Promise<void>;
@@ -131,4 +140,4 @@ declare function useAuth(): {
     deleteUser: (userId: string) => Promise<void>;
 };
 
-export { AuthApi, type CreateUserResponse, type DeleteUserResponse, type GetMeResponse, type GetUserResponse, type GetUsersResponse, type LoginResponse, type NewPassword, type NewUser, type PasswordRecovery, type PasswordRecoveryResponse, type ReactiveFactory, type ResetPasswordResponse, type SanitizedUserList, type SanitizedUserOut, type SignupResponse, type Token, type UpdateMeResponse, type UpdatePassword, type UpdatePasswordForm, type UpdatePasswordResponse, type UpdateUserResponse, type User, type UserCreate, type UserRegister, type UserUpdate, type UserUpdateMe, initAuth, useAuth };
+export { AuthApi, type CreateUserResponse, type DeleteUserResponse, type GetMeResponse, type GetUserResponse, type GetUsersResponse, type LoginResponse, type NewPassword, type NewUser, type PasswordRecovery, type PasswordRecoveryResponse, type ResetPasswordResponse, type SanitizedUserList, type SanitizedUserOut, type SignupResponse, type Token, type UpdateMeResponse, type UpdatePassword, type UpdatePasswordForm, type UpdatePasswordResponse, type UpdateUserResponse, type User, type UserCreate, type UserRegister, type UserUpdate, type UserUpdateMe, initAuth, useAuth };

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import { AxiosResponse } from 'axios';
+import { AxiosResponse, AxiosInstance } from 'axios';
+import * as vue from 'vue';
 import { App } from 'vue';
 
 interface User {
@@ -23,12 +24,6 @@ interface UpdatePasswordForm {
     new_password: string;
     confirmNewPassword: string;
 }
-interface ReactiveFactory {
-    <T>(initial: T): {
-        value: T;
-        set: (newValue: T) => void;
-    };
-}
 interface Token {
     access_token: string;
 }
@@ -89,7 +84,7 @@ type SignupResponse = AxiosResponse<SanitizedUserOut>;
 
 declare class AuthApi {
     private api;
-    constructor(baseURL?: string);
+    constructor(axiosInstance?: AxiosInstance, baseURL?: string);
     private setupInterceptors;
     login(username: string, password: string): Promise<LoginResponse>;
     logout(): void;
@@ -106,14 +101,28 @@ declare class AuthApi {
     getUser(userId: string): Promise<GetUserResponse>;
 }
 
-declare function initAuth(baseURL?: string): {
+declare function initAuth({ axios, baseURL, }: {
+    axios: AxiosInstance;
+    baseURL?: string;
+}): {
     install(app: App): void;
 };
 declare function useAuth(): {
-    currentUser: {
-        value: User;
-        set: (newValue: User) => void;
-    };
+    currentUser: vue.Ref<{
+        id: string;
+        email: string;
+        first_name?: string | undefined;
+        last_name?: string | undefined;
+        is_superuser?: boolean | undefined;
+        is_active?: boolean | undefined;
+    }, User | {
+        id: string;
+        email: string;
+        first_name?: string | undefined;
+        last_name?: string | undefined;
+        is_superuser?: boolean | undefined;
+        is_active?: boolean | undefined;
+    }>;
     getFullName: () => string;
     getIsLoggedIn: () => boolean;
     logout: () => Promise<void>;
@@ -131,4 +140,4 @@ declare function useAuth(): {
     deleteUser: (userId: string) => Promise<void>;
 };
 
-export { AuthApi, type CreateUserResponse, type DeleteUserResponse, type GetMeResponse, type GetUserResponse, type GetUsersResponse, type LoginResponse, type NewPassword, type NewUser, type PasswordRecovery, type PasswordRecoveryResponse, type ReactiveFactory, type ResetPasswordResponse, type SanitizedUserList, type SanitizedUserOut, type SignupResponse, type Token, type UpdateMeResponse, type UpdatePassword, type UpdatePasswordForm, type UpdatePasswordResponse, type UpdateUserResponse, type User, type UserCreate, type UserRegister, type UserUpdate, type UserUpdateMe, initAuth, useAuth };
+export { AuthApi, type CreateUserResponse, type DeleteUserResponse, type GetMeResponse, type GetUserResponse, type GetUsersResponse, type LoginResponse, type NewPassword, type NewUser, type PasswordRecovery, type PasswordRecoveryResponse, type ResetPasswordResponse, type SanitizedUserList, type SanitizedUserOut, type SignupResponse, type Token, type UpdateMeResponse, type UpdatePassword, type UpdatePasswordForm, type UpdatePasswordResponse, type UpdateUserResponse, type User, type UserCreate, type UserRegister, type UserUpdate, type UserUpdateMe, initAuth, useAuth };

package/dist/index.mjs

@@ -1,4 +1,15 @@
 import axios from 'axios';
+import { ref } from 'vue';
+
+function createAxiosInstance(baseURL = "") {
+  return axios.create({
+    baseURL: baseURL || "",
+    headers: {
+      "Content-Type": "application/json",
+      "withCredentials": true
+    }
+  });
+}
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -7,14 +18,9 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 class AuthApi {
-  constructor(baseURL) {
+  constructor(axiosInstance, baseURL = "") {
     __publicField(this, "api");
-    this.api = axios.create({
-      baseURL,
-      headers: {
-        "Content-Type": "application/json"
-      }
-    });
+    this.api = axiosInstance || createAxiosInstance(baseURL);
     this.setupInterceptors();
   }
   setupInterceptors() {
@@ -70,13 +76,17 @@ class AuthApi {
     return this.api.patch("/users/me", user);
   }
   async setUserStatus(userId, isActive) {
-    return this.api.patch(`/users/${userId}`, { is_active: isActive });
+    return this.api.patch(`/users/${userId}`, {
+      is_active: isActive
+    });
   }
   async deleteUser(userId) {
     return this.api.delete(`/users/${userId}`);
   }
   async getUsers(limit = 100, skip) {
-    return this.api.get("/users/", { params: { skip, limit } });
+    return this.api.get("/users/", {
+      params: { skip, limit }
+    });
   }
   async createUser(user) {
     return this.api.post("/users/", user);
@@ -87,22 +97,20 @@ class AuthApi {
 }
 
 let authApi = null;
-const currentUser = {
-  value: {
-    id: "",
-    email: "",
-    first_name: "",
-    last_name: "",
-    is_superuser: false,
-    is_active: false
-  },
-  set: (newValue) => {
-    currentUser.value = newValue;
-  }
-};
-function initAuth(baseURL) {
+const currentUser = ref({
+  id: "",
+  email: "",
+  first_name: "",
+  last_name: "",
+  is_superuser: false,
+  is_active: false
+});
+function initAuth({
+  axios,
+  baseURL
+}) {
   if (!authApi) {
-    authApi = new AuthApi(baseURL);
+    authApi = new AuthApi(axios, baseURL);
   }
   return {
     install(app) {
@@ -125,7 +133,10 @@ function useAuth() {
   }
   async function login(credentials) {
     try {
-      await authApi.login(credentials.email.toLowerCase(), credentials.password);
+      await authApi.login(
+        credentials.email.toLowerCase(),
+        credentials.password
+      );
       await checkAuth();
     } catch (error) {
       throw error;
@@ -135,7 +146,7 @@ function useAuth() {
     try {
       if (!getIsLoggedIn()) {
         const { data } = await authApi.getCurrentUser();
-        currentUser.set(data);
+        currentUser.value = data;
       }
     } catch (error) {
       return false;
@@ -148,7 +159,7 @@ function useAuth() {
         throw new Error("Passwords do not match");
       }
       const { data } = await authApi.signup(user);
-      currentUser.set(data);
+      currentUser.value = data;
     } catch (error) {
       throw error;
     }
@@ -180,7 +191,7 @@ function useAuth() {
   async function updateProfile(user) {
     try {
       const { data } = await authApi.updateUserProfile(user);
-      currentUser.set({ ...currentUser.value, ...data });
+      currentUser.value = { ...currentUser.value, ...data };
     } catch (error) {
       throw error;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/auth",
   "type": "module",
-  "version": "1.1.43",
+  "version": "1.1.47",
   "description": "Bagelink auth package",
   "author": {
     "name": "Bagel Studio",

package/src/{api/auth.ts → api.ts}

@@ -1,4 +1,4 @@
-import type { InternalAxiosRequestConfig } from 'axios'
+import type { AxiosInstance, InternalAxiosRequestConfig } from 'axios'
 import type {
 	User,
 	NewUser,
@@ -19,20 +19,15 @@ import type {
 	GetMeResponse,
 	UpdateMeResponse,
 	UpdatePasswordResponse,
-	SignupResponse
-} from '../types'
-import axios from 'axios'
+	SignupResponse,
+} from './types'
+import { createAxiosInstance } from './utils'
 
 export class AuthApi {
-	private api: ReturnType<typeof axios.create>
-
-	constructor(baseURL?: string) {
-		this.api = axios.create({
-			baseURL,
-			headers: {
-				'Content-Type': 'application/json',
-			},
-		})
+	private api: AxiosInstance
+
+	constructor(axiosInstance?: AxiosInstance, baseURL: string = '') {
+		this.api = axiosInstance || createAxiosInstance(baseURL)
 		this.setupInterceptors()
 	}
 
@@ -71,7 +66,9 @@ export class AuthApi {
 		return this.api.post('/auth/password-recovery', { email })
 	}
 
-	async resetPassword(newPassword: NewPassword['new_password']): Promise<ResetPasswordResponse> {
+	async resetPassword(
+		newPassword: NewPassword['new_password']
+	): Promise<ResetPasswordResponse> {
 		return this.api.post('/auth/reset-password', { new_password: newPassword })
 	}
 
@@ -88,7 +85,9 @@ export class AuthApi {
 		})
 	}
 
-	async updatePassword(form: UpdatePasswordForm): Promise<UpdatePasswordResponse> {
+	async updatePassword(
+		form: UpdatePasswordForm
+	): Promise<UpdatePasswordResponse> {
 		return this.api.patch('/users/me/password', {
 			current_password: form.current_password,
 			new_password: form.new_password,
@@ -99,16 +98,26 @@ export class AuthApi {
 		return this.api.patch<SanitizedUserOut>('/users/me', user)
 	}
 
-	async setUserStatus(userId: string, isActive: boolean): Promise<UpdateUserResponse> {
-		return this.api.patch<SanitizedUserOut>(`/users/${userId}`, { is_active: isActive })
+	async setUserStatus(
+		userId: string,
+		isActive: boolean
+	): Promise<UpdateUserResponse> {
+		return this.api.patch<SanitizedUserOut>(`/users/${userId}`, {
+			is_active: isActive,
+		})
 	}
 
 	async deleteUser(userId: string): Promise<DeleteUserResponse> {
 		return this.api.delete(`/users/${userId}`)
 	}
 
-	async getUsers(limit: number = 100, skip?: number): Promise<GetUsersResponse> {
-		return this.api.get<SanitizedUserList>('/users/', { params: { skip, limit } })
+	async getUsers(
+		limit: number = 100,
+		skip?: number
+	): Promise<GetUsersResponse> {
+		return this.api.get<SanitizedUserList>('/users/', {
+			params: { skip, limit },
+		})
 	}
 
 	async createUser(user: UserCreate): Promise<CreateUserResponse> {

package/src/index.ts

@@ -1,3 +1,3 @@
-export * from './api/auth'
-export * from './composable/useAuth'
+export * from './api'
 export * from './types'
+export * from './useAuth'

package/src/types.ts

@@ -26,13 +26,6 @@ export interface UpdatePasswordForm {
 	confirmNewPassword: string
 }
 
-export interface ReactiveFactory {
-	<T>(initial: T): {
-		value: T
-		set: (newValue: T) => void
-	}
-}
-
 // API Response Types
 export interface Token {
 	access_token: string

package/src/{composable/useAuth.ts → useAuth.ts}

@@ -1,34 +1,37 @@
+import type { AxiosInstance } from 'axios'
 import type { App } from 'vue'
-import type { User, NewUser, UpdatePasswordForm } from '../types'
-import { AuthApi } from '../api/auth'
+import type { User, NewUser, UpdatePasswordForm } from './types'
+import { ref } from 'vue'
+import { AuthApi } from './api'
 
 // Global state
 let authApi: AuthApi | null = null
-const currentUser = {
-	value: {
-		id: '',
-		email: '',
-		first_name: '',
-		last_name: '',
-		is_superuser: false,
-		is_active: false,
-	} as User,
-	set: (newValue: User) => {
-		currentUser.value = newValue
-	}
-}
+const currentUser = ref<User>({
+	id: '',
+	email: '',
+	first_name: '',
+	last_name: '',
+	is_superuser: false,
+	is_active: false,
+})
 
 // Initialize auth
-export function initAuth(baseURL?: string) {
+export function initAuth({
+	axios,
+	baseURL,
+}: {
+	axios: AxiosInstance
+	baseURL?: string
+}) {
 	if (!authApi) {
-		authApi = new AuthApi(baseURL)
+		authApi = new AuthApi(axios, baseURL)
 	}
 
 	return {
 		install(app: App) {
 			// Make auth available globally
 			app.config.globalProperties.$auth = useAuth()
-		}
+		},
 	}
 }
 
@@ -53,7 +56,10 @@ export function useAuth() {
 
 	async function login(credentials: { email: string, password: string }) {
 		try {
-			await authApi!.login(credentials.email.toLowerCase(), credentials.password)
+			await authApi!.login(
+				credentials.email.toLowerCase(),
+				credentials.password
+			)
 			await checkAuth()
 		} catch (error) {
 			throw error
@@ -64,7 +70,7 @@ export function useAuth() {
 		try {
 			if (!getIsLoggedIn()) {
 				const { data } = await authApi!.getCurrentUser()
-				currentUser.set(data)
+				currentUser.value = data
 			}
 		} catch (error) {
 			return false
@@ -78,7 +84,7 @@ export function useAuth() {
 				throw new Error('Passwords do not match')
 			}
 			const { data } = await authApi!.signup(user)
-			currentUser.set(data)
+			currentUser.value = data
 		} catch (error) {
 			throw error
 		}
@@ -114,7 +120,7 @@ export function useAuth() {
 	async function updateProfile(user: Partial<User>) {
 		try {
 			const { data } = await authApi!.updateUserProfile(user)
-			currentUser.set({ ...currentUser.value, ...data })
+			currentUser.value = { ...currentUser.value, ...data }
 		} catch (error) {
 			throw error
 		}

package/src/utils.ts

@@ -0,0 +1,12 @@
+import type { AxiosInstance } from 'axios'
+import axios from 'axios'
+
+export function createAxiosInstance(baseURL: string = ''): AxiosInstance {
+	return axios.create({
+		baseURL: baseURL || '',
+		headers: {
+			'Content-Type': 'application/json',
+			'withCredentials': true,
+		},
+	})
+}