@bagelink/auth 1.1.43 → 1.1.45

package/dist/index.cjs

@@ -6,6 +6,16 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 
 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 +23,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 +81,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);
@@ -106,9 +115,12 @@ const currentUser = {
     currentUser.value = newValue;
   }
 };
-function initAuth(baseURL) {
+function initAuth({
+  axios,
+  baseURL
+}) {
   if (!authApi) {
-    authApi = new AuthApi(baseURL);
+    authApi = new AuthApi(axios, baseURL);
   }
   return {
     install(app) {
@@ -131,7 +143,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;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { AxiosResponse } from 'axios';
+import { AxiosResponse, AxiosInstance } from 'axios';
 import { App } from 'vue';
 
 interface User {
@@ -89,7 +89,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,7 +106,10 @@ 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(): {

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { AxiosResponse } from 'axios';
+import { AxiosResponse, AxiosInstance } from 'axios';
 import { App } from 'vue';
 
 interface User {
@@ -89,7 +89,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,7 +106,10 @@ 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(): {

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AxiosResponse } from 'axios';
+import { AxiosResponse, AxiosInstance } from 'axios';
 import { App } from 'vue';
 
 interface User {
@@ -89,7 +89,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,7 +106,10 @@ 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(): {

package/dist/index.mjs

@@ -1,5 +1,15 @@
 import axios from 'axios';
 
+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;
 var __publicField = (obj, key, value) => {
@@ -7,14 +17,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 +75,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);
@@ -100,9 +109,12 @@ const currentUser = {
     currentUser.value = newValue;
   }
 };
-function initAuth(baseURL) {
+function initAuth({
+  axios,
+  baseURL
+}) {
   if (!authApi) {
-    authApi = new AuthApi(baseURL);
+    authApi = new AuthApi(axios, baseURL);
   }
   return {
     install(app) {
@@ -125,7 +137,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;

package/package.json

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

package/src/api/auth.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
+	SignupResponse,
 } from '../types'
-import axios from 'axios'
+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/composable/useAuth.ts

@@ -1,3 +1,4 @@
+import type { AxiosInstance } from 'axios'
 import type { App } from 'vue'
 import type { User, NewUser, UpdatePasswordForm } from '../types'
 import { AuthApi } from '../api/auth'
@@ -15,20 +16,26 @@ const currentUser = {
 	} as User,
 	set: (newValue: User) => {
 		currentUser.value = newValue
-	}
+	},
 }
 
 // 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 +60,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

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,
+		},
+	})
+}