Merge pull request #599 from skinny/master

Added Nancy context to UserMapper

Author: thecodejunkie

Diff for: src/Nancy.Authentication.Forms.Tests/FormsAuthenticationFixture.cs

@@ -348,7 +348,7 @@ public void Should_get_username_from_mapping_service_with_valid_cookie()
 
             fakePipelines.BeforeRequest.Invoke(this.context);
 
-            A.CallTo(() => mockMapper.GetUserFromIdentifier(this.userGuid))
+            A.CallTo(() => mockMapper.GetUserFromIdentifier(this.userGuid, this.context))
                 .MustHaveHappened(Repeated.Exactly.Once);
         }
 
@@ -359,7 +359,7 @@ public void Should_set_user_in_context_with_valid_cookie()
             var fakeMapper = A.Fake<IUserMapper>();
             var fakeUser = A.Fake<IUserIdentity>();
             fakeUser.UserName = "Bob";
-            A.CallTo(() => fakeMapper.GetUserFromIdentifier(this.userGuid)).Returns(fakeUser);
+            A.CallTo(() => fakeMapper.GetUserFromIdentifier(this.userGuid, this.context)).Returns(fakeUser);
             this.config.UserMapper = fakeMapper;
             FormsAuthentication.Enable(fakePipelines, this.config);
             this.context.Request.Cookies.Add(FormsAuthentication.FormsAuthenticationCookieName, this.validCookieValue);
@@ -376,7 +376,7 @@ public void Should_not_set_user_in_context_with_invalid_hmac()
             var fakeMapper = A.Fake<IUserMapper>();
             var fakeUser = A.Fake<IUserIdentity>();
             fakeUser.UserName = "Bob";
-            A.CallTo(() => fakeMapper.GetUserFromIdentifier(this.userGuid)).Returns(fakeUser);
+            A.CallTo(() => fakeMapper.GetUserFromIdentifier(this.userGuid, this.context)).Returns(fakeUser);
             this.config.UserMapper = fakeMapper;
             FormsAuthentication.Enable(fakePipelines, this.config);
             this.context.Request.Cookies.Add(FormsAuthentication.FormsAuthenticationCookieName, this.cookieWithInvalidHmac);
@@ -393,7 +393,7 @@ public void Should_not_set_user_in_context_with_empty_hmac()
             var fakeMapper = A.Fake<IUserMapper>();
             var fakeUser = A.Fake<IUserIdentity>();
             fakeUser.UserName = "Bob";
-            A.CallTo(() => fakeMapper.GetUserFromIdentifier(this.userGuid)).Returns(fakeUser);
+            A.CallTo(() => fakeMapper.GetUserFromIdentifier(this.userGuid, this.context)).Returns(fakeUser);
             this.config.UserMapper = fakeMapper;
             FormsAuthentication.Enable(fakePipelines, this.config);
             this.context.Request.Cookies.Add(FormsAuthentication.FormsAuthenticationCookieName, this.cookieWithEmptyHmac);
@@ -410,7 +410,7 @@ public void Should_not_set_user_in_context_with_no_hmac()
             var fakeMapper = A.Fake<IUserMapper>();
             var fakeUser = A.Fake<IUserIdentity>();
             fakeUser.UserName = "Bob";
-            A.CallTo(() => fakeMapper.GetUserFromIdentifier(this.userGuid)).Returns(fakeUser);
+            A.CallTo(() => fakeMapper.GetUserFromIdentifier(this.userGuid, this.context)).Returns(fakeUser);
             this.config.UserMapper = fakeMapper;
             FormsAuthentication.Enable(fakePipelines, this.config);
             this.context.Request.Cookies.Add(FormsAuthentication.FormsAuthenticationCookieName, this.cookieWithNoHmac);
@@ -427,7 +427,7 @@ public void Should_not_set_username_in_context_with_broken_encryption_data()
             var fakeMapper = A.Fake<IUserMapper>();
             var fakeUser = A.Fake<IUserIdentity>();
             fakeUser.UserName = "Bob";
-            A.CallTo(() => fakeMapper.GetUserFromIdentifier(this.userGuid)).Returns(fakeUser);
+            A.CallTo(() => fakeMapper.GetUserFromIdentifier(this.userGuid, this.context)).Returns(fakeUser);
             this.config.UserMapper = fakeMapper;
             FormsAuthentication.Enable(fakePipelines, this.config);
             this.context.Request.Cookies.Add(FormsAuthentication.FormsAuthenticationCookieName, this.cookieWithBrokenEncryptedData);

Diff for: src/Nancy.Authentication.Forms/FormsAuthentication.cs

@@ -164,8 +164,8 @@ private static Func<NancyContext, Response> GetLoadAuthenticationHook(FormsAuthe
 
                     if (userGuid != Guid.Empty)
                     {
-                        context.CurrentUser =
-                            configuration.UserMapper.GetUserFromIdentifier(userGuid);
+
+                      context.CurrentUser = configuration.UserMapper.GetUserFromIdentifier(userGuid, context);
                     }
 
                     return null;

Diff for: src/Nancy.Authentication.Forms/IUsernameMapper.cs

@@ -14,7 +14,8 @@ public interface IUserMapper
         /// Get the real username from an indentifier
         /// </summary>
         /// <param name="identifier">User identifier</param>
-        /// <returns>Matching username, or empty</returns>
-        IUserIdentity GetUserFromIdentifier(Guid identifier);
+        /// <param name="context">The current NancyFx context</param>
+        /// <returns>Matching populated IUserIdentity object, or empty</returns>
+        IUserIdentity GetUserFromIdentifier(Guid identifier, NancyContext context);
     }
 }

Diff for: src/Nancy.Demo.Authentication.Forms/UserDatabase.cs

@@ -18,7 +18,7 @@ static UserDatabase()
             users.Add(new Tuple<string, string, Guid>("user", "password", new Guid("56E1E49E-B7E8-4EEA-8459-7A906AC4D4C0")));
         }
 
-        public IUserIdentity GetUserFromIdentifier(Guid identifier)
+        public IUserIdentity GetUserFromIdentifier(Guid identifier, NancyContext context)
         {
             var userRecord = users.Where(u => u.Item3 == identifier).FirstOrDefault();