meet-my-ride 1.2.2 → 1.2.4

package/dist/auth/auth.service.d.ts

@@ -1,14 +1,16 @@
 import { AxiosInstance } from "axios";
 import { UserLogin, AuthResponse, UserRegisterResponse, VerifyEmailResponse, UserRefreshResponse, User } from "../users/user.types";
 import { TokenStorage } from "../tokenstorage/tokenstorage";
+import { MeetMyRideClient } from "../client";
 export declare class AuthService {
     private http;
     private storage;
+    private client?;
     private userSubject;
     user$: import("rxjs").Observable<User | null>;
     private isAuthenticatedSubject;
     isAuthenticated$: import("rxjs").Observable<boolean>;
-    constructor(http: AxiosInstance, storage: TokenStorage);
+    constructor(http: AxiosInstance, storage: TokenStorage, client?: MeetMyRideClient | undefined);
     private setUser;
     private loadFromStorage;
     login(data: UserLogin): Promise<AuthResponse>;

package/dist/auth/auth.service.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthService = void 0;
 const rxjs_1 = require("rxjs");
 class AuthService {
-    constructor(http, storage) {
+    constructor(http, storage, client // Optional, used for setToken
+    ) {
         this.http = http;
         this.storage = storage;
-        // Reactive state
+        this.client = client;
+        // --- Reactive state ---
         this.userSubject = new rxjs_1.BehaviorSubject(null);
         this.user$ = this.userSubject.asObservable();
         this.isAuthenticatedSubject = new rxjs_1.BehaviorSubject(false);
@@ -21,30 +23,42 @@ class AuthService {
         this.isAuthenticatedSubject.next(!!user);
     }
     async loadFromStorage() {
-        var _a, _b;
         const token = await this.storage.getAccessToken();
-        const userJson = await ((_b = (_a = this.storage).getUser) === null || _b === void 0 ? void 0 : _b.call(_a)); // Optional in TokenStorage
+        const userJson = this.storage.getUser ? await this.storage.getUser() : null;
         if (token && userJson) {
-            this.setUser(JSON.parse(userJson));
+            try {
+                const user = JSON.parse(userJson);
+                this.setUser(user);
+                // Update axios headers if client exists
+                if (this.client) {
+                    this.client.setToken(token);
+                }
+            }
+            catch (_a) {
+                this.setUser(null);
+            }
         }
         else {
             this.setUser(null);
         }
     }
     // -------------------------
-    //  AUTH METHODS
+    // AUTH METHODS
     // -------------------------
     async login(data) {
         const res = await this.http.post("/users/login", data);
-        // Save tokens
-        if (res.data.accessToken && res.data.refreshToken) {
-            await this.storage.setTokens(res.data.accessToken, res.data.refreshToken);
+        const { accessToken, refreshToken, user } = res.data;
+        if (accessToken && refreshToken) {
+            await this.storage.setTokens(accessToken, refreshToken);
+            if (this.storage.setUser) {
+                await this.storage.setUser(JSON.stringify(user));
+            }
+            this.setUser(user);
+            // Update axios headers if client exists
+            if (this.client) {
+                this.client.setToken(accessToken);
+            }
         }
-        // Save user (only if your TokenStorage supports it)
-        if (this.storage.setUser) {
-            await this.storage.setUser(JSON.stringify(res.data.user));
-        }
-        this.setUser(res.data.user);
         return res.data;
     }
     async register(data) {
@@ -53,11 +67,13 @@ class AuthService {
     }
     async refresh(refreshToken) {
         var _a;
-        const res = await this.http.post("/users/refresh", {
-            refreshToken
-        });
+        const res = await this.http.post("/users/refresh", { refreshToken });
         if (res.data.accessToken) {
             await this.storage.setTokens(res.data.accessToken, (_a = res.data.refreshToken) !== null && _a !== void 0 ? _a : "");
+            // Update axios headers if client exists
+            if (this.client) {
+                this.client.setToken(res.data.accessToken);
+            }
         }
         return res.data;
     }
@@ -71,9 +87,12 @@ class AuthService {
     async logout() {
         await this.storage.clear();
         this.setUser(null);
+        if (this.client) {
+            this.client.setToken(null);
+        }
     }
     // -------------------------
-    //  GETTERS
+    // GETTERS
     // -------------------------
     get currentUser() {
         return this.userSubject.value;

package/dist/client.d.ts

@@ -1,12 +1,13 @@
+import { AxiosInstance } from "axios";
 import { UserService } from "./users/user.service";
+import { AuthService } from "./auth/auth.service";
 export declare class MeetMyRideClient {
-    private baseUrl;
-    private apiKey?;
-    private readonly http;
-    user: UserService;
-    constructor(baseUrl: string, apiKey?: string | undefined);
+    readonly http: AxiosInstance;
+    readonly user: UserService;
+    readonly auth: AuthService;
+    constructor(baseUrl: string, apiKey?: string);
     /**
-     * Allow services (like login/refresh) to update the Authorization header.
+     * Allows AuthService to update the Authorization header.
      */
-    private setToken;
+    setToken(token: string | null): void;
 }

package/dist/client.js

@@ -6,25 +6,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MeetMyRideClient = void 0;
 const axios_1 = __importDefault(require("axios"));
 const user_service_1 = require("./users/user.service");
+const auth_service_1 = require("./auth/auth.service");
+const tokenstorage_1 = require("./tokenstorage/tokenstorage");
 class MeetMyRideClient {
     constructor(baseUrl, apiKey) {
-        this.baseUrl = baseUrl;
-        this.apiKey = apiKey;
+        const storage = new tokenstorage_1.TokenStorageService();
         this.http = axios_1.default.create({
             baseURL: baseUrl,
             headers: {
                 "Content-Type": "application/json",
-                ...(apiKey ? { "Authorization": `Bearer ${apiKey}` } : {})
+                ...(apiKey ? { Authorization: `Bearer ${apiKey}` } : {})
             }
         });
         // Initialize modules/services
         this.user = new user_service_1.UserService(this.http);
+        this.auth = new auth_service_1.AuthService(this.http, storage, this);
     }
     /**
-     * Allow services (like login/refresh) to update the Authorization header.
+     * Allows AuthService to update the Authorization header.
      */
     setToken(token) {
-        this.http.defaults.headers["Authorization"] = `Bearer ${token}`;
+        if (token) {
+            this.http.defaults.headers["Authorization"] = `Bearer ${token}`;
+        }
+        else {
+            delete this.http.defaults.headers["Authorization"];
+        }
     }
 }
 exports.MeetMyRideClient = MeetMyRideClient;

package/dist/tokenstorage/tokenstorage.d.ts

@@ -1,8 +1,16 @@
 export interface TokenStorage {
     getAccessToken(): Promise<string | null>;
     getRefreshToken(): Promise<string | null>;
-    setTokens(access: string, refresh: string): Promise<void>;
+    setTokens(accessToken: string, refreshToken: string): Promise<void>;
+    getUser(): Promise<string | null>;
+    setUser(userJson: string): Promise<void>;
+    clear(): Promise<void>;
+}
+export declare class TokenStorageService implements TokenStorage {
+    getAccessToken(): Promise<string | null>;
+    getRefreshToken(): Promise<string | null>;
+    setTokens(accessToken: string, refreshToken: string): Promise<void>;
+    getUser(): Promise<string | null>;
+    setUser(userJson: string): Promise<void>;
     clear(): Promise<void>;
-    getUser?(): Promise<string | null>;
-    setUser?(user: string): Promise<void>;
 }

package/dist/tokenstorage/tokenstorage.js

@@ -1,3 +1,41 @@
 "use strict";
-// tokenstorage/tokenstorage.ts
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenStorageService = void 0;
+// src/auth/tokenstorage.ts
+const preferences_1 = require("@capacitor/preferences");
+class TokenStorageService {
+    // -------------------------
+    // TOKENS
+    // -------------------------
+    async getAccessToken() {
+        const { value } = await preferences_1.Preferences.get({ key: "accessToken" });
+        return value;
+    }
+    async getRefreshToken() {
+        const { value } = await preferences_1.Preferences.get({ key: "refreshToken" });
+        return value;
+    }
+    async setTokens(accessToken, refreshToken) {
+        await preferences_1.Preferences.set({ key: "accessToken", value: accessToken });
+        await preferences_1.Preferences.set({ key: "refreshToken", value: refreshToken });
+    }
+    // -------------------------
+    // USER
+    // -------------------------
+    async getUser() {
+        const { value } = await preferences_1.Preferences.get({ key: "user" });
+        return value;
+    }
+    async setUser(userJson) {
+        await preferences_1.Preferences.set({ key: "user", value: userJson });
+    }
+    // -------------------------
+    // CLEAR ALL
+    // -------------------------
+    async clear() {
+        await preferences_1.Preferences.remove({ key: "accessToken" });
+        await preferences_1.Preferences.remove({ key: "refreshToken" });
+        await preferences_1.Preferences.remove({ key: "user" });
+    }
+}
+exports.TokenStorageService = TokenStorageService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meet-my-ride",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Private library for the MeetMyRide applications",
   "repository": {
     "type": "git",