Compare commits

..

2 Commits

Author SHA1 Message Date
5bef2b0dbc сделал мерж
All checks were successful
Create and publish a Docker image / Publish image (push) Successful in 20s
Create and publish a Docker image / Deploy image (push) Successful in 3s
2023-12-24 12:35:30 +03:00
0a840a32dc фиксы 2023-12-24 12:33:51 +03:00
4 changed files with 9 additions and 4 deletions

View File

@ -58,7 +58,8 @@ public class UsersController : ControllerBase
Fio = user.Fio,
Specialities = user.Specialities,
TelegramBotUrl = user.TelegramBotUrl,
UserName = user.Username
UserName = user.Username,
Email = user.Email
};
var result = await _userManager.CreateAsync(userWr);
@ -103,7 +104,7 @@ public class UsersController : ControllerBase
fuser.Specialities = user.Specialities;
fuser.TelegramBotUrl = user.TelegramBotUrl;
fuser.UserName = user.Username;
fuser.Email = user.Email;
var result = await _userManager.UpdateAsync(fuser);
if (result.Succeeded)
return Ok();
@ -140,7 +141,7 @@ public class UsersController : ControllerBase
[HttpGet("signin-google")]
public IActionResult SignInWithGoogle()
{
var properties = new AuthenticationProperties { RedirectUri = "https://cyberbloom.zetcraft.ru/api/users/signin-google" };
var properties = new AuthenticationProperties { RedirectUri = Url.Action(nameof(SignInWithGoogleCallback)) };
return Challenge(properties, GoogleDefaults.AuthenticationScheme);
}

View File

@ -9,4 +9,6 @@ public class UserPost
public string Specialities { get; set; } = null!;
public string TelegramBotUrl { get; set; } = null!;
public string Email { get; set; } = null!;
}

View File

@ -11,4 +11,6 @@ public class UserPut
public string Specialities { get; set; } = null!;
public string TelegramBotUrl { get; set; } = null!;
public string Email { get; set; } = null!;
}

View File

@ -45,7 +45,7 @@ builder.Services.AddAuthentication(opt => {
{
options.ClientId = builder.Configuration["Google:ClientId"]!;
options.ClientSecret = builder.Configuration["Google:ClientSecret"]!;
options.CallbackPath = "https://cyberbloom.zetcraft.ru/api/users/google-sign-in";
options.CallbackPath = "/api/signin-google";
});