github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-20 13:23:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finally fixed #72

Browse source
This commit is contained in:
tidusjar 2016-04-14 14:50:40 +01:00
commit 6190eceb60
22 changed files with 320 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

16
PlexRequests.UI/Bootstrapper.cs
View file

@ -50,6 +50,7 @@ using PlexRequests.Services.Notification;
using PlexRequests.Store;
using PlexRequests.Store.Models;
using PlexRequests.Store.Repository;
using PlexRequests.UI.Helpers;
using PlexRequests.UI.Jobs;
using TaskFactory = FluentScheduler.TaskFactory;
@ -61,7 +62,6 @@ namespace PlexRequests.UI
// by overriding the various methods and properties.
// For more information https://github.com/NancyFx/Nancy/wiki/Bootstrapper
private TinyIoCContainer _container;
protected override void ConfigureRequestContainer(TinyIoCContainer container, NancyContext context)
{
@ -109,8 +109,8 @@ namespace PlexRequests.UI
SubscribeAllObservers(container);
base.ConfigureRequestContainer(container, context);
var loc = ServiceLocator.Instance;
loc.SetContainer(container);
}
protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines)
@ -121,10 +121,14 @@ namespace PlexRequests.UI
base.ApplicationStartup(container, pipelines);
var settings = new SettingsServiceV2<PlexRequestSettings>(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider()));
var baseUrl = settings.GetSettings().BaseUrl;
var redirect = string.IsNullOrEmpty(baseUrl) ? "~/login" : $"~/{baseUrl}/login";
// Enable forms auth
var formsAuthConfiguration = new FormsAuthenticationConfiguration
{
RedirectUrl = "~/login",
RedirectUrl = redirect,
UserMapper = container.Resolve<IUserMapper>()
};
@ -141,9 +145,9 @@ namespace PlexRequests.UI
base.ConfigureConventions(nancyConventions);
var settings = new SettingsServiceV2<PlexRequestSettings>(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()),new MemoryCacheProvider()));
var assetLocation = settings.GetSettings().AssetLocation;
var assetLocation = settings.GetSettings().BaseUrl;
nancyConventions.StaticContentsConventions.Add(
StaticContentConventionBuilder.AddDirectory("assets", $"{assetLocation}/Content")
StaticContentConventionBuilder.AddDirectory($"{assetLocation}/Content", "Content")
);
}