Feature/confirm registration (#48)

* - added email templates to api project - added email configuration to appsettings - added send email after registering a user - added confirmation endpoint * created confirmation html page * cleanup * cleanup: remove jurnal medical refs from templates * cleanup * cleanup * added user api to dockerfile fix build * cleanup template * - remove identityserver project - add confirmation message after email is confirmed Co-authored-by: trupci <a.trupcea@moodmedia.com>
code4romania · Apr 28, 2021 · f0379d5 · f0379d5
1 parent 4328ed4
commit f0379d5
Show file tree

Hide file tree

Showing 230 changed files with 263 additions and 57,173 deletions.
diff --git a/Src/DeUrgenta.Api/DeUrgenta.Api.csproj b/Src/DeUrgenta.Api/DeUrgenta.Api.csproj
@@ -11,6 +11,7 @@
 		<NoWarn>$(NoWarn);1591</NoWarn>
 	</PropertyGroup>
 
+
 	<ItemGroup>
 		<PackageReference Include="Hellang.Middleware.ProblemDetails" Version="5.3.0" />
 		<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />

diff --git a/Src/DeUrgenta.Api/EmailTemplates/accountConfirmationTemplate.html b/Src/DeUrgenta.Api/EmailTemplates/accountConfirmationTemplate.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<html>
+<head>
+	<meta name="viewport" content="width=device-width" />
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>Bine ai venit!</title>
+	<style>
+	</style>
+</head>
+<body class="">
+	<span ></span>
+	<section>
+		<div>
+			<img alt="Code for Romania" src="" style="float: right" height="32">
+			<div style="clear:both;"></div>
+		</div>
+	</section>
+	<span></span>
+	<section>
+		<p>
+			Salut!
+		</p>
+		<p>
+			Contul tău a fost creat, dar pentru a putea să te loghezi trebuie să confirmi contul tău apăsând pe <a href='%%confirmationLink%%'>acest link</a>.
+		</p>
+		<p>
+			Îți mulțumim,
+			<br />
+			Echipa De Urgenta
+		</p>
+	</section>
+</body>
+</html>
diff --git a/Src/DeUrgenta.Api/EmailTemplates/resetPasswordTemplate.html b/Src/DeUrgenta.Api/EmailTemplates/resetPasswordTemplate.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<html>
+<head>
+	<meta name="viewport" content="width=device-width" />
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>Bine ai venit!</title>
+	<style>
+	</style>
+</head>
+<body class="">
+	<span ></span>
+	<section>
+		<div>
+			<img alt="Code for Romania" src="" style="float: right" height="32">
+			<div style="clear:both;"></div>
+		</div>
+	</section>
+	<span></span>
+	<section>
+		<p>
+			Salut!
+		</p>
+		<p>
+			Pentru a-ți reseta parola apasă pe <a href='%%resetPasswordLink%%'>acest link</a>.
+		</p>
+	</section>
+</body>
+</html>
diff --git a/Src/DeUrgenta.Api/Startup.cs b/Src/DeUrgenta.Api/Startup.cs
@@ -16,6 +16,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using System.Collections.Generic;
 
 namespace DeUrgenta.Api
 {
@@ -51,7 +52,7 @@ public void ConfigureServices(IServiceCollection services)
                     .AllowAnyMethod()
                     .AllowAnyHeader();
             }));
-
+            services.SetupEmailService(Configuration);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -72,7 +73,7 @@ public void Configure(IApplicationBuilder app)
             app.UseAuthorization();
             app.UseEndpoints(endpoints => endpoints.MapControllers());
 
-
+            app.UseStaticFiles();
 
             app.UseCors(CorsPolicyName);
 

diff --git a/Src/DeUrgenta.Api/appsettings.json b/Src/DeUrgenta.Api/appsettings.json
@@ -1,18 +1,33 @@
 {
-    "Logging": {
-        "LogLevel": {
-            "Default": "Information",
-            "Microsoft": "Warning",
-            "Microsoft.Hosting.Lifetime": "Information"
-        }
-    },
-    "AllowedHosts": "*",
-    "ConnectionStrings": {
-        "DbConnectionString": "Server=localhost;Port=5432;Database=de-urgenta-db;User Id=docker;Password=docker;",
-        "IdentityDbConnectionString": "Server=localhost;Port=5432;Database=de-urgenta-db;User Id=docker;Password=docker;"
-    },
-    "JwtConfig": {
-        "Secret": "llvudfvkwvepwkdnsnwmuulyvtrawppf",
-        "TokenExpirationInSeconds": 3600
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "AllowedHosts": "*",
+  "ConnectionStrings": {
+    "DbConnectionString": "Server=localhost;Port=5432;Database=de-urgenta-db;User Id=docker;Password=docker;",
+    "IdentityDbConnectionString": "Server=localhost;Port=5432;Database=de-urgenta-db;User Id=docker;Password=docker;"
+  },
+  "JwtConfig": {
+    "Secret": "llvudfvkwvepwkdnsnwmuulyvtrawppf",
+    "TokenExpirationInSeconds": 3600
+  },
+  "EMailingSystem": "SendGrid",
+  "AdminFromName": "Echipa 'de urgenta'",
+  "AdminFromEmail": "admin@deurgenta.ro",
+  "ConfirmationUrl": "https://api.deurgenta.hostmysite.ro/confirmEmail.html",
+  "Smtp": {
+    "Host": "",
+    "Port": 0,
+    "User": "",
+    "Password": ""
+  },
+  "SendGrid": {
+    "ApiKey": "",
+    "ClickTracking": false
+  },
+  "TemplateFolder": "EmailTemplates"
 }
diff --git a/Src/DeUrgenta.Api/wwwroot/confirmEmail.html b/Src/DeUrgenta.Api/wwwroot/confirmEmail.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Confirmare adresa de email</title>
+</head>
+<body>
+    <script>   
+        function callback(xhr) {
+            if (xhr.status === 200) {
+                document.getElementById('status').innerHTML = 'Adresa de mail a fost confirmata. Va puteti intoarce in aplicatie.';
+            } else {
+                document.getElementById('status').innerHTML = 'Eroare.';
+            }
+        }
+        const urlParams = new URLSearchParams(window.location.search);
+        const userId = urlParams.get('userId');
+        const code = urlParams.get('code');
+
+        var xhr = new XMLHttpRequest();   
+        xhr.open("POST", "/auth/confirm");
+        xhr.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+        xhr.onreadystatechange = function () {
+            if (xhr.readyState === 4) {
+                callback(xhr);
+            }
+        }
+        xhr.send(JSON.stringify({ "userId": userId, "code": code }));
+
+    </script>
+    <div id="status"></div>
+</body>
+</html>
diff --git a/Src/DeUrgenta.IdentityServer.sln b/Src/DeUrgenta.IdentityServer.sln
diff --git a/Src/DeUrgenta.IdentityServer/Areas/Identity/Pages/Account/ConfirmEmail.cshtml b/Src/DeUrgenta.IdentityServer/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
diff --git a/Src/DeUrgenta.IdentityServer/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs b/Src/DeUrgenta.IdentityServer/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs
diff --git a/Src/DeUrgenta.IdentityServer/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml b/Src/DeUrgenta.IdentityServer/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml