Merge pull request #409 from Ketteiteki/remove_logout_all_devices_and_fix_binding_in_settings_page

remove logout all devices | fix binding in settings page

Author: kolosovpetro

MangoAPI.BusinessLogic/ApiCommands/Sessions/LogoutAllCommand.cs

@@ -9,8 +9,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\MangoAPI.Application\MangoAPI.Application.csproj"/>
-        <ProjectReference Include="..\MangoAPI.Infrastructure\MangoAPI.Infrastructure.csproj"/>
-        <ProjectReference Include="..\MangoAPI.Domain\MangoAPI.Domain.csproj"/>
+        <ProjectReference Include="..\MangoAPI.Application\MangoAPI.Application.csproj" />
+        <ProjectReference Include="..\MangoAPI.Infrastructure\MangoAPI.Infrastructure.csproj" />
+        <ProjectReference Include="..\MangoAPI.Domain\MangoAPI.Domain.csproj" />
     </ItemGroup>
 </Project>

MangoAPI.BusinessLogic/ApiCommands/Sessions/LogoutAllCommandHandler.cs

@@ -32,9 +32,6 @@ <h5>Profile</h5>
             <button class="button-dark py-2 contact-button px-4" (click)="onLogoutClick()">
               Logout
             </button>
-            <button class="button-dark py-2 contact-button px-4 ml-3" (click)="onLogoutAllClick()">
-              Logout All Devices
-            </button>
           </div>
         </div>
         <ul class="user-info">
@@ -135,7 +132,7 @@ <h5 class="mb-2">Account</h5>
                 value="{{ currentUser.birthdayDate }}"
                 id="BirthdayDate"
                 placeholder="Type your birthday"
-                [(ngModel)]="currentUser.birthdayDate"
+                [(ngModel)]="currentUserForUpdating.birthdayDate"
               />
             </li>
 
@@ -146,7 +143,7 @@ <h5 class="mb-2">Account</h5>
                 type="text"
                 id="Website"
                 placeholder="Type your website"
-                [(ngModel)]="currentUser.website"
+                [(ngModel)]="currentUserForUpdating.website"
               />
             </li>
           </ul>
@@ -158,7 +155,7 @@ <h5 class="mb-2">Account</h5>
                 type="text"
                 id="UserName"
                 placeholder="Type your user name"
-                [(ngModel)]="currentUser.username"
+                [(ngModel)]="currentUserForUpdating.username"
               />
             </li>
 
@@ -169,7 +166,7 @@ <h5 class="mb-2">Account</h5>
                 type="text"
                 id="DisplayName"
                 placeholder="Type your display name"
-                [(ngModel)]="currentUser.displayName"
+                [(ngModel)]="currentUserForUpdating.displayName"
               />
             </li>
           </ul>
@@ -180,7 +177,7 @@ <h5 class="mb-2">Account</h5>
               type="text"
               id="Bio"
               placeholder="Type your bio"
-              [(ngModel)]="currentUser.bio"
+              [(ngModel)]="currentUserForUpdating.bio"
             />
           </div>
           <div class="d-flex flex-column profile-form-group">
@@ -190,7 +187,7 @@ <h5 class="mb-2">Account</h5>
               type="text"
               id="Address"
               placeholder="Type your address"
-              [(ngModel)]="currentUser.address"
+              [(ngModel)]="currentUserForUpdating.address"
             />
           </div>
         </div>
@@ -215,7 +212,7 @@ <h5 class="mb-2">Social network profiles</h5>
                 type="text"
                 id="Facebook"
                 placeholder="Username"
-                [(ngModel)]="currentUser.facebook"
+                [(ngModel)]="currentUserForUpdating.facebook"
               />
             </li>
 
@@ -226,7 +223,7 @@ <h5 class="mb-2">Social network profiles</h5>
                 type="text"
                 id="Twitter"
                 placeholder="Username"
-                [(ngModel)]="currentUser.twitter"
+                [(ngModel)]="currentUserForUpdating.twitter"
               />
             </li>
           </ul>
@@ -238,7 +235,7 @@ <h5 class="mb-2">Social network profiles</h5>
                 type="text"
                 id="Instagram"
                 placeholder="Username"
-                [(ngModel)]="currentUser.instagram"
+                [(ngModel)]="currentUserForUpdating.instagram"
               />
             </li>
 
@@ -249,7 +246,7 @@ <h5 class="mb-2">Social network profiles</h5>
                 type="text"
                 id="LinkedIn"
                 placeholder="Username"
-                [(ngModel)]="currentUser.linkedIn"
+                [(ngModel)]="currentUserForUpdating.linkedIn"
               />
             </li>
           </ul>

MangoAPI.BusinessLogic/MangoAPI.BusinessLogic.csproj

@@ -51,6 +51,26 @@ export class SettingsComponent implements OnInit, OnDestroy {
     publicKey: 0,
     pictureUrl: ''
   };
+
+  public currentUserForUpdating: User = {
+    userId: '',
+    displayName: '',
+    displayNameColour: 0,
+    birthdayDate: '',
+    email: '',
+    website: '',
+    username: '',
+    bio: '',
+    userNameChanged: false,
+    address: '',
+    facebook: '',
+    twitter: '',
+    instagram: '',
+    linkedIn: '',
+    publicKey: 0,
+    pictureUrl: ''
+  };
+
   public currentUserId = '';
   public changePasswordCommand: ChangePasswordCommand = {
     currentPassword: '',
@@ -80,6 +100,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
       .subscribe({
         next: (response) => {
           this.currentUser = response.user;
+          this.currentUserForUpdating = {...response.user};
 
           if (response.user.userNameChanged === false) {
             this.currentUser.username = '';
@@ -133,36 +154,22 @@ export class SettingsComponent implements OnInit, OnDestroy {
       });
   }
 
-  onLogoutAllClick(): void {
-    this._sessionService
-      .deleteAllSessions()
-      .pipe(takeUntil(this.componentDestroyed$))
-      .subscribe({
-        next: (_) => {
-          this._tokensService.clearTokens();
-          this._router.navigateByUrl('login').then((r) => r);
-        },
-        error: (error) => {
-          this._errorNotificationService.notifyOnError(error);
-        }
-      });
-  }
-
   onSaveChangesAccountInfoClick(): void {
     const command: UpdateAccountInformationCommand = {
-      username: this.currentUser.username,
-      birthdayDate: this.currentUser.birthdayDate,
-      website: this.currentUser.website,
-      address: this.currentUser.address,
-      bio: this.currentUser.bio,
-      displayName: this.currentUser.displayName
+      username: this.currentUserForUpdating.username,
+      birthdayDate: this.currentUserForUpdating.birthdayDate,
+      website: this.currentUserForUpdating.website,
+      address: this.currentUserForUpdating.address,
+      bio: this.currentUserForUpdating.bio,
+      displayName: this.currentUserForUpdating.displayName
     };
 
     this._usersService
       .updateUserAccountInformation(command)
       .pipe(takeUntil(this.componentDestroyed$))
       .subscribe({
         next: (response) => {
+          this.currentUser = {...this.currentUserForUpdating};
           this.currentUser.userNameChanged = true;
           alert(response.message);
         },

MangoAPI.Client/src/app/components/settings/settings.component.html

@@ -29,7 +29,7 @@ export class AuthInterceptor implements HttpInterceptor {
       err.status === 401 &&
       request.headers.has('Authorization') &&
       request.headers.get('Authorization')?.startsWith('Bearer');
-
+    
     if (shouldHandle) {
       const refreshToken = this.tokensService.getTokens()?.refreshToken ?? '';
 

MangoAPI.Client/src/app/components/settings/settings.component.ts

@@ -96,26 +96,4 @@ public async Task<IActionResult> LogoutAsync(
 
         return await RequestAsync(command, cancellationToken);
     }
-
-    /// <summary>
-    /// Deletes all current user's sessions.
-    /// </summary>
-    /// <param name="cancellationToken">Cancellation token instance.</param>
-    /// <returns>Possible codes: 200, 400, 409.</returns>
-    [HttpDelete]
-    [Authorize]
-    [SwaggerOperation(
-        Description = "Deletes all current user's sessions.",
-        Summary = "Deletes all current user's sessions.")]
-    [ProducesResponseType(typeof(ResponseBase), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(ErrorResponse), StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(typeof(ErrorResponse), StatusCodes.Status409Conflict)]
-    public async Task<IActionResult> LogoutAllAsync(CancellationToken cancellationToken)
-    {
-        var userId = CorrelationContext.GetUserId();
-
-        var command = new LogoutAllCommand(userId);
-
-        return await RequestAsync(command, cancellationToken);
-    }
 }

MangoAPI.Client/src/app/interceptors/auth-interceptor.service.ts

@@ -13,6 +13,4 @@ public interface ISessionsController
     Task<IActionResult> RefreshSession(Guid refreshToken, CancellationToken cancellationToken);
 
     Task<IActionResult> LogoutAsync(Guid refreshToken, CancellationToken cancellationToken);
-
-    Task<IActionResult> LogoutAllAsync(CancellationToken cancellationToken);
 }