Changeset ce1f8d4 for iknow-api

Timestamp:

01/21/26 18:00:12 (8 months ago)

Author:

Stefan-Saveski <stefansaveski19@…>

Branches:

master

Children:

dced479

Parents:

97a2322

Message:

Added role to sign in.

Location:

iknow-api

Files:

• Controllers/AuthController.cs (modified) (4 diffs)
• DTOs/RefreshTokenDTO.cs (modified) (1 diff)
• Services/Implementations/AuthService.cs (modified) (6 diffs)

iknow-api/Controllers/AuthController.cs

@@ -2 +2 @@
 using iknow_api.Services;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Mvc;
 
@@ -37 +36 @@
         public async Task<IActionResult> Register([FromBody] RegisterDto request)
         {
-            //Console.WriteLine(request);
-
             try
             {
-                var result = await _authService.RegisterAsync(request);
+                await _authService.RegisterAsync(request);
                 return Ok("User registered successfully");
             }
@@ -57 +54 @@
         public async Task<IActionResult> Login([FromBody] LoginDto request)
         {
-            var token = await _authService.LoginAsync(request);
-            if (token == null) return Unauthorized("Invalid credentials");
-            return Ok(new { Token = token });
+            var result = await _authService.LoginAsync(request);
+            if (result == null) return Unauthorized("Invalid credentials");
+
+            return Ok(new
+            {
+                token = result.AccessToken,
+                refreshToken = result.RefreshToken,
+                role = result.Role
+            });
         }
 
         [Authorize]
         [HttpGet("getstring")]
-        public async Task<IActionResult> getstring()
+        public IActionResult getstring()
         {
             return Ok(new { message = "You are authorized!" });
@@ -73 +76 @@
         {
             if (await _refreshTokenService.VerifyRefreshToken(verifyRefreshToken))
-            { return Ok(await _authService.GenerateNewJWT(verifyRefreshToken)); }
-            else
-            { return BadRequest(new { message = "No token found!" }); }
+            {
+                return Ok(await _authService.GenerateNewJWT(verifyRefreshToken));
+            }
+
+            return BadRequest(new { message = "No token found!" });
         }
 

iknow-api/DTOs/RefreshTokenDTO.cs

@@ -3 +3 @@
     public class VerifyRefreshTokenDto
     {
-        public string token { get; set; }
+        public string token { get; set; } = string.Empty;
     }
+
     public class AuthResultDto
     {
         public string AccessToken { get; set; } = string.Empty;
         public string? RefreshToken { get; set; }
+        public string Role { get; set; } = string.Empty;
     }
 }

iknow-api/Services/Implementations/AuthService.cs

@@ -3 +3 @@
 using System.Text;
 using BCrypt.Net;
-using iknow_api.Services;
 using iknow_api.Models;
 using iknow_api.DTOs;
@@ -9 +8 @@
 using Microsoft.IdentityModel.Tokens;
 using iknow_api.Data;
-using Microsoft.EntityFrameworkCore;
 
 namespace iknow_api.Services
@@ -125 +123 @@
                 return null;
 
-             var result = new AuthResultDto
+            var result = new AuthResultDto
             {
-                AccessToken = CreateToken(user)
+                AccessToken = CreateToken(user),
+                Role = user.Role.ToString()
             };
 
@@ -146 +145 @@
         {
             int userid = await _refreshTokenRepository.GetUserId(token.token) ?? 0;
-            User ?user = await _userRepository.GetOnlyUserByIdAsync(userid);
+            User? user = await _userRepository.GetOnlyUserByIdAsync(userid);
 
-            var result = new AuthResultDto
+            if (user == null)
+                throw new InvalidOperationException("User not found for provided refresh token.");
+
+            return new AuthResultDto
             {
-                AccessToken = CreateToken(user) 
+                AccessToken = CreateToken(user),
+                Role = user.Role.ToString()
             };
-            
-            return result;
         }
 
@@ -172 +173 @@
             var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
 
-            var token = new JwtSecurityToken(
+            var jwt = new JwtSecurityToken(
                 issuer: "iknow-api",
                 audience: "iknow-api",
@@ -180 +181 @@
             );
 
-            return new JwtSecurityTokenHandler().WriteToken(token);
+            return new JwtSecurityTokenHandler().WriteToken(jwt);
         }
     }