Merge pull request #138 from acjh/patch-11

ismcagdas · web-flow · commit 94f0642599e9 · 2017-10-30T16:37:45.000+03:00
Remove authSchema parameter passed as expectedXsrf
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AccountController.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AccountController.cs
@@ -271,8 +271,7 @@ public ActionResult ExternalLogin(string provider, string returnUrl)
                 "Account",
                 new
                 {
-                    ReturnUrl = returnUrl,
-                    authSchema = provider
+                    ReturnUrl = returnUrl
                 });
 
             return Challenge(
@@ -287,7 +286,7 @@ public ActionResult ExternalLogin(string provider, string returnUrl)
         }
 
         [UnitOfWork]
-        public virtual async Task<ActionResult> ExternalLoginCallback(string returnUrl, string authSchema, string remoteError = null)
+        public virtual async Task<ActionResult> ExternalLoginCallback(string returnUrl, string remoteError = null)
         {
             returnUrl = NormalizeReturnUrl(returnUrl);
             
@@ -297,7 +296,7 @@ public virtual async Task<ActionResult> ExternalLoginCallback(string returnUrl,
                 throw new UserFriendlyException(L("CouldNotCompleteLoginOperation"));
             }
 
-            var externalLoginInfo = await _signInManager.GetExternalLoginInfoAsync(authSchema);
+            var externalLoginInfo = await _signInManager.GetExternalLoginInfoAsync();
             if (externalLoginInfo == null)
             {
                 Logger.Warn("Could not get information from external login.");

Original file line number	Diff line number	Diff line change
`@@ -271,8 +271,7 @@ public ActionResult ExternalLogin(string provider, string returnUrl)`
`271`	`271`	`"Account",`
`272`	`272`	`new`
`273`	`273`	`{`
`274`		`- ReturnUrl = returnUrl,`
`275`		`- authSchema = provider`
	`274`	`+ ReturnUrl = returnUrl`
`276`	`275`	`});`
`277`	`276`
`278`	`277`	`return Challenge(`
`@@ -287,7 +286,7 @@ public ActionResult ExternalLogin(string provider, string returnUrl)`
`287`	`286`	`}`
`288`	`287`
`289`	`288`	`[UnitOfWork]`
`290`		`- public virtual async Task<ActionResult> ExternalLoginCallback(string returnUrl, string authSchema, string remoteError = null)`
	`289`	`+ public virtual async Task<ActionResult> ExternalLoginCallback(string returnUrl, string remoteError = null)`
`291`	`290`	`{`
`292`	`291`	`returnUrl = NormalizeReturnUrl(returnUrl);`
`293`	`292`
`@@ -297,7 +296,7 @@ public virtual async Task<ActionResult> ExternalLoginCallback(string returnUrl,`
`297`	`296`	`throw new UserFriendlyException(L("CouldNotCompleteLoginOperation"));`
`298`	`297`	`}`
`299`	`298`
`300`		`- var externalLoginInfo = await _signInManager.GetExternalLoginInfoAsync(authSchema);`
	`299`	`+ var externalLoginInfo = await _signInManager.GetExternalLoginInfoAsync();`
`301`	`300`	`if (externalLoginInfo == null)`
`302`	`301`	`{`
`303`	`302`	`Logger.Warn("Could not get information from external login.");`