diff --git a/Program.cs b/Program.cs index 3637a7d..3b7eed2 100644 --- a/Program.cs +++ b/Program.cs @@ -38,7 +38,15 @@ var dbString = builder.Configuration.GetConnectionString("MariaDbConnection"); var userString = builder.Configuration.GetConnectionString("DBAccount"); // JWT 설정부 시작 -builder.Configuration.AddJsonFile("private/jwtSetting.json", optional: true, reloadOnChange: true); +if (builder.Environment.IsDevelopment()) +{ + builder.Configuration.AddJsonFile("private/jwtSetting.Development.json", optional: true, reloadOnChange: true); +} +else +{ + builder.Configuration.AddJsonFile("private/jwtSetting.json", optional: true, reloadOnChange: true); +} + builder.Services.Configure(builder.Configuration.GetSection("JwtSettings")); builder.Services.AddAuthentication(options => @@ -57,13 +65,17 @@ builder.Services.AddAuthentication(options => ValidateIssuerSigningKey = true, ValidIssuer = jwtSettings.Issuer, ValidAudience = jwtSettings.Audience, - IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(jwtSettings.SecretKey)) + IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(jwtSettings.SecretKey)), + ClockSkew = TimeSpan.FromMinutes(jwtSettings.ClockSkewMinutes) }; }); // JWT 설정부 끝 builder.Services.AddControllers(); + // 여기다가 API 있는 컨트롤러들 AddScoped 하면 되는건가? +builder.Services.AddScoped(); +builder.Services.AddScoped(); // builder.Services.AddScoped(); // // builder.Services.AddScoped(); @@ -88,6 +100,21 @@ builder.Services.AddCors(option => }); }); +// 로그 설정 부분 +builder.Logging.ClearProviders(); +builder.Logging.AddConsole(); +if (builder.Environment.IsDevelopment()) { + builder.Logging.SetMinimumLevel(LogLevel.Trace); +} +else +{ + builder.Logging.SetMinimumLevel(LogLevel.Warning); +} + + + +// 로컬 테스트 위한 부분 (올릴때는 꺼두기) +// builder.WebHost.UseUrls("http://0.0.0.0:5144"); ///// ===== builder 설정 부 ===== ///// @@ -106,8 +133,9 @@ else app.UseHsts(); } - +// 로컬 테스트 위한 부분 (올릴떄는 켜두기) app.UseHttpsRedirection(); + app.UseRouting(); // app.MapControllers(); diff --git a/Program/Common/Data/AppDbContext.cs b/Program/Common/Data/AppDbContext.cs index f3832c9..3fddb4f 100644 --- a/Program/Common/Data/AppDbContext.cs +++ b/Program/Common/Data/AppDbContext.cs @@ -1,3 +1,4 @@ +using AcaMate.Common.Models; using Microsoft.EntityFrameworkCore; using AcaMate.V1.Models; using Version = AcaMate.V1.Models.Version; @@ -13,10 +14,18 @@ public class AppDbContext: DbContext //MARK: Program public DbSet Version { get; set; } public DbSet Academy { get; set; } + public DbSet RefreshTokens { get; set; } //MARK: USER public DbSet Login { get; set; } public DbSet UserAcademy { get; set; } + public DbSet User { get; set; } + public DbSet Permission { get; set; } + // public DbSet Token { get; set; } + public DbSet Location { get; set; } + public DbSet Contact { get; set; } + + protected override void OnModelCreating(ModelBuilder modelBuilder) { diff --git a/Program/Common/JWTToken/JwtTokenService.cs b/Program/Common/JWTToken/JwtTokenService.cs new file mode 100644 index 0000000..250fc0e --- /dev/null +++ b/Program/Common/JWTToken/JwtTokenService.cs @@ -0,0 +1,116 @@ +using System; +using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using System.Text; +using System.Collections.Generic; +using AcaMate.Common.Models; +using Microsoft.IdentityModel.Tokens; +using Microsoft.Extensions.Options; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Mvc; + + +using System.Security.Cryptography; + +namespace AcaMate.Common.Token; + +public class JwtTokenService +{ + private readonly JwtSettings _jwtSettings; + + private readonly ILogger _logger; + + public JwtTokenService(IOptions jwtSettings, ILogger logger) + { + _jwtSettings = jwtSettings.Value; + _logger = logger; + } + + public string GenerateJwtToken(string uid)//, string role) + { + // 1. 클레임(Claim) 설정 - 필요에 따라 추가 정보도 포함 + var claims = new List + { + // 토큰 주체(sub) 생성을 위해 값으로 uid를 사용함 : 토큰이 대표하는 고유 식별자 + new Claim(JwtRegisteredClaimNames.Sub, uid), + // Jti 는 토큰 식별자로 토큰의 고유 ID 이다. + new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()), + // jwt 토큰이 가지는 권한 + // new Claim(ClaimTypes.Role, role), + // 추가 클레임 예: new Claim(ClaimTypes.Role, "Admin") + }; + + // 2. 비밀 키와 SigningCredentials 생성 + var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_jwtSettings.SecretKey)); + var credentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256); + + // 3. 토큰 생성 (Issuer, Audience, 만료 시간, 클레임, 서명 정보 포함) + var token = new JwtSecurityToken( + issuer: _jwtSettings.Issuer, + audience: _jwtSettings.Audience, + claims: claims, + expires: DateTime.Now.AddMinutes(_jwtSettings.ExpiryMinutes), + signingCredentials: credentials + ); + + // 4. 토큰 객체를 문자열로 변환하여 반환 + return new JwtSecurityTokenHandler().WriteToken(token); + } + + public RefreshToken GenerateRefreshToken(string uid) + { + var randomNumber = new byte[32]; // 256비트 + using (var rng = RandomNumberGenerator.Create()) + { + rng.GetBytes(randomNumber); + } + + // return Convert.ToBase64String(randomNumber); + return new RefreshToken() + { + uid = uid, + refresh_token = Convert.ToBase64String(randomNumber), + create_Date = DateTime.UtcNow, + expire_date = DateTime.UtcNow.AddDays(_jwtSettings.RefreshTokenExpiryDays) + + }; + } + + + public ClaimsPrincipal ValidateToken(string token) + { + if (string.IsNullOrWhiteSpace(token)) return null; + var tokenHandler = new JwtSecurityTokenHandler(); + + try + { + var key = Encoding.UTF8.GetBytes(_jwtSettings.SecretKey); + var validationParameters = new TokenValidationParameters + { + ValidateIssuerSigningKey = true, + IssuerSigningKey = new SymmetricSecurityKey(key), + ValidateIssuer = true, + ValidIssuer = _jwtSettings.Issuer, + ValidateAudience = true, + ValidAudience = _jwtSettings.Audience, + ValidateLifetime = true, + ClockSkew = TimeSpan.FromMinutes(_jwtSettings.ClockSkewMinutes) + }; + var principal = tokenHandler.ValidateToken(token, validationParameters, out var securityToken); + return principal; + } + catch (Exception e) + { + Console.WriteLine($"검증 실패 {e}"); + return null; + } + + + } + + + + + + +} \ No newline at end of file diff --git a/Program/Common/Model/JwtSettings.cs b/Program/Common/Model/JwtSettings.cs index 7f8d826..5836c3e 100644 --- a/Program/Common/Model/JwtSettings.cs +++ b/Program/Common/Model/JwtSettings.cs @@ -1,3 +1,6 @@ +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; + namespace AcaMate.Common.Models; public class JwtSettings @@ -6,4 +9,44 @@ public class JwtSettings public string Issuer { get; set; } public string Audience { get; set; } public int ExpiryMinutes { get; set; } -} \ No newline at end of file + public int ClockSkewMinutes { get; set; } + public int RefreshTokenExpiryDays { get; set; } +} + + +[Table("refresh_token")] +public class RefreshToken +{ + [Key] + [Required(ErrorMessage = "필수 항목 누락")] + public string uid { get; set; } + public string refresh_token { get; set; } + public DateTime create_Date { get; set; } + public DateTime expire_date { get; set; } + + // 이건 로그아웃시에 폐기 시킬예정이니 그떄 변경하는걸로 합시다. + public DateTime? revoke_Date { get; set; } +} + +public class ValidateToken +{ + public string token { get; set; } + public string refresh { get; set; } + public string uid { get; set; } +} +/* +""" +토큰 동작 관련 +다시 물어보자 토큰 로직 관련해서 일단은 로그인을 예로 들면 +1. 로그인을 진행한다. +2. 회원이 DB에 정상적으로 존재한다. +3. 엑세스 토큰과 리프레시 토큰을 생성한다. +4. 엑세스 토큰은 클라이언트로 리프래시 토큰은 서버에 저장하고 클라이언트로도 보낸다. +5. (상황1) 시간이 경과해 엑세스 토큰의 시간이 경과했다. +6. (상황2) 회원 정보에 대한 접근이 필요한 동작을 수행한다. +7. 엑세스 토큰과 리프레시 토큰을 서버로 전송한다. +8. 엑세스 토큰이 만료가 되었음이 확인이 되면 리프레시 토큰으로 새 엑세스를 만들기 위해 리프레시 토큰을 확인한다. +9. 리프레시 토큰이 만료가 되지 않았다면 리프레시 토큰을 토대로 엑세스 토큰을 생성한다. +10. 생성된 엑세스 토큰을 가지고 상황2의 동작을 수행하고 엑세스 토큰을 반환한다. +""" +*/ \ No newline at end of file diff --git a/Program/Common/Model/Status.cs b/Program/Common/Model/Status.cs index 18752e1..593d759 100644 --- a/Program/Common/Model/Status.cs +++ b/Program/Common/Model/Status.cs @@ -2,7 +2,7 @@ using System.Text.Json; namespace AcaMate.Common.Models; -public class APIResponseStatus +public class APIResponseStatus { public Status status { get; set; } public T? data { get; set; } diff --git a/Program/V1/Controllers/MemberController.cs b/Program/V1/Controllers/MemberController.cs index 1bbfcd2..bf8d442 100644 --- a/Program/V1/Controllers/MemberController.cs +++ b/Program/V1/Controllers/MemberController.cs @@ -2,7 +2,7 @@ using System.Text.Json; using AcaMate.Common.Data; using AcaMate.Common.Models; - +using AcaMate.V1.Models; using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; @@ -13,6 +13,13 @@ namespace AcaMate.V1.Controllers; [ApiExplorerSettings(GroupName = "사업자 정보")] public class MemberController: ControllerBase { + private readonly AppDbContext _dbContext; + + public MemberController(AppDbContext dbContext) + { + _dbContext = dbContext; + } + [HttpGet("business")] public IActionResult GetBusinessData() { @@ -20,10 +27,17 @@ public class MemberController: ControllerBase return Ok("DB 참조"); } + + + + + + // -- -- -- -- -- -- -- -- -- -- -- -- // - [HttpGet("/v1/out/member/business")] + [HttpGet("/api/v1/out/member/business")] public IActionResult SearchBusinessNo() { return Ok("외부 참조"); } + } \ No newline at end of file diff --git a/Program/V1/Controllers/UserController.cs b/Program/V1/Controllers/UserController.cs index a0af8ad..00b165d 100644 --- a/Program/V1/Controllers/UserController.cs +++ b/Program/V1/Controllers/UserController.cs @@ -1,71 +1,72 @@ +using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using Microsoft.IdentityModel.Tokens; using Microsoft.AspNetCore.Mvc; -using System.Text.Json; -using AcaMate.Common.Data; -using AcaMate.Common.Models; -using AcaMate.V1.Models; +using Microsoft.EntityFrameworkCore; +using System.Linq.Expressions; +using Microsoft.Extensions.Logging; +using Microsoft.EntityFrameworkCore.Query; +using MySqlConnector; +using System.Linq; +using AcaMate.Common.Data; +using AcaMate.Common.Token; +using AcaMate.Common.Models; + +using AcaMate.V1.Models; +using AcaMate.V1.Services; namespace AcaMate.V1.Controllers; - [ApiController] [Route("/api/v1/in/user")] [ApiExplorerSettings(GroupName = "사용자")] -public class UserController: ControllerBase +public class UserController : ControllerBase { private readonly AppDbContext _dbContext; - public UserController(AppDbContext dbContext) + private readonly ILogger _logger; + private readonly JwtTokenService _jwtTokenService; + private readonly IRepositoryService _repositoryService; + + public UserController(AppDbContext dbContext, ILogger logger, JwtTokenService jwtTokenService, IRepositoryService repositoryService) { _dbContext = dbContext; + _logger = logger; + _jwtTokenService = jwtTokenService; + _repositoryService = repositoryService; } - [HttpGet("login")] - [CustomOperation("SNS 로그인", "로그인 후 회원이 있는지 확인", "사용자")] - public IActionResult SNSLogin(string acctype,string sns_id) + [HttpGet] + [CustomOperation("회원 정보 조회", "회원 정보 조회", "사용자")] + public IActionResult GetUserData(string uid) { - - if (string.IsNullOrEmpty(acctype) && string.IsNullOrEmpty(sns_id)) - { - return BadRequest(DefaultResponse.InvalidInputError); - } + if (string.IsNullOrEmpty(uid)) return BadRequest(DefaultResponse.InvalidInputError); try { - var login = _dbContext.Login.FirstOrDefault(l => l.sns_type == acctype && l.sns_id == sns_id); - - string uid = ""; - List bids = new List(); - - if (login != null) - { - uid = login.uid; - var userAcademy = _dbContext.UserAcademy.Where(u => u.uid == uid).ToList(); - - foreach(User_Academy userData in userAcademy) + var user = _dbContext.User + .Where(u => u.uid == uid) + .Select(u => new User { - Console.WriteLine($"uid: {userData.uid} || bid: {userData.bid}"); - bids.Add(userData.bid); - } - } - else + uid = u.uid, + name = u.name, + auto_login_yn = u.auto_login_yn, + birth = u.birth, + device_id = u.device_id, + login_date = u.login_date, + type = u.type + }) + .FirstOrDefault(); + + var response = new APIResponseStatus { - return StatusCode(002, DefaultResponse.NotFoundError); - } - - var response = new APIResponseStatus - { - status = new Status() + status = new Status { code = "000", message = "정상" }, - data = new - { - uid = $"{uid}", - bid = bids - } + data = user }; - return Ok(response.JsonToString()); } catch (Exception ex) @@ -73,5 +74,238 @@ public class UserController: ControllerBase return StatusCode(500, DefaultResponse.UnknownError); } } + + [HttpGet("login")] + [CustomOperation("SNS 로그인", "로그인 후 회원이 있는지 확인", "사용자")] + public async Task Login(string acctype, string sns_id) + { + // API 동작 파라미터 입력 값 확인 + if (string.IsNullOrEmpty(acctype) && string.IsNullOrEmpty(sns_id)) + return BadRequest(DefaultResponse.InvalidInputError); + + try + { + var login = await _dbContext.Login + .FirstOrDefaultAsync(l => l.sns_type == acctype && l.sns_id == sns_id); + + if (login != null) + { + // 로그인 정보가 존재 하는 상황 + var uid = login.uid; + + var user = await _dbContext.User + .FirstOrDefaultAsync(u => u.uid == uid); + + if (user != null) + { + // 정상적으로 User 테이블에도 있는것이 확인 됨 + user.login_date = DateTime.Now; + await _dbContext.SaveChangesAsync(); + + // 토큰 생성은 로그인이 이제 되고 나서 한다. + var accessToken = _jwtTokenService.GenerateJwtToken(uid);//, "Normal"); + var refreshToken = _jwtTokenService.GenerateRefreshToken(uid); + _logger.LogInformation($"{uid}: {accessToken}, {refreshToken}"); + + await _repositoryService.SaveData(refreshToken, rt => rt.uid); + + + var response = new APIResponseStatus + { + status = new Status + { + code = "000", + message = "정상" + }, + data = new + { + token = accessToken, + refresh = refreshToken.refresh_token + } + }; + return Ok(response.JsonToString()); + } + } + // case 1: Login 테이블에 값이 없다 == 로그인이 처음 + // case 2: User 테이블에 값이 없다 == 이건 문제가 있는 상황 -> 해결은 회원가입 재 진행 시도 + // Login에는 있는데 User 테이블에 없다? 말이 안되긴 하는데... + return Ok(new APIResponseStatus + { + status = new Status + { + code = "010", + message = "로그인 정보 없음 > 회원 가입 진행" + }, + data = new + { + token = "", + refresh = "" + // bidList = new string[] { } + } + }.JsonToString()); + } + catch (Exception ex) + { + _logger.LogInformation($"[로그인] 에러 발생 : {ex}"); + return StatusCode(500, DefaultResponse.UnknownError); + } + } + + [HttpGet("academy")] + [CustomOperation("학원 리스트 확인", "사용자가 등록된 학원 리스트 확인", "사용자")] + public async Task ReadAcademyInfo(string token, string refresh) + { + _logger.LogInformation($"토큰 : {token}, {refresh}"); + + if (string.IsNullOrEmpty(token) || string.IsNullOrEmpty(refresh)) + { + var error = DefaultResponse.InvalidInputError; + return Ok(error); + } + + try + { + var validateToken = await _repositoryService.ValidateToken(token, refresh); + var uid = validateToken.uid; + + var userAcademy = await _dbContext.UserAcademy + .Where(ua => ua.uid == uid) + .Select(ua => ua.bid) + .ToListAsync(); + + + var academies = await _dbContext.Academy + .Where(a => userAcademy.Contains(a.bid)) + .Select(a => new AcademyName + { + bid = a.bid, + name = a.business_name + }) + .ToListAsync(); + + var response = new APIResponseStatus> + { + status = new Status + { + code = "000", + message = "정상" + }, + data = academies + }; + + + return Ok(response); + } + catch (SecurityTokenException tokenEx) + { + _logger.LogInformation($"[로그인][오류] 토큰 검증 : {tokenEx}"); + return StatusCode(500, DefaultResponse.InvalidInputError); + } + catch (Exception ex) + { + _logger.LogInformation($"[로그인][오류] 에러 발생 : {ex}"); + return StatusCode(500, DefaultResponse.UnknownError); + } + + } + + [HttpPost("register")] + [CustomOperation("회원 가입", "사용자 회원 가입", "사용자")] + public async Task UserRegister([FromBody] UserAll request) + { + if (!ModelState.IsValid) return BadRequest(DefaultResponse.InvalidInputError); + + var atIndext = request.email.IndexOf('@'); + var localPart_email = request.email.Substring(0, atIndext); + var uid = $"AM{localPart_email}{DateTime.Now:yyyyMMdd}"; + + var user = new User + { + uid = uid, + name = request.name, + birth = request.birth, + type = request.type, + device_id = request.device_id, + auto_login_yn = request.auto_login_yn, + login_date = request.login_date + }; + var login = new Login + { + uid = uid, + sns_id = request.sns_id, + sns_type = request.sns_type + }; + + var permission = new Permission + { + uid = uid, + location_yn = request.location_yn, + camera_yn = request.camera_yn, + photo_yn = request.photo_yn, + push_yn = request.push_yn, + market_app_yn = request.market_app_yn, + market_sms_yn = request.market_sms_yn, + market_email_yn = request.market_email_yn + }; + + var contact = new Contact + { + uid = uid, + email = request.email, + phone = request.phone, + address = request.address + }; + + + if (await _repositoryService.SaveData(user, u => u.uid)) + { + await _repositoryService.SaveData(login, l => l.sns_id); + await _repositoryService.SaveData(permission, p => p.uid); + await _repositoryService.SaveData(contact, c => c.uid); + } + + // TO-DO: jwt 토큰 만들어서 여기서 보내는 작업을 해야 함 + var token = _jwtTokenService.GenerateJwtToken(uid);//, "admin"); + var refreshToken = _jwtTokenService.GenerateRefreshToken(uid); + await _repositoryService.SaveData(refreshToken, rt => rt.uid); + + var result = new APIResponseStatus() + { + status = new Status() + { + code = "000", + message = "정상" + }, + data = new + { + accessToken = token, + refreshToken = refreshToken.refresh_token + } + }; + + return Ok(result.JsonToString()); + } + + [HttpGet("logout")] + [CustomOperation("로그아웃", "사용자 로그아웃", "사용자")] + public async Task LogOut(string token, string refresh) //([FromBody] UserAll request) + { + /* */ + // var value = await ValidateToken(token, refresh); + // _logger.LogInformation(value.uid); + // _logger.LogInformation(value.refresh); + // _logger.LogInformation(value.token); + /* */ + + + return Ok("로그아웃"); + } + + + + + + + } \ No newline at end of file diff --git a/Program/V1/Models/Academy.cs b/Program/V1/Models/Academy.cs index 947c2c7..8f8cc02 100644 --- a/Program/V1/Models/Academy.cs +++ b/Program/V1/Models/Academy.cs @@ -9,10 +9,23 @@ public class Academy [Key] public string bid { get; set; } public string business_name { get; set; } - public string business_ownder { get; set; } + public string business_owner { get; set; } public string business_number { get; set; } public DateTime business_date { get; set; } public string business_address { get; set; } public string business_contact { get; set; } public string uid { get; set; } +} + +// -- -- -- -- -- DB 테이블 -- -- -- -- -- // + +public class AcademyName +{ + public string bid { get; set; } + public string name { get; set; } +} + +public class RequestAcademy +{ + public List bids { get; set; } } \ No newline at end of file diff --git a/Program/V1/Models/Login.cs b/Program/V1/Models/Login.cs deleted file mode 100644 index eed116d..0000000 --- a/Program/V1/Models/Login.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace AcaMate.V1.Models; - -[Table("login")] -public class Login -{ - [Key] - [MaxLength(100)] - public string sns_id {get; set;} - [MaxLength(70)] - public string uid {get; set;} - [MaxLength(4)] - public string sns_type {get; set;} - [MaxLength(255)] - public string sns_token {get; set;} - [MaxLength(100)] - public string sns_email {get; set;} -} - -[Table("user_academy")] -public class User_Academy -{ - [Key] - public string uid { get; set; } - public string bid { get; set; } - public DateTime register_date { get; set; } - public bool status { get; set; } -} \ No newline at end of file diff --git a/Program/V1/Models/User.cs b/Program/V1/Models/User.cs new file mode 100644 index 0000000..2eab154 --- /dev/null +++ b/Program/V1/Models/User.cs @@ -0,0 +1,150 @@ +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.InteropServices.JavaScript; + +namespace AcaMate.V1.Models; + +[Table("login")] +public class Login +{ + [Key] + [Required(ErrorMessage = "필수 항목 누락")] + [MaxLength(100)] + public string sns_id {get; set;} + + [Required(ErrorMessage = "필수 항목 누락")] + [MaxLength(70)] + public string uid {get; set;} + + [Required(ErrorMessage = "필수 항목 누락")] + [MaxLength(4)] + public string sns_type {get; set;} +} + +[Table("user_academy")] +public class User_Academy +{ + [Key] + [Required(ErrorMessage = "필수 항목 누락")] + public string uid { get; set; } + + [Required(ErrorMessage = "필수 항목 누락")] + public string bid { get; set; } + + [Required(ErrorMessage = "필수 항목 누락")] + public DateTime register_date { get; set; } + + [Required(ErrorMessage = "필수 항목 누락")] + public bool status { get; set; } +} + +[Table("user")] +public class User +{ + [Key] + [Required(ErrorMessage = "필수 항목 누락")] + public string uid { get; set; } + + [Required(ErrorMessage = "필수 항목 누락")] + public string name { get; set; } + public DateTime? birth { get; set; } + + [Required(ErrorMessage = "필수 항목 누락")] + public string type { get; set; } + + public string? device_id { get; set; } + + [Required(ErrorMessage = "필수 항목 누락")] + public bool auto_login_yn { get; set; } + + [Required(ErrorMessage = "필수 항목 누락")] + public DateTime login_date { get; set; } +} + + +[Table("permission")] +public class Permission +{ + [Key] + + [Required(ErrorMessage = "필수 항목 누락")] + public string uid { get; set; } + + public bool location_yn {get; set;} + public bool camera_yn {get; set;} + public bool photo_yn {get; set;} + public bool push_yn {get; set;} + public bool market_app_yn {get; set;} + public bool market_sms_yn {get; set;} + public bool market_email_yn {get; set;} +} + + +[Table("location")] +public class Location +{ + [Key] + + [Required(ErrorMessage = "필수 항목 누락")] + public string uid { get; set; } + + [Required(ErrorMessage = "필수 항목 누락")] + public string lat { get; set; } + + [Required(ErrorMessage = "필수 항목 누락")] + public string lng { get; set; } +} + +[Table("contact")] +public class Contact +{ + [Key] + + [Required(ErrorMessage = "필수 항목 누락")] + public string uid { get; set; } + + [Required(ErrorMessage = "필수 항목 누락")] + public string email { get; set; } + public string? phone { get; set; } + public string? address { get; set; } +} + +// -- -- -- -- -- DB 테이블 -- -- -- -- -- // + +public class UserAll +{ + // [Required(ErrorMessage = "필수 항목 누락")] + // public string uid { get; set; } + + [Required(ErrorMessage = "필수 항목 누락")] + public string name { get; set; } + + public DateTime? birth { get; set; } + + [Required(ErrorMessage = "필수 항목 누락")] + public string type { get; set; } + + public string? device_id { get; set; } + + public bool auto_login_yn { get; set; } + public DateTime login_date { get; set; } + + [Required(ErrorMessage = "필수 항목 누락")] + public string email { get; set; } + public string? phone { get; set; } + public string? address { get; set; } + + public bool location_yn {get; set;} + public bool camera_yn {get; set;} + public bool photo_yn {get; set;} + public bool push_yn {get; set;} + public bool market_app_yn {get; set;} + public bool market_sms_yn {get; set;} + public bool market_email_yn {get; set;} + + [Required(ErrorMessage = "필수 항목 누락")] + public string sns_id {get; set;} + + [Required(ErrorMessage = "필수 항목 누락")] + public string sns_type {get; set;} +} \ No newline at end of file diff --git a/Program/V1/Services/RepositoryService.cs b/Program/V1/Services/RepositoryService.cs new file mode 100644 index 0000000..f53fb60 --- /dev/null +++ b/Program/V1/Services/RepositoryService.cs @@ -0,0 +1,136 @@ +using AcaMate.Common.Data; +using AcaMate.Common.Token; +using AcaMate.Common.Models; + + +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using System.Linq.Expressions; +using System.Security.Claims; +using Microsoft.IdentityModel.Tokens; + +namespace AcaMate.V1.Services; + +public interface IRepositoryService +{ + Task SaveData(T entity, Expression> key) where T : class; + Task ValidateToken(string token, string refresh); +} + +public class RepositoryService: IRepositoryService +{ + private readonly AppDbContext _dbContext; + private readonly ILogger _logger; + private readonly JwtTokenService _jwtTokenService; + + public RepositoryService(AppDbContext dbContext, ILogger logger, JwtTokenService jwtTokenService) + { + _dbContext = dbContext; + _logger = logger; + _jwtTokenService = jwtTokenService; + } + + public async Task SaveData (T entity, Expression> key) where T : class + { + try + { + var value = key.Compile()(entity); + + // x 라 함은 Expression 으로 생성되는 트리에서 T 타입으의 매개변수를 지칭함 + var parameter = Expression.Parameter(typeof(T), "x"); + + var invokedExpr = Expression.Invoke(key, parameter); + var constantExpr = Expression.Constant(value, key.Body.Type); + var equalsExpr = Expression.Equal(invokedExpr, constantExpr); + + var predicate = Expression.Lambda>(equalsExpr, parameter); + + var dbSet = _dbContext.Set(); + + var entityData = await dbSet.FirstOrDefaultAsync(predicate); + + if (entityData != null) + { + _logger.LogInformation($"[{typeof(T)}] 해당 PK 존재 [{value}]: 계속"); + var entry = _dbContext.Entry(entityData); + entry.CurrentValues.SetValues(entity); + if (entry.Properties.Any(p => p.IsModified)) + { + _logger.LogInformation($"[{typeof(T)}] 변경사항 존재: 계속"); + } + else + { + _logger.LogInformation($"[{typeof(T)}] 변경사항 없음: 종료"); + return true; + } + } + else + { + _logger.LogInformation($"[{typeof(T)}] 처음등록"); + dbSet.Add(entity); + } + + await _dbContext.SaveChangesAsync(); + _logger.LogInformation($"[{typeof(T)}] DB 저장 완료: 종료"); + return true; + } + catch (Exception ex) + { + _logger.LogInformation($"[{typeof(T)}] 알 수 없는 오류: 종료 {ex}"); + return false; + } + } + + //토큰 태울때는 인코딩 된 걸로 태워야지 원본꺼 태우면 데이터에 손상옵니다. + public async Task ValidateToken(string token, string refresh) + { + var principalToken = _jwtTokenService.ValidateToken(token); + if (principalToken != null) + { + var uid = principalToken.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? string.Empty; + _logger.LogInformation($"토큰 변환 - {uid}"); + return new ValidateToken + { + token = token, + refresh = refresh, + uid = uid + }; + } + else + { + _logger.LogInformation("엑세스 토큰 만료"); + var refreshToken = await _dbContext.RefreshTokens + .FirstOrDefaultAsync(t => t.refresh_token == refresh); + if (refreshToken == null) + { + throw new SecurityTokenException("리프레시 토큰도 잘못되었음"); + } + var uid = refreshToken.uid; + + if (refreshToken.expire_date > DateTime.Now) + { + _logger.LogInformation($"리프레시 : {uid}"); + var access = _jwtTokenService.GenerateJwtToken(uid); + return new ValidateToken + { + token = access, + refresh = refreshToken.refresh_token, + uid = uid + }; + } + else + { + refreshToken = _jwtTokenService.GenerateRefreshToken(uid); + _logger.LogInformation("리프레시 토큰 만료"); + await SaveData(refreshToken, rt => rt.uid); + return new ValidateToken + { + token = token, + refresh = refreshToken.refresh_token, + uid = uid + }; + } + } + } + +} \ No newline at end of file diff --git a/appsettings.json b/appsettings.json index ec04bc1..d66442c 100644 --- a/appsettings.json +++ b/appsettings.json @@ -1,7 +1,7 @@ { "Logging": { "LogLevel": { - "Default": "Information", + "Default": "Warning", "Microsoft.AspNetCore": "Warning" } },