@niledatabase/server 3.0.0 → 3.1.0-alpha.0

package/dist/index.mjs

@@ -90,7 +90,11 @@ async function request(url, _init, config) {
     updatedHeaders.set(X_NILE_SECURECOOKIES, String(config.secureCookies));
   }
   updatedHeaders.set("host", requestUrl.host);
-  updatedHeaders.set(X_NILE_ORIGIN, requestUrl.origin);
+  if (config.api.callbackUrl) {
+    updatedHeaders.set(X_NILE_ORIGIN, config.api.callbackUrl);
+  } else {
+    updatedHeaders.set(X_NILE_ORIGIN, requestUrl.origin);
+  }
   const params = { ...init, headers: updatedHeaders };
   if (params.method === "POST" || params.method === "PUT") {
     try {
@@ -162,6 +166,13 @@ async function auth(req, config) {
     return void 0;
   }
 }
+var getCallbackUrl = (cfg) => {
+  const { config } = cfg;
+  if (stringCheck(process.env.NILEDB_CALLBACK_URL)) {
+    return process.env.NILEDB_CALLBACK_URL;
+  }
+  return config?.api?.callbackUrl;
+};
 var getSecureCookies = (cfg) => {
   const { config } = cfg;
   if (stringCheck(process.env.NILEDB_SECURECOOKIES)) {
@@ -393,14 +404,16 @@ var stringCheck = (str) => {
 var ApiConfig = class {
   cookieKey;
   basePath;
+  /**
+   * The client side callback url. Defaults to nothing (so nile.origin will be it), but in the cases of x-origin, you want to set this explicitly to be sure nile-auth does the right thing
+   * If this is set, any `callbackUrl` from the client will be ignored.
+   */
+  callbackUrl;
   _token;
-  constructor({
-    basePath,
-    cookieKey,
-    token
-  }) {
+  constructor({ basePath, cookieKey, token, callbackUrl }) {
     this.basePath = basePath;
     this.cookieKey = cookieKey;
+    this.callbackUrl = callbackUrl;
     this._token = token;
   }
   get token() {
@@ -459,6 +472,7 @@ var Config = class {
     this._tenantId = getTenantId(envVarConfig);
     this.debug = Boolean(config?.debug);
     this._userId = config?.userId;
+    const callbackUrl = config?.api?.callbackUrl ?? getCallbackUrl(envVarConfig);
     const basePath = getBasePath(envVarConfig);
     const { host, port, ...dbConfig } = config?.db ?? {};
     const configuredHost = host ?? getDbHost(envVarConfig);
@@ -466,7 +480,8 @@ var Config = class {
     this.api = new ApiConfig({
       basePath,
       cookieKey: config?.api?.cookieKey ?? "token",
-      token: getToken({ config })
+      token: getToken({ config }),
+      callbackUrl
     });
     this.db = {
       user: this.user,
@@ -485,6 +500,7 @@ var Config = class {
       config
     };
     const { host, port, ...dbConfig } = config.db ?? {};
+    const callbackUrl = config?.api?.callbackUrl ?? getCallbackUrl(envVarConfig);
     let configuredHost = host ?? getDbHost(envVarConfig);
     const configuredPort = port ?? getDbPort(envVarConfig);
     let basePath = getBasePath(envVarConfig);
@@ -493,7 +509,8 @@ var Config = class {
       this.api = new ApiConfig({
         basePath,
         cookieKey: config?.api?.cookieKey ?? "token",
-        token: getToken({ config })
+        token: getToken({ config }),
+        callbackUrl
       });
       this.db = {
         user: this.user,
@@ -582,7 +599,8 @@ var Config = class {
     this.api = new ApiConfig({
       basePath,
       cookieKey: config?.api?.cookieKey ?? "token",
-      token: getToken({ config })
+      token: getToken({ config }),
+      callbackUrl
     });
     this.db = {
       user: this.user,
@@ -1468,7 +1486,7 @@ async function route10(request2, config) {
   if (request2.method === "POST") {
     init.body = request2.body;
     const [provider] = new URL(request2.url).pathname.split("/").reverse();
-    url = `${proxyRoutes(config)[key7]}/${provider}`;
+    url = `${proxyRoutes(config)[key7]}${provider !== "signout" ? `/${provider}` : ""}`;
   }
   const res = await request(url, { ...init, request: request2 }, config);
   return res;