From 3ef5caf1abcef82ef1baa25d01a111d66158cfc2 Mon Sep 17 00:00:00 2001
From: Hao Kung <haok@microsoft.com>
Date: Wed, 23 Sep 2015 15:04:12 -0700
Subject: [PATCH] React to Caption => DisplayName rename

---
 samples/IdentitySample.Mvc/Views/Account/Login.cshtml       | 2 +-
 samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml | 2 +-
 src/Microsoft.AspNet.Identity/SignInManager.cs              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/IdentitySample.Mvc/Views/Account/Login.cshtml b/samples/IdentitySample.Mvc/Views/Account/Login.cshtml
index 3e7989f785..d4b484ecde 100644
--- a/samples/IdentitySample.Mvc/Views/Account/Login.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Account/Login.cshtml
@@ -74,7 +74,7 @@
                         <div id="socialLoginList">
                             <p>
                                 @foreach (AuthenticationDescription p in ViewBag.LoginProviders) {
-                                    <button type="submit" class="btn btn-default" id="@p.AuthenticationScheme" name="provider" value="@p.AuthenticationScheme" title="Log in using your @p.Caption account">@p.AuthenticationScheme</button>
+                                    <button type="submit" class="btn btn-default" id="@p.AuthenticationScheme" name="provider" value="@p.AuthenticationScheme" title="Log in using your @p.DisplayName account">@p.AuthenticationScheme</button>
                                 }
                             </p>
                         </div>
diff --git a/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml b/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml
index afe4e48dfb..e08468a645 100644
--- a/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml
+++ b/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml
@@ -52,7 +52,7 @@
         <p>
             @foreach (AuthenticationDescription p in Model.OtherLogins)
             {
-                <button type="submit" class="btn btn-default" id="@p.AuthenticationScheme" name="provider" value="@p.AuthenticationScheme" title="Log in using your @p.Caption account">@p.AuthenticationScheme</button>
+                <button type="submit" class="btn btn-default" id="@p.AuthenticationScheme" name="provider" value="@p.AuthenticationScheme" title="Log in using your @p.DisplayName account">@p.AuthenticationScheme</button>
             }
         </p>
         </div>
diff --git a/src/Microsoft.AspNet.Identity/SignInManager.cs b/src/Microsoft.AspNet.Identity/SignInManager.cs
index addbea4195..a43364b662 100644
--- a/src/Microsoft.AspNet.Identity/SignInManager.cs
+++ b/src/Microsoft.AspNet.Identity/SignInManager.cs
@@ -386,7 +386,7 @@ namespace Microsoft.AspNet.Identity
         /// <returns>A collection of <see cref="AuthenticationDescription"/>s for the known external login providers.</returns>
         public virtual IEnumerable<AuthenticationDescription> GetExternalAuthenticationSchemes()
         {
-            return Context.Authentication.GetAuthenticationSchemes().Where(d => !string.IsNullOrEmpty(d.Caption));
+            return Context.Authentication.GetAuthenticationSchemes().Where(d => !string.IsNullOrEmpty(d.DisplayName));
         }
 
         /// <summary>
@@ -424,7 +424,7 @@ namespace Microsoft.AspNet.Identity
                 return null;
             }
             // REVIEW: fix this wrap
-            return new ExternalLoginInfo(auth.Principal, provider, providerKey, new AuthenticationDescription(auth.Description).Caption);
+            return new ExternalLoginInfo(auth.Principal, provider, providerKey, new AuthenticationDescription(auth.Description).DisplayName);
         }
         
         /// <summary>