Finished #49

PlexRequests.Core/JsonRequestService.cs

@@ -30,6 +30,7 @@ using System.Text;
 
 using Newtonsoft.Json;
 
+using PlexRequests.Helpers;
 using PlexRequests.Store;
 using PlexRequests.Store.Models;
 using PlexRequests.Store.Repository;
@@ -45,13 +46,13 @@ namespace PlexRequests.Core
         private IRequestRepository Repo { get; }
         public long AddRequest(RequestedModel model)
         {
-            var entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId };
+            var entity = new RequestBlobs { Type = model.Type, Content = ByteConverterHelper.ReturnBytes(model), ProviderId = model.ProviderId };
             var id = Repo.Insert(entity);
 
             // TODO Keep an eye on this, since we are now doing 2 DB update for 1 single request, inserting and then updating
             model.Id = (int)id;
 
-            entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId, Id = (int)id };
+            entity = new RequestBlobs { Type = model.Type, Content = ByteConverterHelper.ReturnBytes(model), ProviderId = model.ProviderId, Id = (int)id };
             var result = Repo.Update(entity);
 
             return result ? id : -1;
@@ -71,15 +72,14 @@ namespace PlexRequests.Core
 
         public bool UpdateRequest(RequestedModel model)
         {
-            var entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId, Id = model.Id };
+            var entity = new RequestBlobs { Type = model.Type, Content = ByteConverterHelper.ReturnBytes(model), ProviderId = model.ProviderId, Id = model.Id };
             return Repo.Update(entity);
         }
 
         public RequestedModel Get(int id)
         {
             var blob = Repo.Get(id);
-            var json = Encoding.UTF8.GetString(blob.Content);
-            var model = JsonConvert.DeserializeObject<RequestedModel>(json);
+            var model = ByteConverterHelper.ReturnObject<RequestedModel>(blob.Content);
             return model;
         }
 
@@ -93,16 +93,8 @@ namespace PlexRequests.Core
 
         public bool BatchUpdate(List<RequestedModel> model)
         {
-            var entities = model.Select(m => new RequestBlobs { Type = m.Type, Content = ReturnBytes(m), ProviderId = m.ProviderId, Id = m.Id }).ToList();
+            var entities = model.Select(m => new RequestBlobs { Type = m.Type, Content = ByteConverterHelper.ReturnBytes(m), ProviderId = m.ProviderId, Id = m.Id }).ToList();
             return Repo.UpdateAll(entities);
         }
-
-        public byte[] ReturnBytes(object obj)
-        {
-            var json = JsonConvert.SerializeObject(obj);
-            var bytes = Encoding.UTF8.GetBytes(json);
-
-            return bytes;
-        }
     }
 }

PlexRequests.Core/Models/UserProperties.cs

@@ -0,0 +1,35 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: UserProperties.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  ************************************************************************/
+#endregion
+namespace PlexRequests.Core.Models
+{
+    public class UserProperties
+    {
+        public string EmailAddress { get; set; }
+        public bool NotifyOnRelease { get; set; } 
+        public bool NotifyOnApprove { get; set; } 
+    }
+}

PlexRequests.Core/PlexRequests.Core.csproj

@@ -72,6 +72,7 @@
     <Compile Include="ISettingsService.cs" />
     <Compile Include="JsonRequestService.cs" />
     <Compile Include="Models\StatusModel.cs" />
+    <Compile Include="Models\UserProperties.cs" />
     <Compile Include="SettingModels\AuthenticationSettings.cs" />
     <Compile Include="SettingModels\PushoverNotificationSettings.cs" />
     <Compile Include="SettingModels\PushBulletNotificationSettings.cs" />

PlexRequests.Core/UserMapper.cs

@@ -25,6 +25,7 @@
 //  ************************************************************************/
 #endregion
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Security;
 
@@ -32,6 +33,7 @@ using Nancy;
 using Nancy.Authentication.Forms;
 using Nancy.Security;
 
+using PlexRequests.Core.Models;
 using PlexRequests.Helpers;
 using PlexRequests.Store;
 
@@ -46,7 +48,7 @@ namespace PlexRequests.Core
         private static ISqliteConfiguration Db { get; set; }
         public IUserIdentity GetUserFromIdentifier(Guid identifier, NancyContext context)
         {
-           var repo = new UserRepository<UsersModel>(Db);
+            var repo = new UserRepository<UsersModel>(Db);
 
             var user = repo.Get(identifier.ToString());
 
@@ -58,6 +60,7 @@ namespace PlexRequests.Core
             return new UserIdentity
             {
                 UserName = user.UserName,
+                Claims = ByteConverterHelper.ReturnObject<string[]>(user.Claims)
             };
         }
 
@@ -84,7 +87,7 @@ namespace PlexRequests.Core
         {
             var repo = new UserRepository<UsersModel>(Db);
             var users = repo.GetAll();
-            
+
             return users.Any();
         }
 
@@ -93,15 +96,23 @@ namespace PlexRequests.Core
             var repo = new UserRepository<UsersModel>(Db);
             var salt = PasswordHasher.GenerateSalt();
 
-            var userModel = new UsersModel { UserName = username, UserGuid = Guid.NewGuid().ToString(), Salt = salt, Hash = PasswordHasher.ComputeHash(password, salt), Claims = claims};
+            var userModel = new UsersModel
+            {
+                UserName = username,
+                UserGuid = Guid.NewGuid().ToString(),
+                Salt = salt,
+                Hash = PasswordHasher.ComputeHash(password, salt),
+                Claims = JsonRequestService.ReturnBytes(claims),
+                UserProperties = JsonRequestService.ReturnBytes(new UserProperties())
+            };
             repo.Insert(userModel);
 
             var userRecord = repo.Get(userModel.UserGuid);
-                
+
             return new Guid(userRecord.UserGuid);
         }
 
-        public static bool UpdateUser(string username, string oldPassword, string newPassword)
+        public static bool UpdatePassword(string username, string oldPassword, string newPassword)
         {
             var repo = new UserRepository<UsersModel>(Db);
             var users = repo.GetAll();
@@ -123,5 +134,11 @@ namespace PlexRequests.Core
 
             return repo.Update(userToChange);
         }
+
+        public static IEnumerable<UsersModel> GetUsers()
+        {
+            var repo = new UserRepository<UsersModel>(Db);
+            return repo.GetAll();
+        }
     }
 }