Fix linting errors (#749)

* Fix linting errors

* Added back the form promise
This commit is contained in:
Oscar Hinton 2020-12-22 17:28:58 +01:00 committed by GitHub
parent 3c5a972bc9
commit 5a76ca4676
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 4 deletions

View File

@ -54,7 +54,7 @@ export class SsoComponent extends BaseSsoComponent {
async submit() { async submit() {
await this.storageService.save(IdentifierStorageKey, this.identifier); await this.storageService.save(IdentifierStorageKey, this.identifier);
if (this.clientId === 'browser') { if (this.clientId === 'browser') {
document.cookie = `ssoHandOffMessage=${this.i18nService.t('ssoHandOff')};SameSite=strict` document.cookie = `ssoHandOffMessage=${this.i18nService.t('ssoHandOff')};SameSite=strict`;
} }
super.submit(); super.submit();
} }

View File

@ -154,7 +154,7 @@ export class EventService {
msg = this.i18nService.t('editedGroupsForUser', this.formatOrgUserId(ev)); msg = this.i18nService.t('editedGroupsForUser', this.formatOrgUserId(ev));
break; break;
case EventType.OrganizationUser_UnlinkedSso: case EventType.OrganizationUser_UnlinkedSso:
msg = this.i18nService.t('unlinkedSsoUser', this.formatOrgUserId(ev)) msg = this.i18nService.t('unlinkedSsoUser', this.formatOrgUserId(ev));
// Org // Org
case EventType.Organization_Updated: case EventType.Organization_Updated:
msg = this.i18nService.t('editedOrgSettings'); msg = this.i18nService.t('editedOrgSettings');

View File

@ -22,6 +22,7 @@ export class EmergencyAccessConfirmComponent implements OnInit {
@Input() name: string; @Input() name: string;
@Input() userId: string; @Input() userId: string;
@Input() emergencyAccessId: string; @Input() emergencyAccessId: string;
@Input() formPromise: Promise<any>;
@Output() onConfirmed = new EventEmitter(); @Output() onConfirmed = new EventEmitter();
dontAskAgain = false; dontAskAgain = false;

View File

@ -130,7 +130,9 @@ export class EmergencyAccessComponent implements OnInit {
childComponent.onConfirmed.subscribe(async () => { childComponent.onConfirmed.subscribe(async () => {
this.modal.close(); this.modal.close();
await this.doConfirmation(contact); childComponent.formPromise = this.doConfirmation(contact);
await childComponent.formPromise;
updateUser(); updateUser();
this.toasterService.popAsync('success', null, this.i18nService.t('hasBeenConfirmed', contact.name || contact.email)); this.toasterService.popAsync('success', null, this.i18nService.t('hasBeenConfirmed', contact.name || contact.email));
}); });

View File

@ -24,7 +24,7 @@ import { Organization } from 'jslib/models/domain/organization';
}) })
export class LinkSsoComponent extends SsoComponent implements AfterContentInit { export class LinkSsoComponent extends SsoComponent implements AfterContentInit {
@Input() organization: Organization; @Input() organization: Organization;
returnUri: string = '/settings/organizations' returnUri: string = '/settings/organizations';
constructor(platformUtilsService: PlatformUtilsService, i18nService: I18nService, constructor(platformUtilsService: PlatformUtilsService, i18nService: I18nService,
apiService: ApiService, authService: AuthService, apiService: ApiService, authService: AuthService,