Compare commits
No commits in common. "651381caeef0204c8ff03866638857be5da02fed" and "6285e46b7a884c978b27dd153297d9541744ff31" have entirely different histories.
651381caee
...
6285e46b7a
|
@ -10,7 +10,6 @@ import { SecurityHeadersMiddleware } from './middleware/security-middleware/secu
|
|||
import { AuthModule } from './modules/auth-module/auth.module';
|
||||
import { AccessTokenGuard } from './modules/auth-module/common/guards';
|
||||
import { DatabaseModule } from './modules/database-module/database.module';
|
||||
import { UserModule } from './modules/user-module/user.module';
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
|
@ -19,7 +18,6 @@ import { UserModule } from './modules/user-module/user.module';
|
|||
}),
|
||||
DatabaseModule,
|
||||
AuthModule,
|
||||
UserModule,
|
||||
],
|
||||
controllers: [AppController],
|
||||
providers: [AppService, { provide: 'APP_GUARD', useClass: AccessTokenGuard }],
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
export * from './user-credentials.entity';
|
||||
export * from './user-data.entity';
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
import {
|
||||
Column,
|
||||
Entity,
|
||||
PrimaryGeneratedColumn,
|
||||
OneToOne,
|
||||
JoinColumn,
|
||||
CreateDateColumn,
|
||||
UpdateDateColumn,
|
||||
} from 'typeorm';
|
||||
|
||||
import { UserCredentials } from './user-credentials.entity';
|
||||
|
||||
@Entity()
|
||||
export class UserData {
|
||||
@PrimaryGeneratedColumn('uuid')
|
||||
public id: string;
|
||||
|
||||
@Column({ default: false })
|
||||
public isEmailConfirmed: boolean;
|
||||
|
||||
@OneToOne(() => UserCredentials)
|
||||
@JoinColumn({ name: 'userCredentialsId' })
|
||||
public user: UserCredentials;
|
||||
|
||||
@CreateDateColumn()
|
||||
public createdAt: Date;
|
||||
|
||||
@UpdateDateColumn()
|
||||
public updatedAt: Date;
|
||||
}
|
|
@ -1,12 +1,10 @@
|
|||
import { Module } from '@nestjs/common';
|
||||
import { JwtModule } from '@nestjs/jwt';
|
||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||
import { UserCredentials } from 'src/entities';
|
||||
|
||||
import { UserModule } from '../user-module/user.module';
|
||||
import { UserCredentials } from 'src/entities/user-credentials.entity';
|
||||
|
||||
import { AuthController } from './controller/auth.controller';
|
||||
import { UserCredentialsRepository } from './repositories/user-credentials.repository';
|
||||
import { UserRepository } from './repositories/user.repository';
|
||||
import { AuthService } from './services/auth.service';
|
||||
import { EncryptionService } from './services/encryption.service';
|
||||
import { TokenManagementService } from './services/token-management.service';
|
||||
|
@ -14,7 +12,6 @@ import { AccessTokenStrategy, RefreshTokenStrategy } from './strategies';
|
|||
|
||||
@Module({
|
||||
imports: [
|
||||
UserModule,
|
||||
JwtModule.register({}),
|
||||
TypeOrmModule.forFeature([UserCredentials]),
|
||||
],
|
||||
|
@ -22,7 +19,7 @@ import { AccessTokenStrategy, RefreshTokenStrategy } from './strategies';
|
|||
AuthService,
|
||||
TokenManagementService,
|
||||
EncryptionService,
|
||||
UserCredentialsRepository,
|
||||
UserRepository,
|
||||
AccessTokenStrategy,
|
||||
RefreshTokenStrategy,
|
||||
],
|
||||
|
|
|
@ -4,7 +4,7 @@ import { UserCredentials } from 'src/entities/user-credentials.entity';
|
|||
import { Repository } from 'typeorm';
|
||||
|
||||
@Injectable()
|
||||
export class UserCredentialsRepository {
|
||||
export class UserRepository {
|
||||
public constructor(
|
||||
@InjectRepository(UserCredentials)
|
||||
private readonly repository: Repository<UserCredentials>
|
|
@ -1,8 +1,7 @@
|
|||
import { ForbiddenException, Injectable } from '@nestjs/common';
|
||||
|
||||
import { UserDataRepository } from '../../user-module/repositories/user-data.repository';
|
||||
import { TokensDto, UserCredentialsDto } from '../models/dto';
|
||||
import { UserCredentialsRepository } from '../repositories/user-credentials.repository';
|
||||
import { UserRepository } from '../repositories/user.repository';
|
||||
|
||||
import { EncryptionService } from './encryption.service';
|
||||
import { TokenManagementService } from './token-management.service';
|
||||
|
@ -10,8 +9,7 @@ import { TokenManagementService } from './token-management.service';
|
|||
@Injectable()
|
||||
export class AuthService {
|
||||
public constructor(
|
||||
private readonly userCredentialsRepository: UserCredentialsRepository,
|
||||
private readonly userDataRepository: UserDataRepository,
|
||||
private readonly userRepository: UserRepository,
|
||||
private readonly tokenManagementService: TokenManagementService,
|
||||
private readonly encryptionService: EncryptionService
|
||||
) {}
|
||||
|
@ -20,18 +18,16 @@ export class AuthService {
|
|||
const passwordHashed = await this.encryptionService.hashData(
|
||||
userCredentials.password
|
||||
);
|
||||
const user = await this.userCredentialsRepository.createUser(
|
||||
const user = await this.userRepository.createUser(
|
||||
userCredentials.email,
|
||||
passwordHashed
|
||||
);
|
||||
|
||||
await this.userDataRepository.createInitialUserData(user);
|
||||
|
||||
return this.generateAndPersistTokens(user.id, user.email);
|
||||
}
|
||||
|
||||
public async signin(userCredentials: UserCredentialsDto): Promise<TokensDto> {
|
||||
const user = await this.userCredentialsRepository.findUserByEmail(
|
||||
const user = await this.userRepository.findUserByEmail(
|
||||
userCredentials.email
|
||||
);
|
||||
|
||||
|
@ -55,7 +51,7 @@ export class AuthService {
|
|||
userId: number,
|
||||
refreshToken: string
|
||||
): Promise<TokensDto> {
|
||||
const user = await this.userCredentialsRepository.findUserById(userId);
|
||||
const user = await this.userRepository.findUserById(userId);
|
||||
|
||||
if (!user || !user.hashedRt) {
|
||||
throw new ForbiddenException('Access Denied');
|
||||
|
@ -74,7 +70,7 @@ export class AuthService {
|
|||
}
|
||||
|
||||
public async logout(userId: number): Promise<boolean> {
|
||||
const affected = await this.userCredentialsRepository.updateUserTokenHash(
|
||||
const affected = await this.userRepository.updateUserTokenHash(
|
||||
userId,
|
||||
null
|
||||
);
|
||||
|
@ -94,10 +90,7 @@ export class AuthService {
|
|||
tokens.refresh_token
|
||||
);
|
||||
|
||||
await this.userCredentialsRepository.updateUserTokenHash(
|
||||
userId,
|
||||
hashedRefreshToken
|
||||
);
|
||||
await this.userRepository.updateUserTokenHash(userId, hashedRefreshToken);
|
||||
return tokens;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { ConfigService } from '@nestjs/config';
|
||||
import { TypeOrmModuleOptions } from '@nestjs/typeorm';
|
||||
import { UserCredentials, UserData } from 'src/entities';
|
||||
import { UserCredentials } from 'src/entities';
|
||||
|
||||
export const databaseConfigFactory = (
|
||||
configService: ConfigService
|
||||
|
@ -13,5 +13,5 @@ export const databaseConfigFactory = (
|
|||
database: configService.get('DB_NAME'),
|
||||
synchronize: true,
|
||||
logging: true,
|
||||
entities: [UserCredentials, UserData],
|
||||
entities: [UserCredentials],
|
||||
});
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
export * from './user-data.repository';
|
|
@ -1,23 +0,0 @@
|
|||
import { Injectable } from '@nestjs/common';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import { UserCredentials, UserData } from 'src/entities';
|
||||
import { Repository } from 'typeorm';
|
||||
|
||||
@Injectable()
|
||||
export class UserDataRepository {
|
||||
public constructor(
|
||||
@InjectRepository(UserData)
|
||||
private readonly repository: Repository<UserData>
|
||||
) {}
|
||||
|
||||
public async createInitialUserData(
|
||||
userCredentials: UserCredentials
|
||||
): Promise<UserData> {
|
||||
const userData = new UserData();
|
||||
|
||||
userData.user = userCredentials;
|
||||
userData.isEmailConfirmed = false;
|
||||
|
||||
return this.repository.save(userData);
|
||||
}
|
||||
}
|
|
@ -1,13 +0,0 @@
|
|||
import { Module } from '@nestjs/common';
|
||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||
import { UserData } from 'src/entities';
|
||||
|
||||
import { UserDataRepository } from './repositories';
|
||||
|
||||
@Module({
|
||||
imports: [TypeOrmModule.forFeature([UserData])],
|
||||
providers: [UserDataRepository],
|
||||
controllers: [],
|
||||
exports: [UserDataRepository],
|
||||
})
|
||||
export class UserModule {}
|
Loading…
Reference in New Issue