admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: refactoring auth & add email password login (#318)

Browse Source 
* feat: wip

* fix: issues

* feat: clean controllers and services

* fix: test

* Fix auth

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Jérémy M
2023-06-17 13:42:02 +02:00
committed by GitHub
parent d13ceb98fa
commit 299ca293a8
215 changed files with 1668 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/core/auth/strategies/google.auth.strategy.ts
View File

@ -6,7 +6,11 @@ import { ConfigService } from '@nestjs/config';
import { Request } from 'express';
export type GoogleRequest = Request & {
user: { firstName: string; lastName: string; email: string };
user: {
firstName: string | undefined | null;
lastName: string | undefined | null;
email: string;
};
};
@Injectable()

6
server/src/core/auth/strategies/jwt.auth.strategy.ts
View File

@ -5,7 +5,7 @@ import { ConfigService } from '@nestjs/config';
import { PrismaService } from 'src/database/prisma.service';
import { User, Workspace } from '@prisma/client';
export type JwtPayload = { userId: string; workspaceId: string };
export type JwtPayload = { sub: string; workspaceId: string };
export type PassportUser = { user: User; workspace: Workspace };
@Injectable()
@ -17,13 +17,13 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {
super({
jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
ignoreExpiration: false,
secretOrKey: configService.get<string>('JWT_SECRET'),
secretOrKey: configService.get<string>('ACCESS_TOKEN_SECRET'),
});
}
async validate(payload: JwtPayload): Promise<PassportUser> {
const user = await this.prismaService.user.findUniqueOrThrow({
where: { id: payload.userId },
where: { id: payload.sub },
});
if (!user) {