mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-07-11 07:46:05 -07:00
More user management
This commit is contained in:
parent
c064bc6d44
commit
fdba68bb3d
5 changed files with 134 additions and 1 deletions
|
@ -26,13 +26,16 @@
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
using NLog;
|
using NLog;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using PlexRequests.Api.Interfaces;
|
||||||
using PlexRequests.Core.SettingModels;
|
using PlexRequests.Core.SettingModels;
|
||||||
using PlexRequests.Helpers;
|
using PlexRequests.Helpers;
|
||||||
using PlexRequests.Helpers.Permissions;
|
using PlexRequests.Helpers.Permissions;
|
||||||
using PlexRequests.Store;
|
using PlexRequests.Store;
|
||||||
|
using PlexRequests.Store.Models;
|
||||||
using PlexRequests.Store.Repository;
|
using PlexRequests.Store.Repository;
|
||||||
|
|
||||||
namespace PlexRequests.Core.Migration.Migrations
|
namespace PlexRequests.Core.Migration.Migrations
|
||||||
|
@ -40,16 +43,27 @@ namespace PlexRequests.Core.Migration.Migrations
|
||||||
[Migration(11000, "v1.10.0.0")]
|
[Migration(11000, "v1.10.0.0")]
|
||||||
public class Version1100 : BaseMigration, IMigration
|
public class Version1100 : BaseMigration, IMigration
|
||||||
{
|
{
|
||||||
public Version1100(IUserRepository userRepo, IRequestService requestService, ISettingsService<LogSettings> log)
|
public Version1100(IUserRepository userRepo, IRequestService requestService, ISettingsService<LogSettings> log, IPlexApi plexApi, ISettingsService<PlexSettings> plexService, IRepository<PlexUsers> plexusers,
|
||||||
|
ISettingsService<PlexRequestSettings> prSettings, ISettingsService<UserManagementSettings> umSettings)
|
||||||
{
|
{
|
||||||
UserRepo = userRepo;
|
UserRepo = userRepo;
|
||||||
RequestService = requestService;
|
RequestService = requestService;
|
||||||
Log = log;
|
Log = log;
|
||||||
|
PlexApi = plexApi;
|
||||||
|
PlexSettings = plexService;
|
||||||
|
PlexUsers = plexusers;
|
||||||
|
PlexRequestSettings = prSettings;
|
||||||
|
UserManagementSettings = umSettings;
|
||||||
}
|
}
|
||||||
public int Version => 11000;
|
public int Version => 11000;
|
||||||
private IUserRepository UserRepo { get; }
|
private IUserRepository UserRepo { get; }
|
||||||
private IRequestService RequestService { get; }
|
private IRequestService RequestService { get; }
|
||||||
private ISettingsService<LogSettings> Log { get; }
|
private ISettingsService<LogSettings> Log { get; }
|
||||||
|
private IPlexApi PlexApi { get; }
|
||||||
|
private ISettingsService<PlexSettings> PlexSettings { get; }
|
||||||
|
private IRepository<PlexUsers> PlexUsers { get; }
|
||||||
|
private ISettingsService<PlexRequestSettings> PlexRequestSettings { get; }
|
||||||
|
private ISettingsService<UserManagementSettings> UserManagementSettings { get; }
|
||||||
|
|
||||||
public void Start(IDbConnection con)
|
public void Start(IDbConnection con)
|
||||||
{
|
{
|
||||||
|
@ -58,9 +72,79 @@ namespace PlexRequests.Core.Migration.Migrations
|
||||||
// Update the current admin permissions set
|
// Update the current admin permissions set
|
||||||
UpdateAdmin();
|
UpdateAdmin();
|
||||||
ResetLogLevel();
|
ResetLogLevel();
|
||||||
|
UpdatePlexUsers();
|
||||||
|
PopulateDefaultUserManagementSettings();
|
||||||
|
|
||||||
UpdateSchema(con, Version);
|
UpdateSchema(con, Version);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void PopulateDefaultUserManagementSettings()
|
||||||
|
{
|
||||||
|
var plexRequestSettings = PlexRequestSettings.GetSettings();
|
||||||
|
|
||||||
|
UserManagementSettings.SaveSettings(new UserManagementSettings
|
||||||
|
{
|
||||||
|
AutoApproveMovies = !plexRequestSettings.RequireMovieApproval,
|
||||||
|
SearchForTvShows = plexRequestSettings.SearchForTvShows,
|
||||||
|
SearchForMusic = plexRequestSettings.SearchForMusic,
|
||||||
|
SearchForMovies = plexRequestSettings.SearchForMovies,
|
||||||
|
AutoApproveMusic = !plexRequestSettings.RequireMusicApproval,
|
||||||
|
AutoApproveTvShows = !plexRequestSettings.RequireTvShowApproval
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdatePlexUsers()
|
||||||
|
{
|
||||||
|
var settings = PlexSettings.GetSettings();
|
||||||
|
var plexUsers = PlexApi.GetUsers(settings.PlexAuthToken);
|
||||||
|
var prSettings = PlexRequestSettings.GetSettings();
|
||||||
|
|
||||||
|
var dbUsers = PlexUsers.GetAll().ToList();
|
||||||
|
foreach (var user in plexUsers.User)
|
||||||
|
{
|
||||||
|
if (dbUsers.FirstOrDefault(x => x.PlexUserId == user.Id) != null)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
int permissions = 0;
|
||||||
|
if (prSettings.SearchForMovies)
|
||||||
|
{
|
||||||
|
permissions = (int) Permissions.RequestMovie;
|
||||||
|
}
|
||||||
|
if (prSettings.SearchForTvShows)
|
||||||
|
{
|
||||||
|
permissions += (int) Permissions.RequestTvShow;
|
||||||
|
}
|
||||||
|
if (prSettings.SearchForMusic)
|
||||||
|
{
|
||||||
|
permissions += (int) Permissions.RequestMusic;
|
||||||
|
}
|
||||||
|
if (!prSettings.RequireMovieApproval)
|
||||||
|
{
|
||||||
|
permissions += (int)Permissions.AutoApproveMovie;
|
||||||
|
}
|
||||||
|
if (!prSettings.RequireTvShowApproval)
|
||||||
|
{
|
||||||
|
permissions += (int)Permissions.AutoApproveTv;
|
||||||
|
}
|
||||||
|
if (!prSettings.RequireMusicApproval)
|
||||||
|
{
|
||||||
|
permissions += (int)Permissions.AutoApproveAlbum;
|
||||||
|
}
|
||||||
|
|
||||||
|
var m = new PlexUsers
|
||||||
|
{
|
||||||
|
PlexUserId = user.Id,
|
||||||
|
Permissions = permissions,
|
||||||
|
Features = 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
PlexUsers.Insert(m);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private void ResetLogLevel()
|
private void ResetLogLevel()
|
||||||
{
|
{
|
||||||
var logSettings = Log.GetSettings();
|
var logSettings = Log.GetSettings();
|
||||||
|
|
|
@ -74,6 +74,14 @@
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\PlexRequests.Api.Interfaces\PlexRequests.Api.Interfaces.csproj">
|
||||||
|
<Project>{95834072-A675-415D-AA8F-877C91623810}</Project>
|
||||||
|
<Name>PlexRequests.Api.Interfaces</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\PlexRequests.Api.Models\PlexRequests.Api.Models.csproj">
|
||||||
|
<Project>{CB37A5F8-6DFC-4554-99D3-A42B502E4591}</Project>
|
||||||
|
<Name>PlexRequests.Api.Models</Name>
|
||||||
|
</ProjectReference>
|
||||||
<ProjectReference Include="..\PlexRequests.Core\PlexRequests.Core.csproj">
|
<ProjectReference Include="..\PlexRequests.Core\PlexRequests.Core.csproj">
|
||||||
<Project>{DD7DC444-D3BF-4027-8AB9-EFC71F5EC581}</Project>
|
<Project>{DD7DC444-D3BF-4027-8AB9-EFC71F5EC581}</Project>
|
||||||
<Name>PlexRequests.Core</Name>
|
<Name>PlexRequests.Core</Name>
|
||||||
|
|
|
@ -134,6 +134,7 @@
|
||||||
<Compile Include="SettingModels\PlexRequestSettings.cs" />
|
<Compile Include="SettingModels\PlexRequestSettings.cs" />
|
||||||
<Compile Include="SettingModels\Settings.cs" />
|
<Compile Include="SettingModels\Settings.cs" />
|
||||||
<Compile Include="SettingModels\SystemSettings.cs" />
|
<Compile Include="SettingModels\SystemSettings.cs" />
|
||||||
|
<Compile Include="SettingModels\UserManagementSettings.cs" />
|
||||||
<Compile Include="SettingsServiceV2.cs" />
|
<Compile Include="SettingsServiceV2.cs" />
|
||||||
<Compile Include="Setup.cs" />
|
<Compile Include="Setup.cs" />
|
||||||
<Compile Include="StatusChecker\AppveyorArtifactResult.cs" />
|
<Compile Include="StatusChecker\AppveyorArtifactResult.cs" />
|
||||||
|
|
38
PlexRequests.Core/SettingModels/UserManagementSettings.cs
Normal file
38
PlexRequests.Core/SettingModels/UserManagementSettings.cs
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2016 Jamie Rees
|
||||||
|
// File: UserManagementSettings.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.SettingModels
|
||||||
|
{
|
||||||
|
public class UserManagementSettings
|
||||||
|
{
|
||||||
|
public bool SearchForMovies { get; set; }
|
||||||
|
public bool SearchForTvShows { get; set; }
|
||||||
|
public bool SearchForMusic { get; set; }
|
||||||
|
public bool AutoApproveMovies { get; set; }
|
||||||
|
public bool AutoApproveTvShows { get; set; }
|
||||||
|
public bool AutoApproveMusic { get; set; }
|
||||||
|
}
|
||||||
|
}
|
|
@ -33,6 +33,7 @@ namespace PlexRequests.UI.Modules
|
||||||
PlexSettings = plex;
|
PlexSettings = plex;
|
||||||
UserLoginsRepo = userLogins;
|
UserLoginsRepo = userLogins;
|
||||||
PlexUsersRepository = plexRepo;
|
PlexUsersRepository = plexRepo;
|
||||||
|
PlexRequestSettings = pr;
|
||||||
|
|
||||||
Get["/"] = x => Load();
|
Get["/"] = x => Load();
|
||||||
|
|
||||||
|
@ -51,6 +52,7 @@ namespace PlexRequests.UI.Modules
|
||||||
private ISettingsService<PlexSettings> PlexSettings { get; }
|
private ISettingsService<PlexSettings> PlexSettings { get; }
|
||||||
private IRepository<UserLogins> UserLoginsRepo { get; }
|
private IRepository<UserLogins> UserLoginsRepo { get; }
|
||||||
private IRepository<PlexUsers> PlexUsersRepository { get; }
|
private IRepository<PlexUsers> PlexUsersRepository { get; }
|
||||||
|
private ISettingsService<PlexRequestSettings> PlexRequestSettings { get; }
|
||||||
|
|
||||||
private Negotiator Load()
|
private Negotiator Load()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue