Social

Devnot.Mentor.Api/ActionFilters/TokenAuthentication.cs

@@ -54,7 +54,7 @@ public override void OnActionExecuting(ActionExecutingContext context)
 
                 context.HttpContext.User = claimsPrincipal;
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 context.Result = new UnauthorizedObjectResult(new ErrorApiResponse(ResultMessage.InvalidToken));
             }

Devnot.Mentor.Api/Configuration/appsettings.development.json

@@ -22,4 +22,4 @@
     "UpdatePasswordWebPageUrl": "http://subdomain.devnot.com/sifreyi-yenile",
     "SecurityKeyExpiryFromHours": 24
   }
-}
+}

Devnot.Mentor.Api/Controllers/AuthController.cs

@@ -0,0 +1,37 @@
+using System.Threading.Tasks;
+using DevnotMentor.Api.Services.Interfaces;
+using DevnotMentor.Api.Utilities.OAuth;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DevnotMentor.Api.Controllers
+{
+    public class AuthController : BaseController
+    {
+        private readonly IUserService _userService;
+
+        public AuthController(IUserService userService)
+        {
+            _userService = userService;
+        }
+
+        [Route("/auth/github")]
+        [HttpPost]
+        public async Task<IActionResult> GitHubAsync([FromBody] string accesToken)
+        {
+            var oAuthGitHubUser = await OAuthService.GetOAuthGitHubUserAsync(accesToken);
+            var githubSignInResponse = await _userService.SignInAsync(oAuthGitHubUser);
+
+            return githubSignInResponse.Success ? Success(githubSignInResponse) : BadRequest();
+        }
+
+        [Route("/auth/google")]
+        [HttpPost]
+        public async Task<IActionResult> GoogleAsync([FromBody] string accesToken)
+        {
+            var oAuthGoogleUser = await OAuthService.GetOAuthGoogleUserAsync(accesToken);
+            var googleSignInResponse = await _userService.SignInAsync(oAuthGoogleUser);
+
+            return googleSignInResponse.Success ? Success(googleSignInResponse) : BadRequest();
+        }
+    }
+}

Devnot.Mentor.Api/Controllers/UserController.cs

@@ -1,13 +1,12 @@
 using System.Threading.Tasks;
 using DevnotMentor.Api.ActionFilters;
-using DevnotMentor.Api.CustomEntities.Request.UserRequest;
 using DevnotMentor.Api.Helpers.Extensions;
 using DevnotMentor.Api.Services.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DevnotMentor.Api.Controllers
 {
-    [ApiController]
+    [ServiceFilter(typeof(TokenAuthentication)), ApiController, Route("users"),]
     public class UserController : BaseController
     {
         private readonly IUserService userService;
@@ -17,62 +16,11 @@ public UserController(IUserService userService)
             this.userService = userService;
         }
 
-        [HttpPost]
-        [Route("/users/login")]
-        public async Task<IActionResult> Login(UserLoginRequest request)
+        [HttpGet("me")]
+        public async Task<IActionResult> GetMe()
         {
-            var result = await userService.LoginAsync(request);
-
-            return result.Success ? Success(result) : BadRequest(result);
-        }
-
-        [HttpPost]
-        [Route("/users/register")]
-        public async Task<IActionResult> Register([FromForm] RegisterUserRequest request)
-        {
-            var result = await userService.RegisterAsync(request);
-
-            return result.Success ? Success(result) : BadRequest(result);
-        }
-
-        [HttpPost]
-        [Route("/users/change-password")]
-        [ServiceFilter(typeof(TokenAuthentication))]
-        public async Task<IActionResult> ChangePassword([FromBody] UpdatePasswordRequest request)
-        {
-            request.UserId = User.Claims.GetUserId();
-
-            var result = await userService.ChangePasswordAsync(request);
-
-            return result.Success ? Success(result) : BadRequest(result);
-        }
-
-        [HttpPatch]
-        [Route("/users")]
-        [ServiceFilter(typeof(TokenAuthentication))]
-        public async Task<IActionResult> UpdateUser([FromForm] UpdateUserRequest request)
-        {
-            request.UserId = User.Claims.GetUserId();
-
-            var result = await userService.UpdateAsync(request);
-
-            return result.Success ? Success(result) : BadRequest(result);
-        }
-
-        [Route("/users/{email}/remind-password")]
-        [HttpGet]
-        public async Task<IActionResult> RemindPassword([FromRoute] string email)
-        {
-            var result = await userService.RemindPasswordAsync(email);
-
-            return result.Success ? Success(result) : BadRequest(result);
-        }
-
-        [HttpPost]
-        [Route("/users/me/remind-password-complete")]
-        public async Task<IActionResult> RemindPasswordCompleteAsync(CompleteRemindPasswordRequest request)
-        {
-            var result = await userService.RemindPasswordCompleteAsync(request);
+            var authenticatedUserId = User.Claims.GetUserId();
+            var result = await userService.GetByUserIdAsync(authenticatedUserId);
 
             return result.Success ? Success(result) : BadRequest(result);
         }

Devnot.Mentor.Api/CustomEntities/Auth/OAuthGitHubUser.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Threading.Tasks;
+using DevnotMentor.Api.Entities;
+using DevnotMentor.Api.Repositories.Interfaces;
+
+namespace DevnotMentor.Api.CustomEntities.Auth
+{
+    public class OAuthGitHubUser : OAuthUser
+    {
+        public OAuthGitHubUser() : base(OAuthType.GitHub)
+        {
+        }
+
+        public override async Task<User> GetUserFromDatabaseAsync(IUserRepository repository)
+        {
+            if (repository is null)
+            {
+                throw new NullReferenceException($"{repository.GetType().FullName} was null.");
+            }
+
+            return await repository.GetByGitHubIdAsync(base.Id);
+        }
+    }
+}

Devnot.Mentor.Api/CustomEntities/Auth/OAuthGoogleUser.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Threading.Tasks;
+using DevnotMentor.Api.Entities;
+using DevnotMentor.Api.Repositories.Interfaces;
+
+namespace DevnotMentor.Api.CustomEntities.Auth
+{
+    public class OAuthGoogleUser : OAuthUser
+    {
+        public OAuthGoogleUser() : base(OAuthType.Google)
+        {
+        }
+
+        public override async Task<User> GetUserFromDatabaseAsync(IUserRepository repository)
+        {
+            if (repository is null)
+            {
+                throw new NullReferenceException($"{repository.GetType().FullName} was null.");
+            }
+
+            return await repository.GetByGoogleIdAsync(base.Id);
+        }
+    }
+}

Devnot.Mentor.Api/CustomEntities/Auth/OAuthType.cs

@@ -0,0 +1,8 @@
+namespace DevnotMentor.Api.CustomEntities.Auth
+{
+    public enum OAuthType : int
+    {
+        Google,
+        GitHub
+    }
+}

Devnot.Mentor.Api/CustomEntities/Auth/OAuthUser.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Threading.Tasks;
+using DevnotMentor.Api.Entities;
+using DevnotMentor.Api.Repositories.Interfaces;
+
+namespace DevnotMentor.Api.CustomEntities.Auth
+{
+    public abstract class OAuthUser
+    {
+        protected OAuthUser(OAuthType providerType)
+        {
+            OAuthProviderType = providerType;
+        }
+
+        /// <summary>
+        /// Provider ID
+        /// </summary>
+        public string Id { get; set; }
+        public string FullName { get; set; }
+        public string UserName { get; set; }
+        public string Email { get; set; }
+        public bool EmailConfirmed { get; set; }
+        public string ProfilePictureUrl { get; set; }
+        public OAuthType OAuthProviderType { get; private set; }
+
+        /// <summary>
+        /// Get User by Provider
+        /// </summary>
+        /// <returns></returns>
+        public abstract Task<User> GetUserFromDatabaseAsync(IUserRepository repository);
+
+        public void SetRandomUsername()
+        {
+            this.UserName = Guid.NewGuid().ToString().Split('-')[0];
+        }
+    }
+}

Devnot.Mentor.Api/CustomEntities/Auth/Response/OAuthGitHubEmailResponse.cs

@@ -0,0 +1,9 @@
+namespace DevnotMentor.Api.CustomEntities.Auth.Response
+{
+    public class OAuthGitHubEmailResponse
+    {
+        public string email { get; set; }
+        public bool primary { get; set; }
+        public bool verified { get; set; }
+    }
+}

Devnot.Mentor.Api/CustomEntities/Auth/Response/OAuthGitHubResponse.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace DevnotMentor.Api.CustomEntities.Auth.Response
+{
+    public class OAuthGitHubResponse
+    {
+        public string id { get; set; }
+        public string name { get; set; }
+        public string login { get; set; }
+        public string avatar_url { get; set; }
+        public List<OAuthGitHubEmailResponse> Emails { get; set; }
+
+        public OAuthGitHubUser MapToOAuthGitHubUser()
+        {
+            var primaryEmail = Emails.Find(x => x.primary == true);
+
+            return new OAuthGitHubUser()
+            {
+                Email = primaryEmail?.email,
+                Id = id,
+                FullName = name,
+                ProfilePictureUrl = avatar_url,
+                UserName = login,
+                EmailConfirmed = primaryEmail is null ? false : primaryEmail.verified
+            };
+        }
+    }
+}

Devnot.Mentor.Api/CustomEntities/Auth/Response/OAuthGoogleResponse.cs

@@ -0,0 +1,25 @@
+using System;
+
+namespace DevnotMentor.Api.CustomEntities.Auth.Response
+{
+    public class OAuthGoogleResponse
+    {
+        public string id { get; set; }
+        public string name { get; set; }
+        public string email { get; set; }
+        public string picture { get; set; }
+
+        public OAuthGoogleUser MapToOAuthGoogleUser()
+        {
+            return new OAuthGoogleUser()
+            {
+                Email = email,
+                Id = id,
+                FullName = name,
+                ProfilePictureUrl = picture,
+                EmailConfirmed = (!String.IsNullOrEmpty(email)),
+                UserName = Guid.NewGuid().ToString().Split('-')[0]
+            };
+        }
+    }
+}

Devnot.Mentor.Api/CustomEntities/Dto/UserDto.cs

@@ -13,12 +13,8 @@ public UserDto()
 
         public int Id { get; set; }
         public string UserName { get; set; }
-        public string Name { get; set; }
-        public string SurName { get; set; }
-        public string ProfileImageUrl { get; set; }
-        public bool? UserNameConfirmed { get; set; }
-        public int? UserState { get; set; }
-        public string ProfileUrl { get; set; }
+        public string FullName { get; set; }
+        public string ProfilePictureUrl { get; set; }
 
         public bool IsMentee => Mentee.Any();
         public bool IsMentor => Mentor.Any();

Devnot.Mentor.Api/CustomEntities/Request/UserRequest/UpdateUserRequest.cs

@@ -1,20 +1,12 @@
 using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNetCore.Http;
 
 namespace DevnotMentor.Api.CustomEntities.Request.UserRequest
 {
     public class UpdateUserRequest
     {
-        public int UserId { get; set; }
-
         [Required]
-        public string Name { get; set; }
-
+        public string FullName { get; set; }
         [Required]
-        public string SurName { get; set; }
-
-        public string ProfileImageUrl { get; set; }
-
-        public IFormFile ProfileImage { get; set; }
+        public string Email { get; set; }
     }
 }