Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions Umbraco2FA/Umbraco/Fortress/Installer/OwinStartupInstallAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,7 @@ public string Alias()
}

public bool Execute(string packageName, XmlNode xmlData)
{
LogHelper.Debug<OwinStartupInstallAction>("Execute");

Configuration config = WebConfigurationManager.OpenWebConfiguration("/");
string oldValue = config.AppSettings.Settings["owin:appStartup"].Value;
if (oldValue == "UmbracoDefaultOwinStartup")
{
LogHelper.Debug<OwinStartupInstallAction>("Setting to FortressOwinStartup");
config.AppSettings.Settings["owin:appStartup"].Value = "FortressOwinStartup";
config.Save(ConfigurationSaveMode.Modified);
}
{
return true;
}

Expand All @@ -39,12 +29,7 @@ public XmlNode SampleXml()
}

public bool Undo(string packageName, XmlNode xmlData)
{
LogHelper.Debug<OwinStartupInstallAction>("Undo");

Configuration config = WebConfigurationManager.OpenWebConfiguration("/");
config.AppSettings.Settings["owin:appStartup"].Value = "UmbracoDefaultOwinStartup";
config.Save(ConfigurationSaveMode.Modified);
{
return true;
}
}
Expand Down
21 changes: 9 additions & 12 deletions Umbraco2FA/Umbraco/Fortress/Startup/FortressOwinStartup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,16 @@
using Microsoft.AspNet.Identity;
using Umbraco.Core.Configuration;

[assembly: OwinStartup("FortressOwinStartup", typeof (FortressOwinStartup))]

namespace Orc.Fortress.Startup
{
public class FortressOwinStartup : UmbracoDefaultOwinStartup
public class FortressOwinStartup
{
/// <summary>
/// Configures services to be created in the OWIN context (CreatePerOwinContext)
/// </summary>
/// <param name="app"></param>
protected override void ConfigureServices(IAppBuilder app)
{
app.SetUmbracoLoggerFactory();

public static void ConfigureServices(IAppBuilder app)
{
var applicationContext = ApplicationContext.Current;
LogHelper.Info(typeof(FortressOwinStartup), "Fortress: Startup");
//Here's where we assign a custom UserManager called MyBackOfficeUserManager
Expand All @@ -57,14 +53,15 @@ protected override void ConfigureServices(IAppBuilder app)

}


//You don't need to override this unless you plan on implementing custom middleware which you might
protected override void ConfigureMiddleware(IAppBuilder app)
/// <summary>
/// You don't need to override this unless you plan on implementing custom middleware which you might
/// </summary>
/// <param name="app"></param>
public static void ConfigureMiddleware(IAppBuilder app)
{
LogHelper.Info(typeof (FortressOwinStartup), "OFFROADCODE: ConfigureMiddleware");

app.UseTwoFactorSignInCookie(global::Umbraco.Core.Constants.Security.BackOfficeTwoFactorAuthenticationType, TimeSpan.FromMinutes(5));
base.ConfigureMiddleware(app);
app.UseTwoFactorSignInCookie(global::Umbraco.Core.Constants.Security.BackOfficeTwoFactorAuthenticationType, TimeSpan.FromMinutes(5));
}
}

Expand Down
2 changes: 1 addition & 1 deletion Umbraco2FA/views/Dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h2>Umbraco 2FA</h2>
<div ng-show="settingsLoaded">
<div ng-show="data.IsSetup">
<h1>You are setup!</h1>
<a href class="btn btn-danger" ng-click="removeAuthenticator()"><i class="icon-unlocked"></i> <localize key="fortress_removeautenticator">Remove Autenticator</localize></a>
<a href class="btn btn-danger" ng-click="removeAuthenticator()"><i class="icon-unlocked"></i> <localize key="fortress_removeauthenticator">Remove Autenticator</localize></a>
</div>
<div ng-show="!data.IsSetup">
<h1>You are NOT setup!</h1>
Expand Down