Merge pull request #24 from MahdiyarGHD/develop

feat: Implemented reset password tokens
EasyMicroservices · Feb 27, 2024 · c499e83 · c499e83
2 parents fdd4a2c + ee6b399
commit c499e83
Show file tree

Hide file tree

Showing 18 changed files with 1,083 additions and 147 deletions.
diff --git a/...ices.IdentityMicroservice.Clients/Connected Services/IdentityGeneratedServices/OpenAPI.cs b/...ices.IdentityMicroservice.Clients/Connected Services/IdentityGeneratedServices/OpenAPI.cs
diff --git a/...ntityMicroservice.Clients/Connected Services/IdentityGeneratedServices/OpenAPI.nswag.json b/...ntityMicroservice.Clients/Connected Services/IdentityGeneratedServices/OpenAPI.nswag.json
@@ -347,6 +347,153 @@
           }
         }
       }
+    },
+    "/api/ResetPassword/GenerateResetPasswordToken": {
+      "post": {
+        "tags": [
+          "ResetPassword"
+        ],
+        "operationId": "GenerateResetPasswordToken",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GenerateResetPasswordTokenRequestContract"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GenerateResetPasswordTokenRequestContract"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/GenerateResetPasswordTokenRequestContract"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/GenerateResetPasswordTokenResponseContractMessageContract"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GenerateResetPasswordTokenResponseContractMessageContract"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GenerateResetPasswordTokenResponseContractMessageContract"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/ResetPassword/ValidateResetPasswordToken": {
+      "post": {
+        "tags": [
+          "ResetPassword"
+        ],
+        "operationId": "ValidateResetPasswordToken",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ValidateResetPasswordTokenRequestContract"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ValidateResetPasswordTokenRequestContract"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ValidateResetPasswordTokenRequestContract"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/MessageContract"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MessageContract"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MessageContract"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/ResetPassword/ConsumeResetPasswordToken": {
+      "post": {
+        "tags": [
+          "ResetPassword"
+        ],
+        "operationId": "ConsumeResetPasswordToken",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ConsumeResetPasswordTokenRequestContract"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ConsumeResetPasswordTokenRequestContract"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ConsumeResetPasswordTokenRequestContract"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/MessageContract"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MessageContract"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MessageContract"
+                }
+              }
+            }
+          }
+        }
+      }
     }
   },
   "components": {
@@ -429,6 +576,20 @@
           }
         }
       },
+      "ConsumeResetPasswordTokenRequestContract": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "token": {
+            "type": "string",
+            "nullable": true
+          },
+          "password": {
+            "type": "string",
+            "nullable": true
+          }
+        }
+      },
       "ErrorContract": {
         "type": "object",
         "additionalProperties": false,
@@ -519,6 +680,53 @@
           16
         ]
       },
+      "GenerateResetPasswordTokenRequestContract": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "whiteLabelKey": {
+            "type": "string",
+            "nullable": true
+          },
+          "expireTimeInSeconds": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "userName": {
+            "type": "string",
+            "nullable": true
+          }
+        }
+      },
+      "GenerateResetPasswordTokenResponseContract": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "token": {
+            "type": "string",
+            "nullable": true
+          }
+        }
+      },
+      "GenerateResetPasswordTokenResponseContractMessageContract": {
+        "title": "MessageContract<GenerateResetPasswordTokenResponseContract>",
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "isSuccess": {
+            "type": "boolean"
+          },
+          "error": {
+            "$ref": "#/components/schemas/ErrorContract"
+          },
+          "success": {
+            "$ref": "#/components/schemas/SuccessContract"
+          },
+          "result": {
+            "$ref": "#/components/schemas/GenerateResetPasswordTokenResponseContract"
+          }
+        }
+      },
       "LoginByPersonalAccessTokenRequestContract": {
         "type": "object",
         "additionalProperties": false,
@@ -725,6 +933,16 @@
           }
         }
       },
+      "ValidateResetPasswordTokenRequestContract": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "token": {
+            "type": "string",
+            "nullable": true
+          }
+        }
+      },
       "ValidationContract": {
         "type": "object",
         "additionalProperties": false,

diff --git a/...rvices.IdentityMicroservice.Clients/EasyMicroservices.IdentityMicroservice.Clients.csproj b/...rvices.IdentityMicroservice.Clients/EasyMicroservices.IdentityMicroservice.Clients.csproj
@@ -5,7 +5,7 @@
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
     <IsPackable>true</IsPackable>
-    <Version>0.0.0.6</Version>
+    <Version>0.0.0.9</Version>
     <Description>client generated code.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>microservice,Identity,Identity,client</PackageTags>

diff --git a/...harp/EasyMicroservices.IdentityMicroservice.Database/Database/Contexts/IdentityContext.cs b/...harp/EasyMicroservices.IdentityMicroservice.Database/Database/Contexts/IdentityContext.cs
@@ -11,8 +11,6 @@ public IdentityContext(IEntityFrameworkCoreDatabaseBuilder builder) : base(build
         {
         }
 
-        //public DbSet<IdentityEntity> Identity { get; set; }
-
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             base.OnModelCreating(modelBuilder);

diff --git a/...ices.IdentityMicroservice.Database/EasyMicroservices.IdentityMicroservice.Database.csproj b/...ices.IdentityMicroservice.Database/EasyMicroservices.IdentityMicroservice.Database.csproj
@@ -35,6 +35,7 @@
 
   <ItemGroup>
 	  <PackageReference Include="EasyMicroservices.Configuration" Version="0.0.0.3" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.26" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...dentityMicroservice.Domain/Contracts/Requests/ConsumeResetPasswordTokenRequestContract.cs b/...dentityMicroservice.Domain/Contracts/Requests/ConsumeResetPasswordTokenRequestContract.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EasyMicroservices.IdentityMicroservice.Contracts.Requests
+{
+    public class ConsumeResetPasswordTokenRequestContract
+    {
+        public string Token { get; set; }
+        public string Password { get; set; }
+    }
+}
diff --git a/...entityMicroservice.Domain/Contracts/Requests/GenerateResetPasswordTokenRequestContract.cs b/...entityMicroservice.Domain/Contracts/Requests/GenerateResetPasswordTokenRequestContract.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EasyMicroservices.IdentityMicroservice.Contracts.Requests
+{
+    public class GenerateResetPasswordTokenRequestContract
+    {
+        public string WhiteLabelKey { get; set; }
+        public long ExpireTimeInSeconds { get; set; }
+        public string UserName { get; set; }
+    }
+}
diff --git a/...entityMicroservice.Domain/Contracts/Requests/ValidateResetPasswordTokenRequestContract.cs b/...entityMicroservice.Domain/Contracts/Requests/ValidateResetPasswordTokenRequestContract.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EasyMicroservices.IdentityMicroservice.Contracts.Requests
+{
+    public class ValidateResetPasswordTokenRequestContract
+    {
+        public string Token { get; set; }
+    }
+}
diff --git a/...tityMicroservice.Domain/Contracts/Responses/GenerateResetPasswordTokenResponseContract.cs b/...tityMicroservice.Domain/Contracts/Responses/GenerateResetPasswordTokenResponseContract.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EasyMicroservices.IdentityMicroservice.Contracts.Responses
+{
+    public class GenerateResetPasswordTokenResponseContract
+    {
+        public string Token { get; set; }
+    }
+}
diff --git a/...services.IdentityMicroservice.Domain/EasyMicroservices.IdentityMicroservice.Domain.csproj b/...services.IdentityMicroservice.Domain/EasyMicroservices.IdentityMicroservice.Domain.csproj
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.1.44" />
+	  <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.1.59" />
 	  <PackageReference Include="EasyMicroservices.Logger" Version="0.0.0.6" />
   </ItemGroup>
 </Project>
diff --git a/...services.IdentityMicroservice.Logics/EasyMicroservices.IdentityMicroservice.Logics.csproj b/...services.IdentityMicroservice.Logics/EasyMicroservices.IdentityMicroservice.Logics.csproj
@@ -29,8 +29,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.Mapper.CompileTimeMapper" Version="0.0.0.6" />
-    <PackageReference Include="EasyMicroservices.Mapper.SerializerMapper" Version="0.0.0.3" />
+    <PackageReference Include="EasyMicroservices.Mapper.CompileTimeMapper" Version="0.0.0.7" />
+    <PackageReference Include="EasyMicroservices.Mapper.SerializerMapper" Version="0.0.0.7" />
+    <PackageReference Include="EasyMicroservices.Security" Version="0.0.0.3" />
     <PackageReference Include="EasyMicroservices.Serialization.Newtonsoft.Json" Version="0.0.0.9" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.2.0" />
   </ItemGroup>

diff --git a/src/CSharp/EasyMicroservices.IdentityMicroservice.Logics/Helpers/AppUnitOfWork.cs b/src/CSharp/EasyMicroservices.IdentityMicroservice.Logics/Helpers/AppUnitOfWork.cs
@@ -6,13 +6,17 @@
 using EasyMicroservices.Cores.Models;
 using EasyMicroservices.IdentityMicroservice.Interfaces;
 using EasyMicroservices.Logger.Interfaces;
+using EasyMicroservices.Security;
+using EasyMicroservices.Security.Interfaces;
+using EasyMicroservices.Security.Providers.HashProviders;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
+using System.Text;
 using WhiteLables.GeneratedServices;
 
 namespace EasyMicroservices.IdentityMicroservice.Helpers
@@ -30,6 +34,11 @@ public IConfiguration GetConfiguration()
             return _service.GetService<IConfiguration>();
         }
 
+        public SHA256HashProvider GetSHA256HashProvider()
+        {
+            return _service.GetService<SHA256HashProvider>();
+        }
+
         public IdentityHelper GetIdentityHelper()
         {
             return _service.GetService<IdentityHelper>();
@@ -82,6 +91,11 @@ public RoleClient GetRoleClient()
             return InternalLogin(new RoleClient(GetValue("Authentication"), CurrentHttpClient));
         }
 
+        public ResetPasswordTokenClient GetResetPasswordTokenClientClient()
+        {
+            return InternalLogin(new ResetPasswordTokenClient(GetValue("Authentication"), CurrentHttpClient));
+        }
+
         public PersonalAccessTokenClient GetPersonalAccessTokenClientClient()
         {
             return InternalLogin(new PersonalAccessTokenClient(GetValue("Authentication"), CurrentHttpClient));