@niledatabase/server 4.0.0-alpha.11 → 4.0.0-alpha.12

package/dist/index.d.mts

@@ -145,6 +145,13 @@ type Tenant = {
     name: string;
 };
 
+type Provider = {
+    id: string;
+    name: string;
+    type: string;
+    signinUrl: string;
+    callbackUr: string;
+};
 type JWT = {
     email: string;
     sub: string;
@@ -212,6 +219,16 @@ declare class Auth extends Config {
     handleHeaders(init?: RequestInit): RequestInit | undefined;
     get sessionUrl(): string;
     getSession: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<JWT | ActiveSession | Response | undefined>;
+    get getCsrfUrl(): string;
+    getCsrf(req: NileRequest<void> | Headers, init?: RequestInit): Promise<JSON | Response>;
+    get listProvidersUrl(): string;
+    listProviders: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<Response | {
+        [key: string]: Provider;
+    }>;
+    get signOutUrl(): string;
+    signOut: (req: NileRequest<void | {
+        callbackUrl?: string;
+    }> | Headers, init?: RequestInit) => Promise<Response | JSON>;
 }
 
 declare class Tenants extends Config {

package/dist/index.d.ts

@@ -145,6 +145,13 @@ type Tenant = {
     name: string;
 };
 
+type Provider = {
+    id: string;
+    name: string;
+    type: string;
+    signinUrl: string;
+    callbackUr: string;
+};
 type JWT = {
     email: string;
     sub: string;
@@ -212,6 +219,16 @@ declare class Auth extends Config {
     handleHeaders(init?: RequestInit): RequestInit | undefined;
     get sessionUrl(): string;
     getSession: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<JWT | ActiveSession | Response | undefined>;
+    get getCsrfUrl(): string;
+    getCsrf(req: NileRequest<void> | Headers, init?: RequestInit): Promise<JSON | Response>;
+    get listProvidersUrl(): string;
+    listProviders: (req: NileRequest<void> | Headers, init?: RequestInit) => Promise<Response | {
+        [key: string]: Provider;
+    }>;
+    get signOutUrl(): string;
+    signOut: (req: NileRequest<void | {
+        callbackUrl?: string;
+    }> | Headers, init?: RequestInit) => Promise<Response | JSON>;
 }
 
 declare class Tenants extends Config {

package/dist/index.js

@@ -1077,7 +1077,8 @@ async function _fetch(config, path, opts) {
     const errorHandler = typeof response?.clone === "function" ? response.clone() : null;
     let msg = "";
     try {
-      res = await response?.json();
+      res = await response?.json().catch(() => {
+      });
     } catch (e) {
       if (errorHandler) {
         msg = await errorHandler.text();
@@ -1110,7 +1111,8 @@ async function _fetch(config, path, opts) {
     error(
       `[fetch][response][status: ${errorHandler?.status}] UNHANDLED ERROR`,
       {
-        res
+        response,
+        message: await response.text()
       }
     );
     return new ResponseError(null, {
@@ -1773,7 +1775,7 @@ var appRoutes = (prefix = "/api") => ({
   TENANT_USER: `${prefix}/tenants/{tenantId}/users/{userId}`,
   TENANT_USERS: `${prefix}/tenants/{tenantId}/users`,
   SIGNUP: `${prefix}/signup`,
-  LOG: `${prefix}/auth/_log`
+  LOG: `${prefix}/_log`
 });
 
 // src/utils/Requester/index.ts
@@ -1783,9 +1785,9 @@ var Requester = class extends Config {
   }
   async rawRequest(method, url, init, body) {
     const _init = {
-      ...init,
       body,
-      method
+      method,
+      ...init
     };
     const res = await _fetch(this, url, _init);
     if (res instanceof ResponseError) {
@@ -1986,6 +1988,8 @@ var Auth = class extends Config {
   }
   handleHeaders(init) {
     if (this.headers) {
+      const cburl = getCallbackUrl2(this.headers);
+      this.headers.set(X_NILE_ORIGIN, new URL(cburl).origin);
       if (init) {
         init.headers = new Headers({ ...this.headers, ...init?.headers });
         return init;
@@ -2010,7 +2014,57 @@ var Auth = class extends Config {
     }
     return session;
   };
+  get getCsrfUrl() {
+    return "/auth/csrf";
+  }
+  async getCsrf(req, init) {
+    const _requester = new Requester(this);
+    const _init = this.handleHeaders(init);
+    return await _requester.get(req, this.getCsrfUrl, _init);
+  }
+  get listProvidersUrl() {
+    return "/auth/providers";
+  }
+  listProviders = async (req, init) => {
+    const _requester = new Requester(this);
+    const _init = this.handleHeaders(init);
+    return await _requester.get(req, this.listProvidersUrl, _init);
+  };
+  get signOutUrl() {
+    return "/auth/signout";
+  }
+  signOut = async (req, init) => {
+    const _requester = new Requester(this);
+    const _init = this.handleHeaders(init);
+    const csrf = await this.getCsrf(req);
+    const callbackUrl = req && "callbackUrl" in req ? String(req.callbackUrl) : "/";
+    if (csrf instanceof Request) {
+      return csrf;
+    }
+    const csrfToken = "csrfToken" in csrf ? String(csrf.csrfToken) : "";
+    if (!csrfToken) {
+      return new Response("Request blocked", { status: 400 });
+    }
+    return await _requester.post(req, this.signOutUrl, {
+      method: "post",
+      body: JSON.stringify({
+        csrfToken,
+        callbackUrl,
+        json: String(true)
+      }),
+      ..._init
+    });
+  };
 };
+function getCallbackUrl2(headers) {
+  if (headers) {
+    const cookieHeader = headers.get("cookie") || "";
+    const cookies = Object.fromEntries(
+      cookieHeader.split("; ").map((cookie) => cookie.split("=").map(decodeURIComponent))
+    );
+    return cookies["__Secure-nile.callback-url"] || cookies["nile.callback-url"];
+  }
+}
 
 // src/tenants/index.ts
 var Tenants = class extends Config {