@niledatabase/server 3.0.0-alpha.1 → 3.0.0-alpha.3

package/dist/api/routes/tenants/[tenantId]/users/PUT.d.ts

@@ -15,8 +15,7 @@ import { ActiveSession } from '../../../../utils/auth';
  *        type: string
  *    requestBody:
  *      description: |
- *        The email and password combination the user will use to authenticate.
- *        The `name` is optional; if provided it will be recorded in the `users` table.
+ *        The email of the user you want to add to a tenant.
  *      content:
  *        application/json:
  *          schema:

package/dist/api/routes/tenants/[tenantId]/users/[userId]/DELETE.d.ts

@@ -1,7 +1,7 @@
 import { ActiveSession } from '../../../../../utils/auth';
 /**
  * @swagger
- * /api/tenants/{tenantId}/users/{userId}:
+ * /api/tenants/{tenantId}/users/{email}:
  *   delete:
  *    tags:
  *    - tenants
@@ -15,7 +15,7 @@ import { ActiveSession } from '../../../../../utils/auth';
  *      required: true
  *      schema:
  *        type: string
- *    - name: userId
+ *    - name: email
  *      in: path
  *      required: true
  *      schema:

package/dist/api/routes/users/GET.d.ts

@@ -6,7 +6,7 @@
  *     - 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

package/dist/api/utils/auth.d.ts

@@ -2,5 +2,13 @@ import { Config } from '../../utils/Config';
 export type ActiveSession = {
     id: string;
     email: string;
+    expires: Date;
+    user?: {
+        id: string;
+        name: string;
+        image: string;
+        email: string;
+        emailVerified: void | Date;
+    };
 };
 export default function auth(req: Request, config: Config): Promise<void | ActiveSession>;

package/dist/server.cjs.development.js

@@ -2262,30 +2262,32 @@ function _auth() {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _Logger = Logger(_extends({}, config, {
-            debug: true
+            debug: config.debug
           }), '[nileauth]'), info = _Logger.info;
           info('checking auth');
           sessionUrl = config.api.basePath + "/auth/session";
           info('using session', sessionUrl);
-          _context.next = 6;
+          // handle the pass through with posts
+          req.headers["delete"]('content-length');
+          _context.next = 7;
           return request(sessionUrl, {
             request: req
           });
-        case 6:
+        case 7:
           res = _context.sent;
           if (res) {
-            _context.next = 10;
+            _context.next = 11;
             break;
           }
           info('no session found');
           return _context.abrupt("return", undefined);
-        case 10:
+        case 11:
           info('session active');
-          _context.next = 13;
+          _context.next = 14;
           return new Response(res.body).json();
-        case 13:
-          return _context.abrupt("return", _context.sent);
         case 14:
+          return _context.abrupt("return", _context.sent);
+        case 15:
         case "end":
           return _context.stop();
       }
@@ -2401,7 +2403,7 @@ function _POST$2() {
  *     - 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
@@ -2728,7 +2730,7 @@ function _POST$1() {
 
 /**
  * @swagger
- * /api/tenants/{tenantId}/users/{userId}:
+ * /api/tenants/{tenantId}/users/{email}:
  *   delete:
  *    tags:
  *    - tenants
@@ -2742,7 +2744,7 @@ function _POST$1() {
  *      required: true
  *      schema:
  *        type: string
- *    - name: userId
+ *    - name: email
  *      in: path
  *      required: true
  *      schema:
@@ -2772,13 +2774,16 @@ function _DELETE$1() {
           }));
         case 4:
           init.method = 'DELETE';
+          init.body = JSON.stringify({
+            email: userId
+          });
           url = "" + apiRoutes.TENANT_USER(tenantId, userId);
           log('[DELETE]', url);
-          _context.next = 9;
+          _context.next = 10;
           return request(url, init);
-        case 9:
-          return _context.abrupt("return", _context.sent);
         case 10:
+          return _context.abrupt("return", _context.sent);
+        case 11:
         case "end":
           return _context.stop();
       }
@@ -2803,8 +2808,7 @@ function _DELETE$1() {
  *        type: string
  *    requestBody:
  *      description: |
- *        The email and password combination the user will use to authenticate.
- *        The `name` is optional; if provided it will be recorded in the `users` table.
+ *        The email of the user you want to add to a tenant.
  *      content:
  *        application/json:
  *          schema:
@@ -2963,17 +2967,21 @@ function GET(_x, _x2, _x3) {
 }
 function _GET() {
   _GET = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(session, init, log) {
-    var url;
+    var url, res;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           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);
-          _context.next = 4;
+          _context.next = 5;
           return request(url, init);
-        case 4:
-          return _context.abrupt("return", _context.sent);
         case 5:
+          res = _context.sent;
+          return _context.abrupt("return", res);
+        case 7:
         case "end":
           return _context.stop();
       }