open-source-mirrors
/
Ombi
mirror of https://github.com/Ombi-app/Ombi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plex OAuth window will now auto close

Browse Source
pull/4252/head v4.0.1443
tidusjar 4 years ago
parent 5585958731
commit 90da69a342
1 changed files with 213 additions and 173 deletions
Show Stats Download Patch File Download Diff File

386
src/Ombi/ClientApp/src/app/login/login.component.ts
Unescape View File

@ -18,208 +18,248 @@ import { StorageService } from "../shared/storage/storage-service";
import { MatSnackBar } from "@angular/material/snack-bar"; import { MatSnackBar } from "@angular/material/snack-bar";
@Component({ @Component({
templateUrl: "./login.component.html", templateUrl: "./login.component.html",
animations: [fadeInOutAnimation], animations: [fadeInOutAnimation],
styleUrls: ["./login.component.scss"], styleUrls: ["./login.component.scss"],
}) })
export class LoginComponent implements OnDestroy, OnInit { export class LoginComponent implements OnDestroy, OnInit {
public form: FormGroup;
public customizationSettings: ICustomizationSettings;
public authenticationSettings: IAuthenticationSettings;
public plexEnabled: boolean;
public background: any;
public landingFlag: boolean;
public baseUrl: string;
public loginWithOmbi: boolean;
public pinTimer: any;
public oauthLoading: boolean;
public form: FormGroup; public get appName(): string {
public customizationSettings: ICustomizationSettings; if (this.customizationSettings.applicationName) {
public authenticationSettings: IAuthenticationSettings; return this.customizationSettings.applicationName;
public plexEnabled: boolean; } else {
public background: any; return "Ombi";
public landingFlag: boolean;
public baseUrl: string;
public loginWithOmbi: boolean;
public pinTimer: any;
public oauthLoading: boolean;
public get appName(): string {
if (this.customizationSettings.applicationName) {
return this.customizationSettings.applicationName;
} else {
return "Ombi";
}
} }
}
public get appNameTranslate(): object { public get appNameTranslate(): object {
return { appName: this.appName }; return { appName: this.appName };
} }
private timer: any; private timer: any;
private clientId: string; private clientId: string;
private errorBody: string;
private errorValidation: string;
private href: string;
private oAuthWindow: Window|null;
constructor(private authService: AuthService, private router: Router, private status: StatusService,
private fb: FormBuilder, private settingsService: SettingsService, private images: ImageService, private sanitizer: DomSanitizer,
private route: ActivatedRoute, @Inject(APP_BASE_HREF) href:string, private translate: TranslateService, private plexTv: PlexTvService,
private store: StorageService, private readonly notify: MatSnackBar) {
this.href = href;
this.route.params
.subscribe((params: any) => {
this.landingFlag = params.landing;
if (!this.landingFlag) {
this.settingsService.getLandingPage().subscribe(x => {
if (x.enabled && !this.landingFlag) {
this.router.navigate(["landingpage"]);
}
});
}
});
this.form = this.fb.group({ private errorBody: string;
username: ["", Validators.required], private errorValidation: string;
password: [""], private href: string;
rememberMe: [false],
});
this.status.getWizardStatus().subscribe(x => { private oAuthWindow: Window | null;
if (!x.result) {
this.router.navigate(["Wizard"]); constructor(
} private authService: AuthService,
private router: Router,
private status: StatusService,
private fb: FormBuilder,
private settingsService: SettingsService,
private images: ImageService,
private sanitizer: DomSanitizer,
private route: ActivatedRoute,
@Inject(APP_BASE_HREF) href: string,
private translate: TranslateService,
private plexTv: PlexTvService,
private store: StorageService,
private readonly notify: MatSnackBar
) {
this.href = href;
this.route.params.subscribe((params: any) => {
this.landingFlag = params.landing;
if (!this.landingFlag) {
this.settingsService.getLandingPage().subscribe((x) => {
if (x.enabled && !this.landingFlag) {
this.router.navigate(["landingpage"]);
}
}); });
}
});
if (authService.loggedIn()) { this.form = this.fb.group({
this.router.navigate(["/"]); username: ["", Validators.required],
} password: [""],
rememberMe: [false],
});
this.status.getWizardStatus().subscribe((x) => {
if (!x.result) {
this.router.navigate(["Wizard"]);
}
});
if (authService.loggedIn()) {
this.router.navigate(["/"]);
} }
}
public ngOnInit() { public ngOnInit() {
this.settingsService.getAuthentication().subscribe(x => this.authenticationSettings = x); this.settingsService
this.settingsService.getClientId().subscribe(x => this.clientId = x); .getAuthentication()
this.settingsService.getCustomization().subscribe(x => this.customizationSettings = x); .subscribe((x) => (this.authenticationSettings = x));
this.images.getRandomBackground().subscribe(x => { this.settingsService.getClientId().subscribe((x) => (this.clientId = x));
this.background = this.sanitizer.bypassSecurityTrustStyle("url(" + x.url + ")"); this.settingsService
}); .getCustomization()
this.timer = setInterval(() => { .subscribe((x) => (this.customizationSettings = x));
this.cycleBackground(); this.images.getRandomBackground().subscribe((x) => {
}, 30000); this.background = this.sanitizer.bypassSecurityTrustStyle(
"url(" + x.url + ")"
);
});
this.timer = setInterval(() => {
this.cycleBackground();
}, 30000);
const base = this.href; const base = this.href;
if (base.length > 1) { if (base.length > 1) {
this.baseUrl = base; this.baseUrl = base;
} }
this.translate.get("Login.Errors.IncorrectCredentials").subscribe(x => this.errorBody = x); this.translate
this.translate.get("Common.Errors.Validation").subscribe(x => this.errorValidation = x); .get("Login.Errors.IncorrectCredentials")
.subscribe((x) => (this.errorBody = x));
this.translate
.get("Common.Errors.Validation")
.subscribe((x) => (this.errorValidation = x));
}
public onSubmit(form: FormGroup) {
if (form.invalid) {
this.notify.open(this.errorValidation, "OK", {
duration: 300000,
});
return;
} }
const value = form.value;
const user = {
password: value.password,
username: value.username,
rememberMe: value.rememberMe,
usePlexOAuth: false,
plexTvPin: { id: 0, code: "" },
};
this.authService.requiresPassword(user).subscribe((x) => {
if (x && this.authenticationSettings.allowNoPassword) {
// Looks like this user requires a password
this.authenticationSettings.allowNoPassword = false;
return;
}
this.authService.login(user).subscribe(
(x) => {
this.store.save("id_token", x.access_token);
public onSubmit(form: FormGroup) { if (this.authService.loggedIn()) {
if (form.invalid) { this.ngOnDestroy();
this.notify.open(this.errorValidation, "OK", { this.router.navigate(["/"]);
duration: 300000 } else {
this.notify.open(this.errorBody, "OK", {
duration: 3000,
}); });
return; }
},
(err) => {
this.notify.open(this.errorBody, "OK", {
duration: 3000000,
});
} }
const value = form.value; );
const user = { password: value.password, username: value.username, rememberMe: value.rememberMe, usePlexOAuth: false, plexTvPin: { id: 0, code: "" } }; });
this.authService.requiresPassword(user).subscribe(x => { }
if (x && this.authenticationSettings.allowNoPassword) {
// Looks like this user requires a password
this.authenticationSettings.allowNoPassword = false;
return;
}
this.authService.login(user)
.subscribe(x => {
this.store.save("id_token", x.access_token);
if (this.authService.loggedIn()) {
this.ngOnDestroy();
this.router.navigate(["/"]);
} else {
this.notify.open(this.errorBody, "OK", {
duration: 3000
});
}
}, err => {
this.notify.open(this.errorBody, "OK", {
duration: 3000000
})
});
});
}
public oauth() { public oauth() {
if (this.oAuthWindow) { if (this.oAuthWindow) {
this.oAuthWindow.close(); this.oAuthWindow.close();
} }
this.oAuthWindow = window.open(window.location.toString(), "_blank", `toolbar=0, this.oAuthWindow = window.open(
window.location.toString(),
"_blank",
`toolbar=0,
location=0, location=0,
status=0, status=0,
menubar=0, menubar=0,
scrollbars=1, scrollbars=1,
resizable=1, resizable=1,
width=500, width=500,
height=500`); height=500`
this.plexTv.GetPin(this.clientId, this.appName).subscribe((pin: any) => { );
this.plexTv.GetPin(this.clientId, this.appName).subscribe((pin: any) => {
this.authService.login({ usePlexOAuth: true, password: "", rememberMe: true, username: "", plexTvPin: pin }).subscribe(x => { this.authService
this.oAuthWindow!.location.replace(x.url); .login({
usePlexOAuth: true,
if (this.pinTimer) { password: "",
clearInterval(this.pinTimer); rememberMe: true,
} username: "",
plexTvPin: pin,
this.pinTimer = setInterval(() => { })
if(this.oAuthWindow.closed) { .subscribe((x) => {
this.oauthLoading = true; this.oAuthWindow!.location.replace(x.url);
this.getPinResult(x.pinId);
}
}, 1000);
});
});
}
public getPinResult(pinId: number) { if (this.pinTimer) {
clearInterval(this.pinTimer); clearInterval(this.pinTimer);
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;
}
} }
this.notify.open("Could not log you in!", "OK", {
duration: 3000 this.pinTimer = setInterval(() => {
this.oauthLoading = true;
this.getPinResult(x.pinId);
}, 1000);
}); });
this.oauthLoading = false; });
}
}, err => { public getPinResult(pinId: number) {
console.log(err); this.authService.oAuth(pinId).subscribe(
this.notify.open(err.body, "OK", { (x) => {
duration: 3000 if (x.access_token) {
}); clearInterval(this.pinTimer);
this.store.save("id_token", x.access_token);
this.router.navigate(["login"]); if (this.authService.loggedIn()) {
}); this.ngOnDestroy();
}
public ngOnDestroy() { if (this.oAuthWindow) {
clearInterval(this.timer); this.oAuthWindow.close();
clearInterval(this.pinTimer); }
} this.oauthLoading = false;
this.router.navigate(["search"]);
private cycleBackground() { return;
this.images.getRandomBackground().subscribe(x => { }
this.background = ""; }
}); // if (notifyUser) {
this.images.getRandomBackground().subscribe(x => { // this.notify.open("Could not log you in!", "OK", {
this.background = this.sanitizer // duration: 3000,
.bypassSecurityTrustStyle("url(" + x.url + ")"); // });
// }
this.oauthLoading = false;
},
(err) => {
console.log(err);
this.notify.open("You are not authenticated with Ombi", "OK", {
duration: 3000,
}); });
}
this.router.navigate(["login"]);
}
);
}
public ngOnDestroy() {
clearInterval(this.timer);
clearInterval(this.pinTimer);
}
private cycleBackground() {
this.images.getRandomBackground().subscribe((x) => {
this.background = "";
});
this.images.getRandomBackground().subscribe((x) => {
this.background = this.sanitizer.bypassSecurityTrustStyle(
"url(" + x.url + ")"
);
});
}
} }

Write Preview
Loading…
Cancel
Save