From a0dbd1c442b5e32ccab40335e378988bd57fce89 Mon Sep 17 00:00:00 2001
From: Jamie Rees <Jamie.Rees@moneybarn.com>
Date: Sat, 21 Apr 2018 22:47:01 +0100
Subject: [PATCH] Fixed #2151

---
 src/Ombi.Core/Engine/Interfaces/BaseEngine.cs | 15 +--------------
 src/Ombi.Store/Context/OmbiContext.cs         | 16 ++++++++++++++++
 src/Ombi.Store/Entities/User.cs               |  1 +
 src/Ombi/Controllers/IdentityController.cs    |  2 +-
 src/Ombi/Properties/launchSettings.json       |  1 +
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs b/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
index e608ffebb..26bc5969c 100644
--- a/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
+++ b/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
@@ -32,14 +32,7 @@ namespace Ombi.Core.Engine.Interfaces
         private OmbiUser _user;
         protected async Task<OmbiUser> GetUser()
         {
-            if (IsApiUser)
-            {
-                return new OmbiUser
-                {
-                    UserName = Username,
-                };
-            }
-            return _user ?? (_user = await UserManager.Users.FirstOrDefaultAsync(x => x.UserName == Username));
+            return _user ?? (_user = await UserManager.Users.FirstOrDefaultAsync(x => x.UserName.Equals(Username, StringComparison.CurrentCultureIgnoreCase)));
         }
 
         protected async Task<string> UserAlias()
@@ -49,10 +42,6 @@ namespace Ombi.Core.Engine.Interfaces
 
         protected async Task<bool> IsInRole(string roleName)
         {
-            if (IsApiUser && roleName != OmbiRoles.Disabled)
-            {
-                return true;
-            }
             return await UserManager.IsInRoleAsync(await GetUser(), roleName);
         }
         
@@ -72,7 +61,5 @@ namespace Ombi.Core.Engine.Interfaces
             var ruleResults = await Rules.StartSpecificRules(model, rule);
             return ruleResults;
         }
-
-        private bool IsApiUser => Username.Equals("Api", StringComparison.CurrentCultureIgnoreCase);
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Store/Context/OmbiContext.cs b/src/Ombi.Store/Context/OmbiContext.cs
index e4c9be516..d1963e765 100644
--- a/src/Ombi.Store/Context/OmbiContext.cs
+++ b/src/Ombi.Store/Context/OmbiContext.cs
@@ -123,7 +123,23 @@ namespace Ombi.Store.Context
                 {
                     NormalizedName = OmbiRoles.RecievesNewsletter.ToUpper()
                 });
+                SaveChanges();
             }
+
+            // Make sure we have the API User
+            var apiUserExists = Users.Any(x => x.UserName.Equals("Api", StringComparison.CurrentCultureIgnoreCase));
+            if (!apiUserExists)
+            {
+                Users.Add(new OmbiUser
+                {
+                    UserName = "Api",
+                    UserType = UserType.SystemUser,
+                    NormalizedUserName = "API",
+
+                });
+                SaveChanges();
+            }
+
             //Check if templates exist
             var templates = NotificationTemplates.ToList();
 
diff --git a/src/Ombi.Store/Entities/User.cs b/src/Ombi.Store/Entities/User.cs
index d9a3207b2..68d1dbe00 100644
--- a/src/Ombi.Store/Entities/User.cs
+++ b/src/Ombi.Store/Entities/User.cs
@@ -29,6 +29,7 @@ namespace Ombi.Store.Entities
 {
     public enum UserType
     {
+        SystemUser = 0,
         LocalUser = 1,
         PlexUser = 2,
         EmbyUser = 3,
diff --git a/src/Ombi/Controllers/IdentityController.cs b/src/Ombi/Controllers/IdentityController.cs
index 5db5f2168..fe63226e6 100644
--- a/src/Ombi/Controllers/IdentityController.cs
+++ b/src/Ombi/Controllers/IdentityController.cs
@@ -213,7 +213,7 @@ namespace Ombi.Controllers
         [PowerUser]
         public async Task<IEnumerable<UserViewModel>> GetAllUsers()
         {
-            var users = await UserManager.Users
+            var users = await UserManager.Users.Where(x => x.UserType != UserType.LocalUser)
                 .ToListAsync();
 
             var model = new List<UserViewModel>();
diff --git a/src/Ombi/Properties/launchSettings.json b/src/Ombi/Properties/launchSettings.json
index ec5deb319..33794436c 100644
--- a/src/Ombi/Properties/launchSettings.json
+++ b/src/Ombi/Properties/launchSettings.json
@@ -10,6 +10,7 @@
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
+      "commandLineArgs": "-baseurl /testing",
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"