[UPDATE] code

FinalProject-26-42-45 · Sep 23, 2022 · 43b4dc0 · 43b4dc0
1 parent d9c9ada
commit 43b4dc0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 26 deletions.
diff --git a/src/app.module.ts b/src/app.module.ts
@@ -16,29 +16,13 @@ import { AuthModule } from './auth/auth.module';
 
 
 
-// @Module({
-//   imports: [TypeOrmModule.forRoot({
-//     type: 'mysql',
-//     host: 'localhost',
-//     port: 3306,
-//     username: 'root',
-//     password: '',
-//     database: 'db_foodrand',
-//     entities: ['dist/entities/*.js'],
-//     synchronize: false,
-//   }), UsersModule, MenuModule, MenucategoryModule, RolesModule, MenuhistoryModule, CommonMudule, CategoryofmenuModule, RandomstatisticsModule, AuthModule],
-//   controllers: [AppController],
-//   providers: [AppService],
-// })
-// export class AppModule {}
-
 @Module({
   imports: [TypeOrmModule.forRoot({
     type: 'mysql',
-    host: 'database',
+    host: 'localhost',
     port: 3306,
-    username: 'backendfoodrand',
-    password: 'foodrandproject',
+    username: 'root',
+    password: '',
     database: 'db_foodrand',
     entities: ['dist/entities/*.js'],
     synchronize: false,
@@ -47,3 +31,19 @@ import { AuthModule } from './auth/auth.module';
   providers: [AppService],
 })
 export class AppModule {}
+
+// @Module({
+//   imports: [TypeOrmModule.forRoot({
+//     type: 'mysql',
+//     host: 'database',
+//     port: 3306,
+//     username: 'backendfoodrand',
+//     password: 'foodrandproject',
+//     database: 'db_foodrand',
+//     entities: ['dist/entities/*.js'],
+//     synchronize: false,
+//   }), UsersModule, MenuModule, MenucategoryModule, RolesModule, MenuhistoryModule, CommonMudule, CategoryofmenuModule, RandomstatisticsModule, AuthModule],
+//   controllers: [AppController],
+//   providers: [AppService],
+// })
+// export class AppModule {}
diff --git a/src/services/users/users.service.ts b/src/services/users/users.service.ts
@@ -33,13 +33,14 @@ export class UsersService {
     }
 
     //compare passwords
-    await bcrypt.compare(Password, user.Password, err => {
-      if (err) {
-        throw new HttpException('Invalid credentials', HttpStatus.UNAUTHORIZED);
-      }
-    })
-
-    return toUserDto(user);
+    const isValid = await bcrypt.compare(Password, user.Password)
+    // console.log(test);
+    if(isValid){
+      return toUserDto(user);
+    }
+    throw new HttpException('Password not wrong.', HttpStatus.UNAUTHORIZED);
+
+
   }
 
   async findByPayload({ Username }: any): Promise<UserDto> {