fix(server): signup and login

niledatabase · Aug 13, 2024 · 62897d6 · 62897d6
1 parent 1551171
commit 62897d6
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/packages/browser/templates/apis.mustache b/packages/browser/templates/apis.mustache
@@ -127,7 +127,7 @@ export class {{classname}} extends runtime.BaseAPI {
 
         const requestTenantId = localStorage.getItem('tenantId');
         if (requestTenantId) {
-          headerParameters['x-nile-tenantId'] = requestTenantId;
+          headerParameters['niledb-tenant-id'] = requestTenantId;
         }
 
         {{#bodyParam}}
@@ -284,7 +284,7 @@ export class {{classname}} extends runtime.BaseAPI {
             {{/hasFormParams}}
         }, initOverrides);
         const headers = new Headers(response.headers);
-        const responseTenantId = headers.get('x-nile-tenantId')
+        const responseTenantId = headers.get('niledb-tenant-id')
         if (responseTenantId) {
           localStorage.setItem('tenantId', responseTenantId);
         }

diff --git a/packages/edge/src/index.ts b/packages/edge/src/index.ts
@@ -20,7 +20,7 @@ export default function middleware(
     tenantId = parsed[key];
   }
   if (tenantId) {
-    response.headers.set('x-nile-tenantId', tenantId);
+    response.headers.set('niledb-tenant-id', tenantId);
   }
 }
 

diff --git a/packages/server/src/api/routes/tenants/GET.ts b/packages/server/src/api/routes/tenants/GET.ts
@@ -35,7 +35,12 @@ export async function GET(
   init: RequestInit & { request: Request },
   log: (...args: string[]) => void
 ) {
-  const url = `${apiRoutes.USER_TENANTS(session.id)}`;
+  let url = `${apiRoutes.USER_TENANTS(session.id)}`;
+  if (typeof session === 'object' && 'user' in session && session.user) {
+    url = `${apiRoutes.USER_TENANTS(session.user.id)}`;
+  }
   log('[GET]', url);
-  return await request(url, init);
+
+  const res = await request(url, init);
+  return res;
 }
diff --git a/packages/server/src/api/routes/users/GET.ts b/packages/server/src/api/routes/users/GET.ts
@@ -10,7 +10,7 @@ import { apiRoutes } from '../../utils/routes/apiRoutes';
  *     - users
  *     summary: lists users in the tenant
  *     description: Returns information about the users within the tenant
- *       provided. You can also pass the a `niledb-tenantId` in the header or in a cookie.
+ *       provided. You can also pass the a `niledb-tenant-id` in the header or in a cookie.
  *     operationId: listUsers
  *     parameters:
  *       - name: tenantId

diff --git a/packages/server/src/api/routes/users/POST.ts b/packages/server/src/api/routes/users/POST.ts
@@ -78,6 +78,7 @@ export async function POST(
   const yurl = new URL(init.request.url);
   const tenantId = yurl.searchParams.get('tenantId');
   const tenant = tenantId ?? getTenantFromHttp(init.request.headers);
+
   const url = apiRoutes.USERS(tenant ? tenant : undefined);
   log && log('[POST]', url);
 

diff --git a/packages/server/src/api/utils/auth.ts b/packages/server/src/api/utils/auth.ts
@@ -3,16 +3,29 @@ import Logger from '../../utils/Logger';
 
 import request from './request';
 
-export type ActiveSession = { id: string; email: string };
+export type ActiveSession = {
+  id: string;
+  email: string;
+  expires: Date;
+  user?: {
+    id: string;
+    name: string;
+    image: string;
+    email: string;
+    emailVerified: void | Date;
+  };
+};
 export default async function auth(
   req: Request,
   config: Config
 ): Promise<void | ActiveSession> {
-  const { info } = Logger({ ...config, debug: true }, '[nileauth]');
+  const { info } = Logger({ ...config, debug: config.debug }, '[nileauth]');
   info('checking auth');
 
   const sessionUrl = `${config.api.basePath}/auth/session`;
   info('using session', sessionUrl);
+  // handle the pass through with posts
+  req.headers.delete('content-length');
 
   const res = await request(sessionUrl, { request: req });
   if (!res) {