Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dzhus/identity server update #105

Merged
merged 10 commits into from
Apr 20, 2021
Merged

Dzhus/identity server update #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c9d1f4b
add js code and fix Register view
VyacheslavDzhus Apr 13, 2021
170aef6
update User and RegisterViewModel
VyacheslavDzhus Apr 13, 2021
cc33b6f
add migration updatedUser
VyacheslavDzhus Apr 13, 2021
d61d496
add property Name and change migration 'updatedUser'
VyacheslavDzhus Apr 13, 2021
0275ba8
added validation to the properties
VyacheslavDzhus Apr 16, 2021
d4e9929
edit migration 'Init' and Login view
VyacheslavDzhus Apr 16, 2021
30e5ddd
resolve conflicts
VyacheslavDzhus Apr 16, 2021
e7ccf31
fix codesmells
VyacheslavDzhus Apr 16, 2021
9691443
fix issues
VyacheslavDzhus Apr 16, 2021
0dad30f
changed Name to FirstName and fix migrations
VyacheslavDzhus Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions OutOfSchool/OutOfSchool.DataAccess/Models/User.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,11 @@ public class User : IdentityUser

[DataType(DataType.DateTime)]
public DateTime LastLogin { get; set; }

public string LastName { get; set; }

public string MiddleName { get; set; }

public string FirstName { get; set; }
}
}
4 changes: 2 additions & 2 deletions OutOfSchool/OutOfSchool.IdentityServer.Tests/Controllers/AuthControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,13 +223,13 @@ public async Task ExternalLogin_ReturnsNotImplementedEx()
{
new TestCaseData(new RegisterViewModel()
{
Username = "Baron",
Email = "[email protected]",
PhoneNumber = "0502391222",
ReturnUrl = "Return url",
}),
new TestCaseData(new RegisterViewModel()
{
Username = "Baron",
Email = "[email protected]",
PhoneNumber = "0502391222",
ReturnUrl = "Return url2",
}),
Expand Down
19 changes: 14 additions & 5 deletions OutOfSchool/OutOfSchool.IdentityServer/Controllers/AuthController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,16 @@ public async Task<IActionResult> Register(RegisterViewModel model)

var user = new User()
{
UserName = model.Username,
PhoneNumber = model.PhoneNumber,
CreatingTime = DateTime.Now,
UserName = model.Email,
FirstName = model.FirstName,
LastName = model.LastName,
MiddleName = model.MiddleName,
Email = model.Email,
PhoneNumber = model.PhoneNumber,
CreatingTime = DateTime.Now,
};
var result = await userManager.CreateAsync(user, model.Password);

var result = await userManager.CreateAsync(user, model.Password);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what changed here?

if (result.Succeeded)
{
IdentityResult roleAssignResult = IdentityResult.Failed();
Expand Down Expand Up @@ -178,7 +182,12 @@ public async Task<IActionResult> Register(RegisterViewModel model)
else
{
foreach (var error in result.Errors)
{
{
if (error.Code == "DuplicateUserName")
{
error.Description = $"Email {error.Description.Substring(10).Split('\'')[0]} is alredy taken";
}

ModelState.AddModelError(string.Empty, error.Description);
}
}
Expand Down
Loading