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

Removed no longer needed stuff and fixed linting !wip

Browse source
This commit is contained in:
Jamie Rees 2018-04-20 10:41:40 +01:00
commit f05a9a5090
6 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,6 @@ export class LoginComponent implements OnDestroy, OnInit {
return true; return true;
} }
this.loginWithOmbi = true; this.loginWithOmbi = true;
return true; return true;
} }
@ -145,7 +144,7 @@ export class LoginComponent implements OnDestroy, OnInit {
public oauth() { public oauth() {
this.authService.login({usePlexOAuth: true, password:"",rememberMe:true,username:""}).subscribe(x => { this.authService.login({usePlexOAuth: true, password:"",rememberMe:true,username:""}).subscribe(x => {
window.location.href = x.url; window.location.href = x.url;
}) });
} }
public ngOnDestroy() { public ngOnDestroy() {
@ -161,5 +160,4 @@ export class LoginComponent implements OnDestroy, OnInit {
.bypassSecurityTrustStyle("linear-gradient(-10deg, transparent 20%, rgba(0,0,0,0.7) 20.0%, rgba(0,0,0,0.7) 80.0%, transparent 80%), url(" + x.url + ")"); .bypassSecurityTrustStyle("linear-gradient(-10deg, transparent 20%, rgba(0,0,0,0.7) 20.0%, rgba(0,0,0,0.7) 80.0%, transparent 80%), url(" + x.url + ")");
}); });
} }
} }

4
src/Ombi/ClientApp/app/login/loginoauth.component.ts
View file

@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from "@angular/router";
import { AuthService } from "../auth/auth.service"; import { AuthService } from "../auth/auth.service";
@Component({ @Component({
templateUrl: "./loginoauth.component.html" templateUrl: "./loginoauth.component.html",
}) })
export class LoginOAuthComponent implements OnInit { export class LoginOAuthComponent implements OnInit {
public pin: number; public pin: number;
@ -18,7 +18,7 @@ export class LoginOAuthComponent implements OnInit {
}); });
} }
ngOnInit(): void { public ngOnInit(): void {
this.auth(); this.auth();
} }

3
src/Ombi/ClientApp/app/wizard/plex/plex.component.ts
View file

@ -1,7 +1,6 @@
import { Component } from "@angular/core"; import { Component } from "@angular/core";
import { Router } from "@angular/router"; import { Router } from "@angular/router";
import { PlexService } from "../../services"; import { PlexService } from "../../services";
import { IdentityService, NotificationService, SettingsService } from "../../services"; import { IdentityService, NotificationService, SettingsService } from "../../services";
import { AuthService } from "./../../auth/auth.service"; import { AuthService } from "./../../auth/auth.service";
@ -57,7 +56,7 @@ export class PlexComponent {
return; return;
} }
}); });
} },
); );
} }

5
src/Ombi/ClientApp/app/wizard/plex/plexoauth.component.ts
View file

@ -1,7 +1,7 @@
import { Component, OnInit } from "@angular/core"; import { Component, OnInit } from "@angular/core";
import { ActivatedRoute, Router } from "@angular/router"; import { ActivatedRoute, Router } from "@angular/router";
import { PlexOAuthService, IdentityService, SettingsService } from "../../services"; import { IdentityService, PlexOAuthService, SettingsService } from "../../services";
import { AuthService } from "./../../auth/auth.service"; import { AuthService } from "./../../auth/auth.service";
@Component({ @Component({
@ -23,14 +23,13 @@ export class PlexOAuthComponent implements OnInit {
}); });
} }
ngOnInit(): void { public ngOnInit(): void {
this.plexOauth.oAuth(this.pinId).subscribe(x => { this.plexOauth.oAuth(this.pinId).subscribe(x => {
if(!x.accessToken) { if(!x.accessToken) {
return; return;
// RETURN // RETURN
} }
this.identityService.createWizardUser({ this.identityService.createWizardUser({
username: "", username: "",
password: "", password: "",

1
src/Ombi/Controllers/External/PlexController.cs vendored
View file

@ -69,7 +69,6 @@ namespace Ombi.Controllers.External
_log.LogDebug("Adding first server"); _log.LogDebug("Adding first server");
settings.Enable = true; settings.Enable = true;
settings.UniqueInstallCode = Guid.NewGuid().ToString("N");
settings.Servers = new List<PlexServers> { settings.Servers = new List<PlexServers> {
new PlexServers new PlexServers
{ {

4
src/Ombi/Controllers/SettingsController.cs
View file

@ -143,10 +143,6 @@ namespace Ombi.Controllers
public async Task<PlexSettings> PlexSettings() public async Task<PlexSettings> PlexSettings()
{ {
var s = await Get<PlexSettings>(); var s = await Get<PlexSettings>();
if (s.UniqueInstallCode.IsNullOrEmpty())
{
s.UniqueInstallCode = Guid.NewGuid().ToString("N");
}
return s; return s;
} }