Fixes the Google login
This commit is contained in:
@ -60,7 +60,7 @@
|
||||
"Microsoft.Extensions.Logging.TraceSource": "1.0.0-rc1-final",
|
||||
"Microsoft.Extensions.Options": "0.0.1-alpha",
|
||||
"Microsoft.Extensions.Localization": "1.0.0-rc1-final",
|
||||
"Newtonsoft.Json": "6.0.1-beta1",
|
||||
"Newtonsoft.Json": "7.0.1",
|
||||
"Gapi.net45": "1.0.1",
|
||||
"PayPalMerchant-net451": "2.7.109",
|
||||
"MailKit": "1.12.0",
|
||||
|
@ -94,10 +94,11 @@ namespace Yavsc.Controllers
|
||||
// user.EmailConfirmed
|
||||
return View(toShow.ToArray());
|
||||
}
|
||||
|
||||
string GeneratePageToken() {
|
||||
return System.Guid.NewGuid().ToString();
|
||||
}
|
||||
|
||||
|
||||
[AllowAnonymous]
|
||||
[HttpGet(Constants.LoginPath)]
|
||||
public ActionResult SignIn(string returnUrl = null)
|
||||
@ -152,7 +153,11 @@ namespace Yavsc.Controllers
|
||||
return this.ViewOk(model);
|
||||
}
|
||||
}
|
||||
|
||||
else {
|
||||
ModelState.AddModelError(string.Empty,
|
||||
"No such user.");
|
||||
return this.ViewOk(model);
|
||||
}
|
||||
// This doesn't count login failures towards account lockout
|
||||
// To enable password failures to trigger account lockout, set lockoutOnFailure: true
|
||||
var result = await _signInManager.PasswordSignInAsync(model.UserName, model.Password, model.RememberMe, lockoutOnFailure: false);
|
||||
|
@ -22,13 +22,15 @@ namespace Yavsc.Controllers
|
||||
IStringLocalizer<Yavsc.YavscLocalisation> _localizer;
|
||||
IStringLocalizer<BugController> _bugLocalizer;
|
||||
|
||||
public ProjectController(ApplicationDbContext context,
|
||||
public ProjectController(ApplicationDbContext context,
|
||||
ILoggerFactory loggerFactory,
|
||||
IStringLocalizer<Yavsc.YavscLocalisation> localizer
|
||||
IStringLocalizer<Yavsc.YavscLocalisation> localizer,
|
||||
IStringLocalizer<BugController> bugLocalizer
|
||||
)
|
||||
{
|
||||
_context = context;
|
||||
_localizer = localizer;
|
||||
_bugLocalizer = bugLocalizer;
|
||||
_logger = loggerFactory.CreateLogger<ProjectController>();
|
||||
|
||||
}
|
||||
@ -36,6 +38,7 @@ namespace Yavsc.Controllers
|
||||
// GET: Project
|
||||
public async Task<IActionResult> Index()
|
||||
{
|
||||
|
||||
var applicationDbContext = _context.Project.Include(p => p.Client).Include(p => p.Context).Include(p => p.PerformerProfile).Include(p => p.Regularisation).Include(p => p.Repository);
|
||||
return View(await applicationDbContext.ToListAsync());
|
||||
}
|
||||
|
@ -27,4 +27,4 @@
|
||||
</p>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user