Changes in iknow-api/Services/Implementations/AuthService.cs [c155364:b38c39c]

File:

• iknow-api/Services/Implementations/AuthService.cs (modified) (5 diffs)

iknow-api/Services/Implementations/AuthService.cs

@@ -3 +3 @@
 using System.Text;
 using BCrypt.Net;
-using iknow_api.Services;
+using iknow_api.Controllers;
 using iknow_api.Models;
 using iknow_api.DTOs;
@@ -14 +14 @@
     {
         private readonly IUserRepository _userRepository;
-        private readonly IRefreshTokenRepository _refreshTokenRepository;
-        private readonly IRefreshTokenService _refreshTokenService;
         private readonly IConfiguration _configuration;
 
-        public AuthService(IUserRepository userRepository, IConfiguration configuration
-                            , IRefreshTokenService refreshTokenService, IRefreshTokenRepository refreshTokenRepository)
+        public AuthService(IUserRepository userRepository, IConfiguration configuration)
         {
             _userRepository = userRepository;
             _configuration = configuration;
-            _refreshTokenService = refreshTokenService;
-            _refreshTokenRepository = refreshTokenRepository;
         }
 
@@ -45 +40 @@
 
             await _userRepository.AddUserAsync(user);
+            int userId = user.Id;
+            var contactInfo = new ContactInfo
+            {
+                UserId = userId,
+                city = registerDto.city,
+                address = registerDto.address,
+                municipality = registerDto.municipality,
+                phoneNumber = registerDto.phoneNumber,
+                microsoftEmail = registerDto.microsoftEmail
+            };
+            await _userRepository.AddContactAsync(contactInfo);
+            var enrollmentInfo = new EnrollmentInfo
+            {
+                UserId = userId,
+                enrollmentYear = registerDto.enrollmentYear,
+                quota = (Models.quota)registerDto.quotaType,
+                major = (Models.major)registerDto.majorType
+            };
+            await _userRepository.AddEnrollmentAsync(enrollmentInfo);
+            await _userRepository.AddHighSchoolAsync(new HighSchool
+            {
+                UserId = userId,
+                GPA = registerDto.gpa,
+                tip = (Models.type)registerDto.tip
+            });
             return true;
         }
 
-        public async Task<AuthResultDto?> LoginAsync(LoginDto loginDto)
+        public async Task<string?> LoginAsync(LoginDto loginDto)
         {
             var user = await _userRepository.GetUserByUsernameAsync(loginDto.Email);
@@ -54 +74 @@
                 return null;
 
-             var result = new AuthResultDto
-            {
-                AccessToken = CreateToken(user)
-            };
-
-            if (loginDto.GenerateRefreshToken)
-            {
-                int userid = _userRepository.GetUserByUsernameAsync(loginDto.Email).Id;
-                result.RefreshToken = await _refreshTokenService.GenerateRefreshToken(userid);
-            }
-
-            return result;
+            return CreateToken(user);
         }
 
@@ -71 +80 @@
         {
             return await _userRepository.GetUsersCountAsync();
-        }
-
-        public async Task<AuthResultDto> GenerateNewJWT(VerifyRefreshTokenDto token)
-        {
-            int userid = await _refreshTokenRepository.GetUserId(token.token) ?? 0;
-            User user = await _userRepository.GetOnlyUserByIdAsync(userid);
-
-            var result = new AuthResultDto
-            {
-                AccessToken = CreateToken(user)
-            };
-            
-            return result;
         }