From 0a840a32dce7bff9b927ede6ee6cda61d15cf1a9 Mon Sep 17 00:00:00 2001
From: Vitalick Kovalenko <vitalcik.kovalenko2019@gmail.com>
Date: Sun, 24 Dec 2023 12:33:51 +0300
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CyberBoom/Controllers/UserController.cs   | 7 ++++---
 CyberBoom/DbContext/Dtos/User/UserPost.cs | 2 ++
 CyberBoom/DbContext/Dtos/User/UserPut.cs  | 2 ++
 CyberBoom/Program.cs                      | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CyberBoom/Controllers/UserController.cs b/CyberBoom/Controllers/UserController.cs
index 5e82f30..9d0e202 100644
--- a/CyberBoom/Controllers/UserController.cs
+++ b/CyberBoom/Controllers/UserController.cs
@@ -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);
     }
 
diff --git a/CyberBoom/DbContext/Dtos/User/UserPost.cs b/CyberBoom/DbContext/Dtos/User/UserPost.cs
index 1109932..af7a8ea 100644
--- a/CyberBoom/DbContext/Dtos/User/UserPost.cs
+++ b/CyberBoom/DbContext/Dtos/User/UserPost.cs
@@ -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!;
 }
diff --git a/CyberBoom/DbContext/Dtos/User/UserPut.cs b/CyberBoom/DbContext/Dtos/User/UserPut.cs
index c7850df..507a931 100644
--- a/CyberBoom/DbContext/Dtos/User/UserPut.cs
+++ b/CyberBoom/DbContext/Dtos/User/UserPut.cs
@@ -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!;
 }
diff --git a/CyberBoom/Program.cs b/CyberBoom/Program.cs
index 117ef54..76bd4c2 100644
--- a/CyberBoom/Program.cs
+++ b/CyberBoom/Program.cs
@@ -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";
 });