Multi-environment and multi-user construction

apps/api/src/auth/jwt.strategy.ts

@@ -24,20 +24,34 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
   }
 
   async validate(payload: JwtPayload & { typ?: string; mobile?: string }) {
-    if (payload.typ === 'portal') {
+    if (payload.typ === 'portal' || payload.typ === 'org-select') {
+      throw new UnauthorizedException();
+    }
+    if (!payload.sub || !payload.organizationId) {
       throw new UnauthorizedException();
     }
     const user = await this.prisma.user.findUnique({
       where: { id: payload.sub },
-      select: { id: true, organizationId: true, role: true, isActive: true },
+      select: { id: true, isActive: true },
     });
     if (!user || user.isActive === false) {
       throw new UnauthorizedException();
     }
+    const membership = await this.prisma.membership.findFirst({
+      where: {
+        userId: user.id,
+        organizationId: payload.organizationId,
+        isActive: true,
+      },
+      select: { organizationId: true, role: true },
+    });
+    if (!membership) {
+      throw new UnauthorizedException();
+    }
     return {
       userId: user.id,
-      organizationId: user.organizationId,
-      role: user.role,
+      organizationId: membership.organizationId,
+      role: membership.role,
     };
   }
 }