From 73340d4fb65a549617a9eb6c3249a41f84e059f5 Mon Sep 17 00:00:00 2001
From: Jamie <tidusjar@gmail.com>
Date: Tue, 24 Apr 2018 21:13:52 +0100
Subject: [PATCH] moved the Plex OAuth setting to the Authentication Settings
 !wip

---
 .../Settings/Models/AuthenticationSettings.cs          |  1 +
 .../Settings/Models/External/PlexSettings.cs           |  1 -
 src/Ombi/ClientApp/app/interfaces/ISettings.ts         |  2 +-
 src/Ombi/ClientApp/app/login/login.component.html      |  4 ++--
 src/Ombi/ClientApp/app/login/login.component.ts        |  1 -
 src/Ombi/ClientApp/app/services/settings.service.ts    |  4 ----
 .../authentication/authentication.component.html       |  7 +++++++
 .../authentication/authentication.component.ts         |  1 +
 .../ClientApp/app/settings/plex/plex.component.html    |  6 ------
 src/Ombi/Controllers/SettingsController.cs             | 10 ----------
 10 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/Ombi.Settings/Settings/Models/AuthenticationSettings.cs b/src/Ombi.Settings/Settings/Models/AuthenticationSettings.cs
index 9ce5c72ac..f6736e7c5 100644
--- a/src/Ombi.Settings/Settings/Models/AuthenticationSettings.cs
+++ b/src/Ombi.Settings/Settings/Models/AuthenticationSettings.cs
@@ -12,5 +12,6 @@ namespace Ombi.Settings.Settings.Models
         public bool RequireLowercase { get; set; }
         public bool RequireNonAlphanumeric { get; set; }
         public bool RequireUppercase { get; set; }
+        public bool EnableOAuth { get; set; } // Plex OAuth
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Settings/Settings/Models/External/PlexSettings.cs b/src/Ombi.Settings/Settings/Models/External/PlexSettings.cs
index a77b54a87..3faba3e42 100644
--- a/src/Ombi.Settings/Settings/Models/External/PlexSettings.cs
+++ b/src/Ombi.Settings/Settings/Models/External/PlexSettings.cs
@@ -6,7 +6,6 @@ namespace Ombi.Core.Settings.Models.External
     public sealed class PlexSettings : Ombi.Settings.Settings.Models.Settings
     {
         public bool Enable { get; set; }
-        public bool EnableOAuth { get; set; }
         public List<PlexServers> Servers { get; set; }
     }
 
diff --git a/src/Ombi/ClientApp/app/interfaces/ISettings.ts b/src/Ombi/ClientApp/app/interfaces/ISettings.ts
index 234e0aa5b..bf429d6d5 100644
--- a/src/Ombi/ClientApp/app/interfaces/ISettings.ts
+++ b/src/Ombi/ClientApp/app/interfaces/ISettings.ts
@@ -43,7 +43,6 @@ export interface IEmbyServer extends IExternalSettings {
 
 export interface IPlexSettings extends ISettings {
   enable: boolean;
-  enableOAuth: boolean;
   servers: IPlexServer[];
 }
 
@@ -146,6 +145,7 @@ export interface IAuthenticationSettings extends ISettings {
   requiredLowercase: boolean;
   requireNonAlphanumeric: boolean;
   requireUppercase: boolean;
+  enableOAuth: boolean;
 }
 
 export interface IUserManagementSettings extends ISettings {
diff --git a/src/Ombi/ClientApp/app/login/login.component.html b/src/Ombi/ClientApp/app/login/login.component.html
index 40a5ef5a0..d87b7121e 100644
--- a/src/Ombi/ClientApp/app/login/login.component.html
+++ b/src/Ombi/ClientApp/app/login/login.component.html
@@ -17,7 +17,7 @@ include the remember me checkbox
             </div>
             <p id="profile-name" class="profile-name-card"></p>
 
-            <div *ngIf="!plexEnabled || loginWithOmbi">
+            <div *ngIf="!authenticationSettings.enableOAuth || loginWithOmbi">
                 <form *ngIf="authenticationSettings" class="form-signin" novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
 
 
@@ -41,7 +41,7 @@ include the remember me checkbox
                 <!-- /form -->
             </div>
             <!-- Main OAuth Flow -->
-            <div *ngIf="plexEnabled && !loginWithOmbi">
+            <div *ngIf="authenticationSettings.enableOAuth && !loginWithOmbi">
             <div class="form-signin">
                 <button class="btn btn-success" type="button" (click)="loginWithOmbi = true">
                     Sign In With {{appName}}</button>
diff --git a/src/Ombi/ClientApp/app/login/login.component.ts b/src/Ombi/ClientApp/app/login/login.component.ts
index e7de8730b..c23f04f50 100644
--- a/src/Ombi/ClientApp/app/login/login.component.ts
+++ b/src/Ombi/ClientApp/app/login/login.component.ts
@@ -79,7 +79,6 @@ export class LoginComponent implements OnDestroy, OnInit {
     public ngOnInit() {
         this.settingsService.getAuthentication().subscribe(x => this.authenticationSettings = x);
         this.settingsService.getCustomization().subscribe(x => this.customizationSettings = x);
-        this.settingsService.getStatusPlex().subscribe(x => this.plexEnabled = x);
         this.images.getRandomBackground().subscribe(x => {
             this.background = this.sanitizer.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 + ")");
         });
diff --git a/src/Ombi/ClientApp/app/services/settings.service.ts b/src/Ombi/ClientApp/app/services/settings.service.ts
index 61a85874e..f6f770a19 100644
--- a/src/Ombi/ClientApp/app/services/settings.service.ts
+++ b/src/Ombi/ClientApp/app/services/settings.service.ts
@@ -71,10 +71,6 @@ export class SettingsService extends ServiceHelpers {
         return this.http.get<IPlexSettings>(`${this.url}/Plex/`, {headers: this.headers});
     }
 
-    public getStatusPlex(): Observable<boolean> {
-        return this.http.get<boolean>(`${this.url}/Plexstatus/`, {headers: this.headers});
-    }
-
     public savePlex(settings: IPlexSettings): Observable<boolean> {
         return this.http.post<boolean>(`${this.url}/Plex/`, JSON.stringify(settings), {headers: this.headers});
     }
diff --git a/src/Ombi/ClientApp/app/settings/authentication/authentication.component.html b/src/Ombi/ClientApp/app/settings/authentication/authentication.component.html
index 394716028..a270d513c 100644
--- a/src/Ombi/ClientApp/app/settings/authentication/authentication.component.html
+++ b/src/Ombi/ClientApp/app/settings/authentication/authentication.component.html
@@ -14,6 +14,13 @@
                 </div>
             </div>
 
+            <div class="form-group">
+                <div class="checkbox">
+                    <input type="checkbox" id="enableOAuth" name="enableOAuth" formControlName="enableOAuth">
+                    <label for="enableOAuth" >Enable Plex OAuth</label>
+                </div>
+            </div>
+
             <!-- <hr/>
             <div class="form-group">
                 <div class="checkbox">
diff --git a/src/Ombi/ClientApp/app/settings/authentication/authentication.component.ts b/src/Ombi/ClientApp/app/settings/authentication/authentication.component.ts
index 07346f358..50152409c 100644
--- a/src/Ombi/ClientApp/app/settings/authentication/authentication.component.ts
+++ b/src/Ombi/ClientApp/app/settings/authentication/authentication.component.ts
@@ -24,6 +24,7 @@ export class AuthenticationComponent implements OnInit {
                 requiredLowercase: [x.requiredLowercase],
                 requireNonAlphanumeric: [x.requireNonAlphanumeric],
                 requireUppercase: [x.requireUppercase],
+                enableOAuth: [x.enableOAuth],
             });
         });
     }
diff --git a/src/Ombi/ClientApp/app/settings/plex/plex.component.html b/src/Ombi/ClientApp/app/settings/plex/plex.component.html
index 8f2b01571..6310a9cf1 100644
--- a/src/Ombi/ClientApp/app/settings/plex/plex.component.html
+++ b/src/Ombi/ClientApp/app/settings/plex/plex.component.html
@@ -17,12 +17,6 @@
                     <label for="enable">Enable</label>
                 </div>
             </div>
-            <div class="form-group col-md-3">
-                <div class="checkbox">
-                    <input type="checkbox" id="enableOAuth" [(ngModel)]="settings.enableOAuth" [checked]="settings.enableOAuth">
-                    <label for="enableOAuth">Enable OAuth</label>
-                </div>
-            </div>
             <div class="col-md-2 col-md-push-7">
                 <button type="button" (click)="addTab()" class="btn btn-success-outline">Add Server</button>
             </div>
diff --git a/src/Ombi/Controllers/SettingsController.cs b/src/Ombi/Controllers/SettingsController.cs
index 1bbb5af49..2e489adf2 100644
--- a/src/Ombi/Controllers/SettingsController.cs
+++ b/src/Ombi/Controllers/SettingsController.cs
@@ -147,16 +147,6 @@ namespace Ombi.Controllers
             return s;
         }
 
-        [HttpGet("plexstatus")]
-        [AllowAnonymous]
-        public async Task<bool> PlexStatusSettings()
-        {
-            var s = await Get<PlexSettings>();
-           
-
-            return s.Enable && s.EnableOAuth;
-        }
-
         /// <summary>
         /// Save the Plex settings.
         /// </summary>