From 5a76ca4676f0b82342785e69bcef28242265c283 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <hinton.oscar@gmail.com>
Date: Tue, 22 Dec 2020 17:28:58 +0100
Subject: [PATCH]  Fix linting errors (#749)

* Fix linting errors

* Added back the form promise
---
 src/app/accounts/sso.component.ts                      | 2 +-
 src/app/services/event.service.ts                      | 2 +-
 src/app/settings/emergency-access-confirm.component.ts | 1 +
 src/app/settings/emergency-access.component.ts         | 4 +++-
 src/app/settings/link-sso.component.ts                 | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/accounts/sso.component.ts b/src/app/accounts/sso.component.ts
index f71f478aea..a7f01bc553 100644
--- a/src/app/accounts/sso.component.ts
+++ b/src/app/accounts/sso.component.ts
@@ -54,7 +54,7 @@ export class SsoComponent extends BaseSsoComponent {
     async submit() {
         await this.storageService.save(IdentifierStorageKey, this.identifier);
         if (this.clientId === 'browser') {
-            document.cookie = `ssoHandOffMessage=${this.i18nService.t('ssoHandOff')};SameSite=strict`
+            document.cookie = `ssoHandOffMessage=${this.i18nService.t('ssoHandOff')};SameSite=strict`;
         }
         super.submit();
     }
diff --git a/src/app/services/event.service.ts b/src/app/services/event.service.ts
index 230c9ab8c8..398aaf3ab5 100644
--- a/src/app/services/event.service.ts
+++ b/src/app/services/event.service.ts
@@ -154,7 +154,7 @@ export class EventService {
                 msg = this.i18nService.t('editedGroupsForUser', this.formatOrgUserId(ev));
                 break;
             case EventType.OrganizationUser_UnlinkedSso:
-                msg = this.i18nService.t('unlinkedSsoUser', this.formatOrgUserId(ev))
+                msg = this.i18nService.t('unlinkedSsoUser', this.formatOrgUserId(ev));
             // Org
             case EventType.Organization_Updated:
                 msg = this.i18nService.t('editedOrgSettings');
diff --git a/src/app/settings/emergency-access-confirm.component.ts b/src/app/settings/emergency-access-confirm.component.ts
index 46ccfcb0a4..ecf045a8be 100644
--- a/src/app/settings/emergency-access-confirm.component.ts
+++ b/src/app/settings/emergency-access-confirm.component.ts
@@ -22,6 +22,7 @@ export class EmergencyAccessConfirmComponent implements OnInit {
     @Input() name: string;
     @Input() userId: string;
     @Input() emergencyAccessId: string;
+    @Input() formPromise: Promise<any>;
     @Output() onConfirmed = new EventEmitter();
 
     dontAskAgain = false;
diff --git a/src/app/settings/emergency-access.component.ts b/src/app/settings/emergency-access.component.ts
index e463c85eca..e2258531ab 100644
--- a/src/app/settings/emergency-access.component.ts
+++ b/src/app/settings/emergency-access.component.ts
@@ -130,7 +130,9 @@ export class EmergencyAccessComponent implements OnInit {
             childComponent.onConfirmed.subscribe(async () => {
                 this.modal.close();
 
-                await this.doConfirmation(contact);
+                childComponent.formPromise = this.doConfirmation(contact);
+                await childComponent.formPromise;
+
                 updateUser();
                 this.toasterService.popAsync('success', null, this.i18nService.t('hasBeenConfirmed', contact.name || contact.email));
             });
diff --git a/src/app/settings/link-sso.component.ts b/src/app/settings/link-sso.component.ts
index ed0b3bb2b5..a66319db0c 100644
--- a/src/app/settings/link-sso.component.ts
+++ b/src/app/settings/link-sso.component.ts
@@ -24,7 +24,7 @@ import { Organization } from 'jslib/models/domain/organization';
 })
 export class LinkSsoComponent extends SsoComponent implements AfterContentInit {
     @Input() organization: Organization;
-    returnUri: string = '/settings/organizations'
+    returnUri: string = '/settings/organizations';
 
     constructor(platformUtilsService: PlatformUtilsService, i18nService: I18nService,
         apiService: ApiService, authService: AuthService,