Skip to content

Commit b318aec

Browse files
committed
Rebase
1 parent 900e930 commit b318aec

File tree

61 files changed

+1891
-403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1891
-403
lines changed

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"compile-hero.disable-compile-files-on-did-save-code": false
3+
}

Areas/Identity/Data/WebAppOglasContext.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
5-
using Microsoft.AspNetCore.Identity;
1+
using Microsoft.AspNetCore.Identity;
62
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
73
using Microsoft.EntityFrameworkCore;
84

Areas/Identity/IdentityHostingStartup.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
namespace WebAppOglas.Areas.Identity
55
{
66
public class IdentityHostingStartup : IHostingStartup
7-
{
7+
{
88

99
public void Configure(IWebHostBuilder builder)
1010
{
11-
11+
1212
}
1313
}
1414
}
1515

1616

17-
18-
17+

Areas/Identity/Pages/Account/AccessDenied.cshtml.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
5-
using Microsoft.AspNetCore.Mvc.RazorPages;
1+
using Microsoft.AspNetCore.Mvc.RazorPages;
62

73
namespace WebAppOglas.Areas.Identity.Pages.Account
84
{

Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
using Microsoft.AspNetCore.Authorization;
1+
using Microsoft.AspNetCore.Authorization;
72
using Microsoft.AspNetCore.Identity;
83
using Microsoft.AspNetCore.Mvc;
94
using Microsoft.AspNetCore.Mvc.RazorPages;
105
using Microsoft.AspNetCore.WebUtilities;
6+
using System.Text;
7+
using System.Threading.Tasks;
118

129
namespace WebAppOglas.Areas.Identity.Pages.Account
1310
{

Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using System.Text;
2-
using System.Threading.Tasks;
3-
using Microsoft.AspNetCore.Authorization;
1+
using Microsoft.AspNetCore.Authorization;
42
using Microsoft.AspNetCore.Identity;
53
using Microsoft.AspNetCore.Mvc;
64
using Microsoft.AspNetCore.Mvc.RazorPages;
75
using Microsoft.AspNetCore.WebUtilities;
6+
using System.Text;
7+
using System.Threading.Tasks;
88

99
namespace WebAppOglas.Areas.Identity.Pages.Account
1010
{

Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel.DataAnnotations;
4-
using System.Linq;
5-
using System.Security.Claims;
6-
using System.Text;
7-
using System.Text.Encodings.Web;
8-
using System.Threading.Tasks;
9-
using Microsoft.AspNetCore.Authorization;
1+
using Microsoft.AspNetCore.Authorization;
102
using Microsoft.AspNetCore.Identity;
113
using Microsoft.AspNetCore.Identity.UI.Services;
124
using Microsoft.AspNetCore.Mvc;
135
using Microsoft.AspNetCore.Mvc.RazorPages;
146
using Microsoft.AspNetCore.WebUtilities;
157
using Microsoft.Extensions.Logging;
8+
using System.ComponentModel.DataAnnotations;
9+
using System.Security.Claims;
10+
using System.Text;
11+
using System.Text.Encodings.Web;
12+
using System.Threading.Tasks;
1613

1714
namespace WebAppOglas.Areas.Identity.Pages.Account
1815
{
@@ -72,7 +69,7 @@ public async Task<IActionResult> OnGetCallbackAsync(string returnUrl = null, str
7269
if (remoteError != null)
7370
{
7471
ErrorMessage = $"Error from external provider: {remoteError}";
75-
return RedirectToPage("./Login", new {ReturnUrl = returnUrl });
72+
return RedirectToPage("./Login", new { ReturnUrl = returnUrl });
7673
}
7774
var info = await _signInManager.GetExternalLoginInfoAsync();
7875
if (info == null)
@@ -82,7 +79,7 @@ public async Task<IActionResult> OnGetCallbackAsync(string returnUrl = null, str
8279
}
8380

8481
// Sign in the user with this external login provider if the user already has a login.
85-
var result = await _signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKey, isPersistent: false, bypassTwoFactor : true);
82+
var result = await _signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKey, isPersistent: false, bypassTwoFactor: true);
8683
if (result.Succeeded)
8784
{
8885
_logger.LogInformation("{Name} logged in with {LoginProvider} provider.", info.Principal.Identity.Name, info.LoginProvider);

Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel.DataAnnotations;
4-
using System.Text.Encodings.Web;
5-
using System.Text;
6-
using System.Threading.Tasks;
7-
using Microsoft.AspNetCore.Authorization;
1+
using Microsoft.AspNetCore.Authorization;
82
using Microsoft.AspNetCore.Identity;
93
using Microsoft.AspNetCore.Identity.UI.Services;
104
using Microsoft.AspNetCore.Mvc;
115
using Microsoft.AspNetCore.Mvc.RazorPages;
126
using Microsoft.AspNetCore.WebUtilities;
7+
using System.ComponentModel.DataAnnotations;
8+
using System.Text;
9+
using System.Text.Encodings.Web;
10+
using System.Threading.Tasks;
1311

1412
namespace WebAppOglas.Areas.Identity.Pages.Account
1513
{

Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Threading.Tasks;
4-
using Microsoft.AspNetCore.Authorization;
1+
using Microsoft.AspNetCore.Authorization;
52
using Microsoft.AspNetCore.Mvc.RazorPages;
63

74
namespace WebAppOglas.Areas.Identity.Pages.Account

Areas/Identity/Pages/Account/Lockout.cshtml.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
5-
using Microsoft.AspNetCore.Authorization;
1+
using Microsoft.AspNetCore.Authorization;
62
using Microsoft.AspNetCore.Mvc.RazorPages;
73

84
namespace WebAppOglas.Areas.Identity.Pages.Account

0 commit comments

Comments
 (0)