paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixe l'impact OAuth sheme

Browse Source
This commit is contained in:
Paul Schneider
2016-06-10 03:00:24 +02:00
parent 8d5a04cbf4
commit 7bbc219725
4 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Yavsc/ApiController/AccountController.cs
View File

@ -118,5 +118,22 @@ namespace Yavsc.WebApi.Controllers
base.Dispose(disposing); base.Dispose(disposing);
} }
[HttpGet("~/api/me"),Produces("application/json")]
public async Task<IActionResult> Me ()
{
if (User==null) return new BadRequestObjectResult(
new {
error = "no user"
});
var uid = User.GetUserId();
if (uid == null)
return new BadRequestObjectResult(
new {
error = "not identified"
});
return Ok(await UserManager.FindByIdAsync(uid));
}
} }
} }

2
Yavsc/Constants.cs
View File

@ -13,7 +13,7 @@ namespace Yavsc
public const string ExternalLoginPath = "~/extsign"; public const string ExternalLoginPath = "~/extsign";
public const string LogoutPath = "~/signout"; public const string LogoutPath = "~/signout";
public const string MePath = "~/api/Me"; public const string MePath = "~/api/Me";
public const string ExternalAuthenticationSheme = "ExternalCookie";
public const string ApplicationAuthenticationSheme = "ServerCookie"; public const string ApplicationAuthenticationSheme = "ServerCookie";
public static readonly Scope[] SiteScopes = {  public static readonly Scope[] SiteScopes = { 
new Scope { Id = "profile", Description = "Your profile informations" },   new Scope { Id = "profile", Description = "Your profile informations" },  

21
Yavsc/Controllers/AccountController.cs
View File

@ -129,7 +129,7 @@ namespace Yavsc.Controllers
var result = await _signInManager.PasswordSignInAsync(model.UserName, model.Password, model.RememberMe, lockoutOnFailure: false); var result = await _signInManager.PasswordSignInAsync(model.UserName, model.Password, model.RememberMe, lockoutOnFailure: false);
if (result.Succeeded) if (result.Succeeded)
{ {
return RedirectToLocal(model.ReturnUrl); return Redirect(model.ReturnUrl);
} }
if (result.RequiresTwoFactor) if (result.RequiresTwoFactor)
{ {
@ -219,7 +219,7 @@ namespace Yavsc.Controllers
{ {
_logger.LogInformation(5, "User logged in with {Name} provider.", info.LoginProvider); _logger.LogInformation(5, "User logged in with {Name} provider.", info.LoginProvider);
return RedirectToLocal(returnUrl); return Redirect(returnUrl);
} }
if (result.RequiresTwoFactor) if (result.RequiresTwoFactor)
{ {
@ -286,7 +286,7 @@ namespace Yavsc.Controllers
await _signInManager.SignInAsync(user, isPersistent: false); await _signInManager.SignInAsync(user, isPersistent: false);
_logger.LogInformation(6, "User created an account using {Name} provider.", info.LoginProvider); _logger.LogInformation(6, "User created an account using {Name} provider.", info.LoginProvider);
return RedirectToLocal(returnUrl); return Redirect(returnUrl);
} }
} }
AddErrors(result); AddErrors(result);
@ -489,7 +489,8 @@ namespace Yavsc.Controllers
if (result.Succeeded) if (result.Succeeded)
{ {
ViewData["StatusMessage"] = "Your code was verified"; ViewData["StatusMessage"] = "Your code was verified";
return RedirectToLocal(model.ReturnUrl); _logger.LogInformation($"Signed in. returning to {model.ReturnUrl}");
return Redirect(model.ReturnUrl);
} }
if (result.IsLockedOut) if (result.IsLockedOut)
{ {
@ -543,17 +544,7 @@ namespace Yavsc.Controllers
return await _userManager.FindByIdAsync(HttpContext.User.GetUserId()); return await _userManager.FindByIdAsync(HttpContext.User.GetUserId());
} }
private IActionResult RedirectToLocal(string returnUrl)
{
if (Url.IsLocalUrl(returnUrl))
{
return Redirect(returnUrl);
}
else
{
return RedirectToAction(nameof(HomeController.Index), "Home");
}
}
#endregion #endregion
} }

28
Yavsc/Startup/Startup.OAuth.cs
View File

@ -20,7 +20,7 @@ namespace Yavsc
{ {
private void ConfigureOAuthServices(IServiceCollection services) private void ConfigureOAuthServices(IServiceCollection services)
{ {
services.Configure<SharedAuthenticationOptions>(options => options.SignInScheme = Constants.ExternalAuthenticationSheme); services.Configure<SharedAuthenticationOptions>(options => options.SignInScheme = Constants.ApplicationAuthenticationSheme);
services.Add(ServiceDescriptor.Singleton(typeof(IOptions<OAuth2AppSettings>), typeof(OptionsManager<OAuth2AppSettings>))); services.Add(ServiceDescriptor.Singleton(typeof(IOptions<OAuth2AppSettings>), typeof(OptionsManager<OAuth2AppSettings>)));
// used by the YavscGoogleOAuth middelware (TODO drop it) // used by the YavscGoogleOAuth middelware (TODO drop it)
@ -62,14 +62,14 @@ namespace Yavsc
option.Cookies.ApplicationCookie.LoginPath = new PathString(Constants.LoginPath.Substring(1)); option.Cookies.ApplicationCookie.LoginPath = new PathString(Constants.LoginPath.Substring(1));
option.Cookies.ApplicationCookie.AccessDeniedPath = new PathString(Constants.AccessDeniedPath.Substring(1)); option.Cookies.ApplicationCookie.AccessDeniedPath = new PathString(Constants.AccessDeniedPath.Substring(1));
option.Cookies.ApplicationCookie.AutomaticAuthenticate = true; option.Cookies.ApplicationCookie.AutomaticAuthenticate = true;
option.Cookies.ApplicationCookie.AuthenticationScheme = Constants.ApplicationAuthenticationSheme; // option.AuthenticationScheme = Constants.ApplicationAuthenticationSheme;
option.Cookies.ApplicationCookieAuthenticationScheme = Constants.ApplicationAuthenticationSheme; // option.Cookies.ApplicationCookieAuthenticationScheme = Constants.ApplicationAuthenticationSheme;
option.Cookies.TwoFactorRememberMeCookie.ExpireTimeSpan = TimeSpan.FromDays(30); // option.Cookies.TwoFactorRememberMeCookie.ExpireTimeSpan = TimeSpan.FromDays(30);
option.Cookies.TwoFactorRememberMeCookie.DataProtectionProvider = protector; // option.Cookies.TwoFactorRememberMeCookie.DataProtectionProvider = protector;
option.Cookies.ExternalCookieAuthenticationScheme = Constants.ExternalAuthenticationSheme; //option.Cookies.ExternalCookieAuthenticationScheme = Constants.ExternalAuthenticationSheme;
option.Cookies.ExternalCookie.AutomaticAuthenticate = true; // option.Cookies.ExternalCookie.AutomaticAuthenticate = true;
option.Cookies.ExternalCookie.AuthenticationScheme = Constants.ExternalAuthenticationSheme; //option.Cookies.ExternalCookie.AuthenticationScheme = Constants.ExternalAuthenticationSheme;
option.Cookies.ExternalCookie.DataProtectionProvider = protector; // option.Cookies.ExternalCookie.DataProtectionProvider = protector;
} }
).AddEntityFrameworkStores<ApplicationDbContext>() ).AddEntityFrameworkStores<ApplicationDbContext>()
.AddTokenProvider<EmailTokenProvider<ApplicationUser>>(Constants.EMailFactor) .AddTokenProvider<EmailTokenProvider<ApplicationUser>>(Constants.EMailFactor)
@ -83,11 +83,12 @@ namespace Yavsc
// External authentication shared cookie: // External authentication shared cookie:
app.UseCookieAuthentication(options => app.UseCookieAuthentication(options =>
{ {
options.AuthenticationScheme = Constants.ExternalAuthenticationSheme; //options.AuthenticationScheme = Constants.ExternalAuthenticationSheme;
options.AutomaticAuthenticate = true; options.AutomaticAuthenticate = true;
options.ExpireTimeSpan = TimeSpan.FromMinutes(5); options.ExpireTimeSpan = TimeSpan.FromMinutes(5);
options.LoginPath = new PathString(Constants.LoginPath.Substring(1)); options.LoginPath = new PathString(Constants.LoginPath.Substring(1));
options.AccessDeniedPath = new PathString(Constants.AccessDeniedPath.Substring(1)); options.AccessDeniedPath = new PathString(Constants.AccessDeniedPath.Substring(1));
options.AuthenticationScheme = Constants.ApplicationAuthenticationSheme;
}); });
var gvents = new OAuthEvents(); var gvents = new OAuthEvents();
@ -168,7 +169,7 @@ namespace Yavsc
context.Identity = identity; context.Identity = identity;
} }
}; */ }; */
/*
app.UseOAuthAuthorizationServer( app.UseOAuthAuthorizationServer(
options => options =>
@ -177,8 +178,7 @@ namespace Yavsc
options.TokenEndpointPath = new PathString(Constants.TokenPath.Substring(1)); options.TokenEndpointPath = new PathString(Constants.TokenPath.Substring(1));
options.ApplicationCanDisplayErrors = true; options.ApplicationCanDisplayErrors = true;
options.AllowInsecureHttp = true; options.AllowInsecureHttp = true;
options.AuthenticationScheme = Constants.ApplicationAuthenticationSheme;
options.Provider = new OAuthAuthorizationServerProvider options.Provider = new OAuthAuthorizationServerProvider
{ {
OnValidateClientRedirectUri = ValidateClientRedirectUri, OnValidateClientRedirectUri = ValidateClientRedirectUri,
@ -202,7 +202,7 @@ namespace Yavsc
options.AutomaticAuthenticate = true; options.AutomaticAuthenticate = true;
options.AutomaticChallenge = true; options.AutomaticChallenge = true;
} }
);*/ );
} }
} }
} }