diff --git a/README.md b/README.md
index d27de33b5c..50b9b8d1e3 100644
--- a/README.md
+++ b/README.md
@@ -25,5 +25,8 @@ This project is part of ASP.NET vNext. You can find samples, documentation and g
* Try `k kestrel` to run the application
**NOTE: On Mono since SQL client is not available the sample uses an InMemoryStore to run the application. So the changes that you make will not be persisted.
+###NTLM authentication & Environment based Startup detection
+TODO
+
### Note:
1. Application is started on different ports on different hosts. To change the port or URL modify ```Helios.cmd``` or project.json commands section in case of self-host and customhost.
\ No newline at end of file
diff --git a/src/MusicStore/Models/ShoppingCart.cs b/src/MusicStore/Models/ShoppingCart.cs
index 45bd53b0b6..c45de53f41 100644
--- a/src/MusicStore/Models/ShoppingCart.cs
+++ b/src/MusicStore/Models/ShoppingCart.cs
@@ -94,6 +94,7 @@ namespace MusicStore.Models
public int GetCount()
{
+ //https://github.com/aspnet/EntityFramework/issues/557
// Get the count of each item in the cart and sum them up
int? count = (from cartItems in _db.CartItems
where cartItems.CartId == ShoppingCartId
diff --git a/src/MusicStore/StartupNtlmAuthentication.cs b/src/MusicStore/StartupNtlmAuthentication.cs
new file mode 100644
index 0000000000..ed399b4773
--- /dev/null
+++ b/src/MusicStore/StartupNtlmAuthentication.cs
@@ -0,0 +1,133 @@
+using System;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Diagnostics;
+using Microsoft.AspNet.Routing;
+using Microsoft.Data.Entity;
+using Microsoft.Framework.ConfigurationModel;
+using Microsoft.Framework.DependencyInjection;
+using MusicStore.Models;
+using Microsoft.Net.Http.Server;
+using Microsoft.AspNet.Server.WebListener;
+using System.Security.Claims;
+using System.Security.Principal;
+
+namespace MusicStore
+{
+ ///
+ /// To make runtime to load an environment based startup class, specify the environment by the following ways:
+ /// 1. Drop a Microsoft.AspNet.Hosting.ini file in the application folder
+ /// 2. Add a setting in the ini file named 'env' with value of the format 'Startup[EnvironmentName]'. For example: To load a Startup class named
+ /// 'StartupNtlmAuthentication' the value of the env should be 'NtlmAuthentication' (eg. env=NtlmAuthentication). Runtime adds a 'Startup' prefix to this and loads 'StartupNtlmAuthentication'.
+ /// If no environment name is specified the default startup class loaded is 'Startup'.
+ /// https://github.com/aspnet/Helios/issues/53 - Environment based startup class loading is not available on Helios.
+ /// Alternative ways to specify environment are:
+ /// 1. Set the environment variable named SET env=NtlmAuthentication
+ /// 2. For selfhost based servers pass in a command line variable named --env with this value. Eg:
+ /// "commands": {
+ /// "WebListener": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5002 --env NtlmAuthentication",
+ /// },
+ ///
+ public class StartupNtlmAuthentication
+ {
+ public void Configure(IBuilder app)
+ {
+ //Set up NTLM authentication for WebListener like below.
+ //For IIS and IISExpress: Use inetmgr to setup NTLM authentication on the application vDir or modify the applicationHost.config to enable NTLM.
+ //Note: This does not work on CoreCLR yet!
+ if ((app.Server as ServerInformation) != null)
+ {
+ var serverInformation = (ServerInformation)app.Server;
+ serverInformation.Listener.AuthenticationManager.AuthenticationTypes = AuthenticationTypes.NTLM;
+ }
+
+ app.Use(async (context, next) =>
+ {
+ //Who will get admin access? For demo sake I'm listing the currently logged on user as the application administrator. But this can be changed to suit the needs.
+ var identity = (ClaimsIdentity)context.User.Identity;
+
+ if (identity.GetUserName() == Environment.UserDomainName + "\\" + Environment.UserName)
+ {
+ identity.AddClaim(new Claim("ManageStore", "Allowed"));
+ }
+
+ await next.Invoke();
+ });
+
+ //Below code demonstrates usage of multiple configuration sources. For instance a setting say 'setting1' is found in both the registered sources,
+ //then the later source will win. By this way a Local config can be overridden by a different setting while deployed remotely.
+ var configuration = new Configuration();
+ configuration.AddJsonFile("LocalConfig.json");
+ configuration.AddEnvironmentVariables(); //All environment variables in the process's context flow in as configuration values.
+
+ //Error page middleware displays a nice formatted HTML page for any unhandled exceptions in the request pipeline.
+ //Note: ErrorPageOptions.ShowAll to be used only at development time. Not recommended for production.
+ app.UseErrorPage(ErrorPageOptions.ShowAll);
+
+ app.UseServices(services =>
+ {
+ //If this type is present - we're on mono
+ var runningOnMono = Type.GetType("Mono.Runtime") != null;
+
+ // Add EF services to the services container
+ if (runningOnMono)
+ {
+ services.AddEntityFramework()
+ .AddInMemoryStore();
+ }
+ else
+ {
+ services.AddEntityFramework()
+ .AddSqlServer();
+ }
+
+ services.AddScoped();
+
+ // Configure DbContext
+ services.SetupOptions(options =>
+ {
+ options.DefaultAdminUserName = configuration.Get("DefaultAdminUsername");
+ options.DefaultAdminPassword = configuration.Get("DefaultAdminPassword");
+ if (runningOnMono)
+ {
+ options.UseInMemoryStore();
+ }
+ else
+ {
+ options.UseSqlServer(configuration.Get("Data:DefaultConnection:ConnectionString"));
+ }
+ });
+
+ // Add Identity services to the services container
+ services.AddIdentitySqlServer()
+ .AddAuthentication();
+
+ // Add MVC services to the services container
+ services.AddMvc();
+ });
+
+ // Add static files to the request pipeline
+ app.UseStaticFiles();
+
+ // Add MVC to the request pipeline
+ app.UseMvc(routes =>
+ {
+ routes.MapRoute(
+ name: "areaRoute",
+ template: "{area:exists}/{controller}/{action}",
+ defaults: new { action = "Index" });
+
+ routes.MapRoute(
+ name: "default",
+ template: "{controller}/{action}/{id?}",
+ defaults: new { controller = "Home", action = "Index" });
+
+ routes.MapRoute(
+ name: "api",
+ template: "{controller}/{id?}");
+ });
+
+ //Populates the MusicStore sample data
+ SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/MusicStore/Views/Shared/_LoginPartial.cshtml b/src/MusicStore/Views/Shared/_LoginPartial.cshtml
index 5da720b97f..a00b4df312 100644
--- a/src/MusicStore/Views/Shared/_LoginPartial.cshtml
+++ b/src/MusicStore/Views/Shared/_LoginPartial.cshtml
@@ -2,15 +2,28 @@
@if (User.Identity.IsAuthenticated)
{
- using (Html.BeginForm("LogOff", "Account", FormMethod.Post, new { id = "logoutForm", @class = "navbar-right" }))
+ //Either NTLM will be used or social authentication will be used. Based on the authentication schemes enabled remove an unused block.
+ if (User.Identity.AuthenticationType != "NTLM")
{
- @Html.AntiForgeryToken()
+ using (Html.BeginForm("LogOff", "Account", FormMethod.Post, new { id = "logoutForm", @class = "navbar-right" }))
+ {
+ @Html.AntiForgeryToken()
+
+ -
+ @Html.ActionLink("Hello " + User.Identity.GetUserName() + "!", "Index", "Manage", routeValues: null, htmlAttributes: new { title = "Manage" })
+
+ - Log off
+
+ }
+ }
+ else
+ {
+ //This code block necessary only for NTLM authentication
-
- @Html.ActionLink("Hello " + User.Identity.GetUserName() + "!", "Index", "Manage", routeValues: null, htmlAttributes: new { title = "Manage" })
+ @Html.ActionLink("Hello " + User.Identity.GetUserName() + "!", null, null, routeValues: null, htmlAttributes: new { title = "Manage" })
- - Log off
}
}