Merge pull request #78 from BinaryStudioAcademy/hotfix/login-error

hotfix/login-error
BinaryStudioAcademy · Sep 4, 2023 · 46fabdd · 46fabdd
2 parents 7cd76ac + 9f7661e
commit 46fabdd
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 18 deletions.
diff --git a/backend/LeetWars.Core/LeetWars.Core.BLL/Interfaces/IUserService.cs b/backend/LeetWars.Core/LeetWars.Core.BLL/Interfaces/IUserService.cs
@@ -6,4 +6,6 @@ public interface IUserService
 {
     public Task<UserDto> CreateUserAsync(NewUserDto userDto);
     public Task<bool> CheckIsExistingEmail(string email);
+    public Task<UserDto> GetUserByUidAsync(string uid);
+    public string GetCurrentUserUid();
 }
diff --git a/backend/LeetWars.Core/LeetWars.Core.BLL/LeetWars.Core.BLL.csproj b/backend/LeetWars.Core/LeetWars.Core.BLL/LeetWars.Core.BLL.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="11.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
   </ItemGroup>
 
@@ -16,5 +17,4 @@
     <ProjectReference Include="..\LeetWars.Core.Common\LeetWars.Core.Common.csproj" />
     <ProjectReference Include="..\LeetWars.Core.DAL\LeetWars.Core.DAL.csproj" />
   </ItemGroup>
-
 </Project>
diff --git a/backend/LeetWars.Core/LeetWars.Core.BLL/Services/UserService.cs b/backend/LeetWars.Core/LeetWars.Core.BLL/Services/UserService.cs
@@ -1,15 +1,19 @@
+using System.Security.Claims;
 using AutoMapper;
 using LeetWars.Core.Common.DTO.User;
 using LeetWars.Core.DAL.Context;
 using LeetWars.Core.DAL.Entities;
+using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 
 namespace LeetWars.Core.BLL.Services;
 
 public class UserService : BaseService, IUserService
 {
-    public UserService(LeetWarsCoreContext context, IMapper mapper) : base(context, mapper)
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    public UserService(LeetWarsCoreContext context, IMapper mapper, IHttpContextAccessor httpContextAccessor) : base(context, mapper)
     {
+        _httpContextAccessor = httpContextAccessor;
     }
 
     public async Task<UserDto> CreateUserAsync(NewUserDto userDto)
@@ -43,4 +47,17 @@ public async Task<bool> CheckIsExistingEmail(string email)
         bool isExistingEmail = await _context.Users.AnyAsync(u => u.Email.ToLower() == email.ToLower());
         return isExistingEmail;
     }
+
+    public async Task<UserDto> GetUserByUidAsync(string uid)
+    {
+        var user = await _context.Users.FirstOrDefaultAsync(u => u.Uid == uid)
+            ?? throw new InvalidOperationException($"A user with uid {uid} is not found.");
+
+        return _mapper.Map<UserDto>(user);
+    }
+
+    public string GetCurrentUserUid()
+    {
+        return _httpContextAccessor.HttpContext?.User.Claims.First(i => i.Type == ClaimTypes.NameIdentifier).Value!;
+    }
 }
diff --git a/backend/LeetWars.Core/LeetWars.Core.WebAPI/Controllers/UsersController.cs b/backend/LeetWars.Core/LeetWars.Core.WebAPI/Controllers/UsersController.cs
@@ -1,3 +1,4 @@
+using System.Security.Claims;
 using LeetWars.Core.BLL.Services;
 using LeetWars.Core.Common.DTO.User;
 using Microsoft.AspNetCore.Authorization;
@@ -32,4 +33,12 @@ public async Task<ActionResult<bool>> CheckEmail([FromQuery] string email)
         var createdUser = await _userService.CheckIsExistingEmail(email);
         return Ok(createdUser);
     }
+
+    [HttpGet("current")]
+    public async Task<ActionResult<UserDto>> GetCurrentUser()
+    {
+        var uid = _userService.GetCurrentUserUid();
+        var user = await _userService.GetUserByUidAsync(uid);
+        return Ok(user);
+    }
 }
diff --git a/backend/LeetWars.Core/LeetWars.Core.WebAPI/Program.cs b/backend/LeetWars.Core/LeetWars.Core.WebAPI/Program.cs
@@ -12,6 +12,7 @@
     .Build();
 
 builder.Services.AddControllers();
+builder.Services.AddHttpContextAccessor();
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddLeetWarsCoreContext(builder.Configuration);
 builder.Services.AddRabbitMqServices(builder.Configuration);

diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
@@ -4,6 +4,7 @@ import { AngularFireModule } from '@angular/fire/compat';
 import { AngularFireAuthModule } from '@angular/fire/compat/auth';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { CoreModule } from '@core/core.module';
 import { environment } from '@env/environment';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 import { MonacoEditorModule } from 'ngx-monaco-editor-v2';
@@ -20,6 +21,7 @@ import { AppRoutingModule } from './app-routing.module';
     imports: [
         BrowserModule,
         AppRoutingModule,
+        CoreModule,
         BrowserAnimationsModule,
         ToastrModule.forRoot(),
         NgxChartsModule,

diff --git a/frontend/src/app/core/services/auth.service.ts b/frontend/src/app/core/services/auth.service.ts
@@ -56,11 +56,11 @@ export class AuthService {
 
     // TODO: change parameters to DTO
     public login(email: string, password: string) {
-        return this.createUser(
-            from(this.afAuth.signInWithEmailAndPassword(email, password)).pipe(
-                first(),
-                catchError((error) => throwError(error.message)),
-            ),
+        return from(this.afAuth.signInWithEmailAndPassword(email, password)).pipe(
+            first(),
+            catchError((error) => throwError(error.message)),
+            switchMap(() => this.userService.getCurrentUser()),
+            tap((user) => this.setUserInfo(user)),
         );
     }
 
@@ -88,17 +88,16 @@ export class AuthService {
 
     // TODO: Implemented only firebase part
     public changePassword(password: string): Observable<void> {
-        return from(this.afAuth.currentUser)
-            .pipe(
-                first(),
-                switchMap((user) => {
-                    if (user) {
-                        return user.updatePassword(password);
-                    }
-
-                    throw new Error('User is not authorized');
-                }),
-            );
+        return from(this.afAuth.currentUser).pipe(
+            first(),
+            switchMap((user) => {
+                if (user) {
+                    return user.updatePassword(password);
+                }
+
+                throw new Error('User is not authorized');
+            }),
+        );
     }
 
     public sendVerificationMail(): Observable<void> {

diff --git a/frontend/src/app/core/services/user.service.ts b/frontend/src/app/core/services/user.service.ts
@@ -15,6 +15,10 @@ export class UserService {
         return this.httpService.postRequest<User>('/users', newUser);
     }
 
+    public getCurrentUser(): Observable<User> {
+        return this.httpService.getRequest<User>('/users/current');
+    }
+
     public checkEmail(email: string): Observable<boolean> {
         return this.httpService.getRequest<boolean>(`/users/is-existing-email?email=${email}`);
     }