Skip to content

Commit 4559e0e

Browse files
AmitpnkAmitpnk
authored
Merge pull request #50 from samanazadi1996/develop
Upgrade project to .NET 8
2 parents e4c1d43 + fad81c3 commit 4559e0e

File tree

71 files changed

+1371
-1604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1371
-1604
lines changed

‎src/OA.Domain/Auth/ApplicationUser.cs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
using Microsoft.AspNetCore.Identity;
2-
using System.Collections.Generic;
1+
using Microsoft.AspNetCore.Identity;
32

4-
namespace OA.Domain.Auth
3+
namespace OA.Domain.Auth;
4+
5+
public class ApplicationUser : IdentityUser
56
{
6-
public class ApplicationUser : IdentityUser
7+
public string FirstName { get; set; }
8+
public string LastName { get; set; }
9+
public List<RefreshToken> RefreshTokens { get; set; }
10+
public bool OwnsToken(string token)
711
{
8-
public string FirstName { get; set; }
9-
public string LastName { get; set; }
10-
public List<RefreshToken> RefreshTokens { get; set; }
11-
public bool OwnsToken(string token)
12-
{
13-
return this.RefreshTokens?.Find(x => x.Token == token) != null;
14-
}
12+
return this.RefreshTokens?.Find(x => x.Token == token) != null;
1513
}
1614
}

‎src/OA.Domain/Auth/AuthenticationRequest.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
namespace OA.Domain.Auth
1+
namespace OA.Domain.Auth;
2+
3+
public class AuthenticationRequest
24
{
3-
public class AuthenticationRequest
4-
{
5-
public string Email { get; set; }
6-
public string Password { get; set; }
7-
}
8-
}
5+
public string Email { get; set; }
6+
public string Password { get; set; }
7+
}

‎src/OA.Domain/Auth/AuthenticationResponse.cs

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
using System.Collections.Generic;
21
using System.Text.Json.Serialization;
32

4-
namespace OA.Domain.Auth
3+
namespace OA.Domain.Auth;
4+
5+
public class AuthenticationResponse
56
{
6-
public class AuthenticationResponse
7-
{
8-
public string Id { get; set; }
9-
public string UserName { get; set; }
10-
public string Email { get; set; }
11-
public List<string> Roles { get; set; }
12-
public bool IsVerified { get; set; }
13-
public string JWToken { get; set; }
14-
[JsonIgnore]
15-
public string RefreshToken { get; set; }
16-
}
17-
}
7+
public string Id { get; set; }
8+
public string UserName { get; set; }
9+
public string Email { get; set; }
10+
public List<string> Roles { get; set; }
11+
public bool IsVerified { get; set; }
12+
public string JWToken { get; set; }
13+
[JsonIgnore]
14+
public string RefreshToken { get; set; }
15+
}

‎src/OA.Domain/Auth/ForgotPasswordRequest.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
using System.ComponentModel.DataAnnotations;
1+
using System.ComponentModel.DataAnnotations;
22

3-
namespace OA.Domain.Auth
3+
namespace OA.Domain.Auth;
4+
5+
public class ForgotPasswordRequest
46
{
5-
public class ForgotPasswordRequest
6-
{
7-
[Required]
8-
[EmailAddress]
9-
public string Email { get; set; }
10-
}
11-
}
7+
[Required]
8+
[EmailAddress]
9+
public string Email { get; set; }
10+
}

‎src/OA.Domain/Auth/RefreshToken.cs

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
using System;
1+
namespace OA.Domain.Auth;
22

3-
namespace OA.Domain.Auth
3+
public class RefreshToken
44
{
5-
public class RefreshToken
6-
{
7-
public int Id { get; set; }
8-
public string Token { get; set; }
9-
public DateTime Expires { get; set; }
10-
public bool IsExpired => DateTime.UtcNow >= Expires;
11-
public DateTime Created { get; set; }
12-
public string CreatedByIp { get; set; }
13-
public DateTime? Revoked { get; set; }
14-
public string RevokedByIp { get; set; }
15-
public string ReplacedByToken { get; set; }
16-
public bool IsActive => Revoked == null && !IsExpired;
17-
}
18-
}
5+
public int Id { get; set; }
6+
public string Token { get; set; }
7+
public DateTime Expires { get; set; }
8+
public bool IsExpired => DateTime.UtcNow >= Expires;
9+
public DateTime Created { get; set; }
10+
public string CreatedByIp { get; set; }
11+
public DateTime? Revoked { get; set; }
12+
public string RevokedByIp { get; set; }
13+
public string ReplacedByToken { get; set; }
14+
public bool IsActive => Revoked == null && !IsExpired;
15+
}

‎src/OA.Domain/Auth/RegisterRequest.cs

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
1-
using System.ComponentModel.DataAnnotations;
1+
using System.ComponentModel.DataAnnotations;
22

3-
namespace OA.Domain.Auth
3+
namespace OA.Domain.Auth;
4+
5+
public class RegisterRequest
46
{
5-
public class RegisterRequest
6-
{
7-
[Required]
8-
public string FirstName { get; set; }
7+
[Required]
8+
public string FirstName { get; set; }
99

10-
[Required]
11-
public string LastName { get; set; }
10+
[Required]
11+
public string LastName { get; set; }
1212

13-
[Required]
14-
[EmailAddress]
15-
public string Email { get; set; }
16-
[Required]
17-
[MinLength(6)]
18-
public string UserName { get; set; }
13+
[Required]
14+
[EmailAddress]
15+
public string Email { get; set; }
16+
[Required]
17+
[MinLength(6)]
18+
public string UserName { get; set; }
1919

20-
[Required]
21-
[MinLength(6)]
22-
public string Password { get; set; }
20+
[Required]
21+
[MinLength(6)]
22+
public string Password { get; set; }
2323

24-
[Required]
25-
[Compare("Password")]
26-
public string ConfirmPassword { get; set; }
27-
}
28-
}
24+
[Required]
25+
[Compare("Password")]
26+
public string ConfirmPassword { get; set; }
27+
}

‎src/OA.Domain/Auth/ResetPasswordRequest.cs

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
using System.ComponentModel.DataAnnotations;
1+
using System.ComponentModel.DataAnnotations;
22

3-
namespace OA.Domain.Auth
3+
namespace OA.Domain.Auth;
4+
5+
public class ResetPasswordRequest
46
{
5-
public class ResetPasswordRequest
6-
{
7-
[Required]
8-
[EmailAddress]
9-
public string Email { get; set; }
10-
[Required]
11-
public string Token { get; set; }
12-
[Required]
13-
[MinLength(6)]
14-
public string Password { get; set; }
7+
[Required]
8+
[EmailAddress]
9+
public string Email { get; set; }
10+
[Required]
11+
public string Token { get; set; }
12+
[Required]
13+
[MinLength(6)]
14+
public string Password { get; set; }
1515

16-
[Required]
17-
[Compare("Password")]
18-
public string ConfirmPassword { get; set; }
19-
}
20-
}
16+
[Required]
17+
[Compare("Password")]
18+
public string ConfirmPassword { get; set; }
19+
}

‎src/OA.Domain/BaseEntity.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
using System.ComponentModel.DataAnnotations;
1+
using System.ComponentModel.DataAnnotations;
22

3-
namespace OA.Domain
3+
namespace OA.Domain;
4+
5+
public class BaseEntity
46
{
5-
public class BaseEntity
6-
{
7-
[Key]
8-
public int Id { get; set; }
9-
}
10-
}
7+
[Key]
8+
public int Id { get; set; }
9+
}

‎src/OA.Domain/Common/IpHelper.cs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
using System.Net;
1+
using System.Net;
22
using System.Net.Sockets;
33

4-
namespace OA.Domain.Common
4+
namespace OA.Domain.Common;
5+
6+
public class IpHelper
57
{
6-
public class IpHelper
8+
public static string GetIpAddress()
79
{
8-
public static string GetIpAddress()
10+
var host = Dns.GetHostEntry(Dns.GetHostName());
11+
foreach (var ip in host.AddressList)
912
{
10-
var host = Dns.GetHostEntry(Dns.GetHostName());
11-
foreach (var ip in host.AddressList)
13+
if (ip.AddressFamily == AddressFamily.InterNetwork)
1214
{
13-
if (ip.AddressFamily == AddressFamily.InterNetwork)
14-
{
15-
return ip.ToString();
16-
}
15+
return ip.ToString();
1716
}
18-
return string.Empty;
1917
}
18+
return string.Empty;
2019
}
21-
}
20+
}

‎src/OA.Domain/Common/Response.cs

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
1-
using System.Collections.Generic;
1+
namespace OA.Domain.Common;
22

3-
namespace OA.Domain.Common
3+
public class Response<T>
44
{
5-
public class Response<T>
5+
public Response()
66
{
7-
public Response()
8-
{
9-
}
10-
public Response(T data, string message = null)
11-
{
12-
Succeeded = true;
13-
Message = message;
14-
Data = data;
15-
}
16-
public Response(string message)
17-
{
18-
Succeeded = false;
19-
Message = message;
20-
}
21-
public bool Succeeded { get; set; }
22-
public string Message { get; set; }
23-
public List<string> Errors { get; set; }
24-
public T Data { get; set; }
257
}
26-
}
8+
public Response(T data, string message = null)
9+
{
10+
Succeeded = true;
11+
Message = message;
12+
Data = data;
13+
}
14+
public Response(string message)
15+
{
16+
Succeeded = false;
17+
Message = message;
18+
}
19+
public bool Succeeded { get; set; }
20+
public string Message { get; set; }
21+
public List<string> Errors { get; set; }
22+
public T Data { get; set; }
23+
}

0 commit comments

Comments
 (0)