fauxbase 0.5.7 → 0.5.8

package/dist/index.d.cts

@@ -353,6 +353,7 @@ declare abstract class AuthService<T extends Entity> extends Service<T> {
     private httpLogin;
     private httpRegister;
     private httpRefresh;
+    private unwrapBody;
     private setAuthFromResponse;
     private generateToken;
     private generateRefreshToken;

package/dist/index.d.ts

@@ -353,6 +353,7 @@ declare abstract class AuthService<T extends Entity> extends Service<T> {
     private httpLogin;
     private httpRegister;
     private httpRefresh;
+    private unwrapBody;
     private setAuthFromResponse;
     private generateToken;
     private generateRefreshToken;

package/dist/index.js

@@ -448,7 +448,8 @@ var AuthService = class extends Service {
     }
     const body = await response.json();
     this.setAuthFromResponse(body, preset, credentials.email);
-    return body[preset.auth.userField] ?? body;
+    const unwrapped = this.unwrapBody(body);
+    return unwrapped[preset.auth.userField] ?? unwrapped;
   }
   async httpRegister(data) {
     const preset = this.httpDriver.preset;
@@ -468,7 +469,8 @@ var AuthService = class extends Service {
     }
     const body = await response.json();
     this.setAuthFromResponse(body, preset, data.email);
-    return body[preset.auth.userField] ?? body;
+    const unwrapped = this.unwrapBody(body);
+    return unwrapped[preset.auth.userField] ?? unwrapped;
   }
   async httpRefresh() {
     const preset = this.httpDriver.preset;
@@ -487,9 +489,10 @@ var AuthService = class extends Service {
       throw new ForbiddenError("Session expired. Please log in again.");
     }
     const body = await response.json();
-    const token = body[preset.auth.tokenField];
-    const refreshToken = preset.auth.refreshTokenField ? body[preset.auth.refreshTokenField] : this.authState.refreshToken;
-    const expiresIn = preset.auth.expiresInField ? body[preset.auth.expiresInField] : null;
+    const unwrapped = this.unwrapBody(body);
+    const token = unwrapped[preset.auth.tokenField];
+    const refreshToken = preset.auth.refreshTokenField ? unwrapped[preset.auth.refreshTokenField] : this.authState.refreshToken;
+    const expiresIn = preset.auth.expiresInField ? unwrapped[preset.auth.expiresInField] : null;
     const expiresAt = expiresIn ? Date.now() + expiresIn * 1e3 : void 0;
     this.authState = {
       ...this.authState,
@@ -501,11 +504,18 @@ var AuthService = class extends Service {
     this.scheduleRefresh();
     return token;
   }
+  unwrapBody(body) {
+    if (body.data && typeof body.data === "object" && !Array.isArray(body.data)) {
+      return body.data;
+    }
+    return body;
+  }
   setAuthFromResponse(body, preset, fallbackEmail) {
-    const token = body[preset.auth.tokenField];
-    const user = body[preset.auth.userField] ?? body;
-    const refreshToken = preset.auth.refreshTokenField ? body[preset.auth.refreshTokenField] : void 0;
-    const expiresIn = preset.auth.expiresInField ? body[preset.auth.expiresInField] : null;
+    const unwrapped = this.unwrapBody(body);
+    const token = unwrapped[preset.auth.tokenField];
+    const user = unwrapped[preset.auth.userField] ?? unwrapped;
+    const refreshToken = preset.auth.refreshTokenField ? unwrapped[preset.auth.refreshTokenField] : void 0;
+    const expiresIn = preset.auth.expiresInField ? unwrapped[preset.auth.expiresInField] : null;
     const expiresAt = expiresIn ? Date.now() + expiresIn * 1e3 : void 0;
     this.authState = {
       userId: user.id,
@@ -1126,7 +1136,7 @@ var defaultPreset = definePreset({
 var springBootPreset = definePreset({
   name: "spring-boot",
   response: {
-    single: (raw) => ({ data: raw }),
+    single: (raw) => ({ data: raw.data ?? raw }),
     list: (raw) => ({
       items: raw.content ?? [],
       meta: {
@@ -1212,7 +1222,7 @@ var laravelPreset = definePreset({
 var djangoPreset = definePreset({
   name: "django",
   response: {
-    single: (raw) => ({ data: raw }),
+    single: (raw) => ({ data: raw.data ?? raw }),
     list: (raw) => ({
       items: raw.results ?? [],
       meta: {
@@ -1579,7 +1589,7 @@ var HttpDriver = class {
       url += `?${params.toString()}`;
     }
     return this._fetch(url, {
-      method: options?.method ?? "POST",
+      method: options?.method ?? (options?.body !== void 0 ? "POST" : "GET"),
       body: options?.body !== void 0 ? JSON.stringify(options.body) : void 0
     });
   }