feat: improve password reset feedback and add back to login button

Signed-off-by: Manuel Abascal <mjabascal10@gmail.com>

Author: mjabascal10

frontend/src/app/shared/components/auth/password-reset/finish/password-reset-finish.component.html

@@ -13,13 +13,13 @@ <h6 class="font-weight-light text-blue-800">Password reset</h6>
             <span>The password reset key is missing.</span>
           </div>
           <div *ngIf="error" class="alert alert-warning alert-styled-right flex-wrap mb-2">
-            <span>Your password couldn't be reset. Remember a password request is only valid for 24 hours.</span>
+            <span>{{ error }}</span>
           </div>
           <p *ngIf="success" class="alert bg-success-400 text-white alert-styled-right flex-wrap mb-2">
-            <span><strong>Your password has been reset.</strong> Please </span>
-            <a (click)="login()" class="alert-link">sign in</a>.
+            <span><strong>Your password has been reset.</strong></span>
           </p>
-          <div *ngIf="doNotMatch" class="alert alert-warning alert-styled-right mb-2 flex-wrap">
+          <div *ngIf="resetAccount.password !== confirmPassword"
+               class="alert alert-warning alert-styled-right mb-2 flex-wrap">
             <span> The password and its confirmation do not match!</span>
           </div>
         </div>
@@ -72,12 +72,20 @@ <h6 class="font-weight-light text-blue-800">Password reset</h6>
                     </small>
                   </div>
                 </div>
-                <button [disabled]="passwordForm.form.invalid || sending"
+                <button [disabled]="passwordForm.form.invalid || sending || doNotMatch"
                         class="btn btn-block utm-button utm-button-primary"
                         type="submit">
                   Reset Password
                 </button>
               </form>
+              <div class="d-flex flex-column justify-content-center text-center cursor-pointer">
+                <button [routerLink]="'/'" class="btn btn-link text-muted text-lg"
+                        style="font-size: 0.9rem; text-decoration: none !important;" type="button">
+                  <div class="d-flex align-items-center justify-content-center">
+                    <i class="icon-arrow-left22 ml-2"></i><span
+                    class="txt2"> Back to Login </span></div>
+                </button>
+              </div>
             </div>
           </div>
         </div>

frontend/src/app/shared/components/auth/password-reset/finish/password-reset-finish.component.ts

@@ -3,6 +3,7 @@ import {ActivatedRoute, Router} from '@angular/router';
 import {NgbModalRef} from '@ng-bootstrap/ng-bootstrap';
 import {ModalService} from '../../../../../core/modal/modal.service';
 import {PasswordResetFinishService} from './password-reset-finish.service';
+import {HttpResponse} from "@angular/common/http";
 
 
 @Component({
@@ -61,9 +62,10 @@ export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
           this.success = 'OK';
           this.sending = false;
         },
-        () => {
+        (error: HttpResponse<any>) => {
+          this.error = error.headers.get('x-utmstack-error') ||
+            'An internal error has occurred, please try again.';
           this.success = null;
-          this.error = 'ERROR';
           this.sending = false;
         }
       );