mirror of
https://github.com/bitwarden/browser
synced 2025-12-11 05:43:41 +00:00
Auth/PM-10095 - Registration with Email Verification - Registration Finish - Fix endless load on Org Invite Accept (#10270)
* PM-10095 - Properly center loading spinner * PM-10095 - RegistrationFinish - update query param changes subscription to have empty observable path for org invite to prevent observable error of switchmap receiving undefined.
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
<div class="full-loading-spinner" *ngIf="loading">
|
<div class="tw-flex tw-items-center tw-justify-center" *ngIf="loading">
|
||||||
<i class="bwi bwi-spinner bwi-spin bwi-3x" aria-hidden="true"></i>
|
<i class="bwi bwi-spinner bwi-spin bwi-3x" aria-hidden="true"></i>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { CommonModule } from "@angular/common";
|
import { CommonModule } from "@angular/common";
|
||||||
import { Component, OnDestroy, OnInit } from "@angular/core";
|
import { Component, OnDestroy, OnInit } from "@angular/core";
|
||||||
import { ActivatedRoute, Params, Router, RouterModule } from "@angular/router";
|
import { ActivatedRoute, Params, Router, RouterModule } from "@angular/router";
|
||||||
import { Subject, from, switchMap, takeUntil, tap } from "rxjs";
|
import { EMPTY, Subject, from, switchMap, takeUntil, tap } from "rxjs";
|
||||||
|
|
||||||
import { JslibModule } from "@bitwarden/angular/jslib.module";
|
import { JslibModule } from "@bitwarden/angular/jslib.module";
|
||||||
import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
|
import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
|
||||||
@@ -76,6 +76,10 @@ export class RegistrationFinishComponent implements OnInit, OnDestroy {
|
|||||||
return from(
|
return from(
|
||||||
this.registerVerificationEmailClicked(this.email, this.emailVerificationToken),
|
this.registerVerificationEmailClicked(this.email, this.emailVerificationToken),
|
||||||
);
|
);
|
||||||
|
} else {
|
||||||
|
// org invite flow
|
||||||
|
this.loading = false;
|
||||||
|
return EMPTY;
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user