Added auth functionality, initial work with views and field types

backend/src/auth/auth.service.ts

@@ -1,12 +1,12 @@
 import { Injectable } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import { PrismaService } from '../prisma/prisma.service';
+import { TenantDatabaseService } from '../tenant/tenant-database.service';
 import * as bcrypt from 'bcrypt';
 
 @Injectable()
 export class AuthService {
   constructor(
-    private prisma: PrismaService,
+    private tenantDbService: TenantDatabaseService,
     private jwtService: JwtService,
   ) {}
 
@@ -15,34 +15,29 @@ export class AuthService {
     email: string,
     password: string,
   ): Promise<any> {
-    const user = await this.prisma.user.findUnique({
-      where: {
-        tenantId_email: {
-          tenantId,
-          email,
-        },
-      },
-      include: {
-        tenant: true,
-        userRoles: {
-          include: {
-            role: {
-              include: {
-                rolePermissions: {
-                  include: {
-                    permission: true,
-                  },
-                },
-              },
-            },
-          },
-        },
-      },
-    });
+    const tenantDb = await this.tenantDbService.getTenantKnex(tenantId);
+    
+    const user = await tenantDb('users')
+      .where({ email })
+      .first();
 
-    if (user && (await bcrypt.compare(password, user.password))) {
-      const { password, ...result } = user;
-      return result;
+    if (!user) {
+      return null;
+    }
+
+    if (await bcrypt.compare(password, user.password)) {
+      // Load user roles and permissions
+      const userRoles = await tenantDb('user_roles')
+        .where({ userId: user.id })
+        .join('roles', 'user_roles.roleId', 'roles.id')
+        .select('roles.*');
+
+      const { password: _, ...result } = user;
+      return {
+        ...result,
+        tenantId,
+        userRoles,
+      };
     }
 
     return null;
@@ -52,7 +47,6 @@ export class AuthService {
     const payload = {
       sub: user.id,
       email: user.email,
-      tenantId: user.tenantId,
     };
 
     return {
@@ -62,7 +56,6 @@ export class AuthService {
         email: user.email,
         firstName: user.firstName,
         lastName: user.lastName,
-        tenantId: user.tenantId,
       },
     };
   }
@@ -74,18 +67,24 @@ export class AuthService {
     firstName?: string,
     lastName?: string,
   ) {
+    const tenantDb = await this.tenantDbService.getTenantKnex(tenantId);
+    
     const hashedPassword = await bcrypt.hash(password, 10);
 
-    const user = await this.prisma.user.create({
-      data: {
-        tenantId,
-        email,
-        password: hashedPassword,
-        firstName,
-        lastName,
-      },
+    const [userId] = await tenantDb('users').insert({
+      email,
+      password: hashedPassword,
+      firstName,
+      lastName,
+      isActive: true,
+      created_at: new Date(),
+      updated_at: new Date(),
     });
 
+    const user = await tenantDb('users')
+      .where({ id: userId })
+      .first();
+
     const { password: _, ...result } = user;
     return result;
   }