github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-20 13:23:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change the oauth to a loading spinner

Browse source
This commit is contained in:
tidusjar 2020-09-02 23:04:01 +01:00
commit 883ddfb9d2
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Ombi/ClientApp/src/app/login/login.component.html
View file

@ -36,7 +36,10 @@
<div>
<button mat-raised-button color="primary" type="submit" (click)="loginWithOmbi = true">{{'Login.SignInWith' | translate:appNameTranslate}}</button>
<button mat-raised-button color="accent" type="button" (click)="oauth()">{{'Login.SignInWithPlex' | translate}}</button>
<button mat-raised-button color="accent" type="button" (click)="oauth()">
<span *ngIf="!oauthLoading">{{'Login.SignInWithPlex' | translate}}</span>
<span *ngIf="oauthLoading"><i class="fa fa-circle-o-notch fa-spin fa-fw"></i></span>
</button>
</div>
</mat-card-content>

18
src/Ombi/ClientApp/src/app/login/login.component.ts
View file

@ -33,6 +33,7 @@ export class LoginComponent implements OnDestroy, OnInit {
public baseUrl: string;
public loginWithOmbi: boolean;
public pinTimer: any;
public oauthLoading: boolean;
public get appName(): string {
if (this.customizationSettings.applicationName) {
@ -97,7 +98,7 @@ export class LoginComponent implements OnDestroy, OnInit {
});
this.timer = setInterval(() => {
this.cycleBackground();
}, 15000);
}, 30000);
const base = this.href;
if (base.length > 1) {
@ -159,10 +160,8 @@ export class LoginComponent implements OnDestroy, OnInit {
this.oAuthWindow!.location.replace(x.url);
this.pinTimer = setInterval(() => {
this.notify.open("Authenticating. Loading... Please Wait", "OK", {
duration: 3000
});
this.oauthLoading = true;
this.getPinResult(x.pinId);
}, 4000);
});
@ -173,24 +172,25 @@ export class LoginComponent implements OnDestroy, OnInit {
this.authService.oAuth(pinId).subscribe(x => {
if(x.access_token) {
this.store.save("id_token", x.access_token);
if (this.authService.loggedIn()) {
this.ngOnDestroy();
if(this.oAuthWindow) {
this.oAuthWindow.close();
}
this.oauthLoading = false;
this.router.navigate(["search"]);
return;
}
}
}
}, err => {
console.log(err);
this.notify.open(err.body, "OK", {
duration: 3000
});
this.router.navigate(["login"]);
});
}