From 5531af462cc67189f6a5d37f1c388dd230ea1fac Mon Sep 17 00:00:00 2001
From: Jamie Rees <Jamie.Rees@moneybarn.com>
Date: Thu, 19 Apr 2018 22:18:25 +0100
Subject: [PATCH] Made the app name customizable for the OAUth !wip

---
 src/Ombi.Api.Plex/PlexApi.cs                  | 34 +++++++++++--------
 .../Settings/Models/External/PlexSettings.cs  |  1 -
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/Ombi.Api.Plex/PlexApi.cs b/src/Ombi.Api.Plex/PlexApi.cs
index 6d814adf3..a16dee9ec 100644
--- a/src/Ombi.Api.Plex/PlexApi.cs
+++ b/src/Ombi.Api.Plex/PlexApi.cs
@@ -10,38 +10,42 @@ using Ombi.Api.Plex.Models.Status;
 using Ombi.Core.Settings;
 using Ombi.Core.Settings.Models.External;
 using Ombi.Helpers;
+using Ombi.Settings.Settings.Models;
 
 namespace Ombi.Api.Plex
 {
     public class PlexApi : IPlexApi
     {
-        public PlexApi(IApi api, ISettingsService<PlexSettings> settings)
+        public PlexApi(IApi api, ISettingsService<CustomizationSettings> settings)
         {
             Api = api;
-            _plex = settings;
+            _custom = settings;
         }
 
         private IApi Api { get; }
-        private readonly ISettingsService<PlexSettings> _plex;
+        private readonly ISettingsService<CustomizationSettings> _custom;
 
-        private string _clientId;
-        private string ClientIdSecret
+        private string _app;
+        private string ApplicationName
         {
             get
             {
-                if (string.IsNullOrEmpty(_clientId))
+                if (string.IsNullOrEmpty(_app))
                 {
-                    var settings = _plex.GetSettings();
-                    if (settings.UniqueInstallCode.IsNullOrEmpty())
+                    var settings = _custom.GetSettings();
+                    if (settings.ApplicationName.IsNullOrEmpty())
                     {
-                        settings.UniqueInstallCode = Guid.NewGuid().ToString("N");
-                        _plex.SaveSettings(settings);
+                        _app = "Ombi";
+                    }
+                    else
+                    {
+                        _app = settings.ApplicationName;
                     }
 
-                    _clientId = settings.UniqueInstallCode;
+                    return _app;
                 }
 
-                return _clientId;
+                return _app;
             }
         }
 
@@ -215,7 +219,7 @@ namespace Ombi.Api.Plex
             request.AddQueryString("code", code);
             request.AddQueryString("context[device][product]", "Ombi");
             request.AddQueryString("context[device][environment]", "bundled");
-            request.AddQueryString("clientID", $"OmbiV3{ClientIdSecret}");
+            request.AddQueryString("clientID", $"OmbiV3");
 
             if (request.FullUri.Fragment.Equals("#"))
             {
@@ -246,8 +250,8 @@ namespace Ombi.Api.Plex
         /// <param name="request"></param>
         private void AddHeaders(Request request)
         {
-            request.AddHeader("X-Plex-Client-Identifier", $"OmbiV3{ClientIdSecret}");
-            request.AddHeader("X-Plex-Product", "Ombi");
+            request.AddHeader("X-Plex-Client-Identifier", $"OmbiV3");
+            request.AddHeader("X-Plex-Product", ApplicationName);
             request.AddHeader("X-Plex-Version", "3");
             request.AddContentHeader("Content-Type", request.ContentType == ContentType.Json ? "application/json" : "application/xml");
             request.AddHeader("Accept", "application/json");
diff --git a/src/Ombi.Settings/Settings/Models/External/PlexSettings.cs b/src/Ombi.Settings/Settings/Models/External/PlexSettings.cs
index dd92eba18..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 string UniqueInstallCode { get; set; }
         public List<PlexServers> Servers { get; set; }
     }