Changeset a26f6a1 for resTools_backend/backend

Timestamp:

08/09/22 16:09:32 (2 years ago)

Author:

Danilo <danilo.najkov@…>

Branches:

master

Children:

a569b7c

Parents:

899b19d

Message:

full auth flow

Location:

resTools_backend/backend

Files:

• Controllers/UsersController.cs (modified) (1 diff)
• DTOs/AuthenticateResponse.cs (modified) (1 diff)
• Email/EmailSender.cs (added)
• Entities/User.cs (modified) (1 diff)
• Migrations/20220808143343_Auth-changes.Designer.cs (added)
• Migrations/20220808143343_Auth-changes.cs (added)
• Migrations/20220808143757_Auth-changes-nullable.Designer.cs (added)
• Migrations/20220808143757_Auth-changes-nullable.cs (added)
• Migrations/DataContextModelSnapshot.cs (modified) (2 diffs)
• Program.cs (modified) (2 diffs)
• Services/UserService.cs (modified) (7 diffs)
• backend.csproj (modified) (2 diffs)

resTools_backend/backend/Controllers/UsersController.cs

@@ -41 +41 @@
         }catch (Exception ex){ return null; }
         User user = await _userService.GetById(userId);
-        return new AuthenticateResponse() { Email=user.Email, Id = user.Id};
+        return new AuthenticateResponse() { Email=user.Email, Id = user.Id, IsAdmin = user.IsAdmin, IsConfirmed = user.IsConfirmed};
+    }
+
+    [HttpPost("confirm")]
+    public async Task ConfirmEmail()
+    {
+        int userId = 0;
+        try
+        {
+            userId = (int)this.HttpContext.Items["User"];
+        }
+        catch (Exception ex) { return; }
+        User user = await _userService.GetById(userId);
+        await _userService.SendEmailConfirmation(user.Email);
+    }
+
+    [HttpPost("reset")]
+    public async Task ResetPassword(string email)
+    {
+        await _userService.SendPasswordReset(email);
+    }
+
+    [HttpPost("confirmed")]
+    public async Task ConfirmedEmail(string validityString)
+    {
+        int userId = 0;
+        try
+        {
+            userId = (int)this.HttpContext.Items["User"];
+        }
+        catch (Exception ex) { return; }
+        User user = await _userService.GetById(userId);
+        await _userService.ConfirmEmail(user, validityString);
+    }
+
+    [HttpPost("reseted")]
+    public async Task ResetedPassword(string validityString, string newPassword)
+    {
+        await _userService.ResetPassword(validityString, newPassword);
     }
 

resTools_backend/backend/DTOs/AuthenticateResponse.cs

@@ -15 +15 @@
     [JsonProperty]
     public bool IsAdmin { get; set; }
+    [JsonProperty]
+    public bool IsConfirmed { get; set; }
 }

resTools_backend/backend/Entities/User.cs

@@ -9 +9 @@
     public string Password { get; set; }
     public bool IsAdmin { get; set; }
+    public bool IsConfirmed { get; set; }
+    public string? ConfirmationURL { get; set; }
+    public DateTime? ConfirmationValidTo { get; set; }
+    public string? PasswordResetURL { get; set; }
+    public DateTime? PasswordResetValidTo { get; set; }
     public virtual Restaurant Restaurant { get; set; }
 }

resTools_backend/backend/Migrations/DataContextModelSnapshot.cs

@@ -176 +176 @@
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
+                    b.Property<string>("ConfirmationURL")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ConfirmationValidTo")
+                        .HasColumnType("timestamp with time zone");
+
                     b.Property<string>("Email")
                         .IsRequired()
@@ -183 +189 @@
                         .HasColumnType("boolean");
 
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
                     b.Property<string>("Password")
                         .IsRequired()
                         .HasColumnType("text");
+
+                    b.Property<string>("PasswordResetURL")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("PasswordResetValidTo")
+                        .HasColumnType("timestamp with time zone");
 
                     b.HasKey("Id");

resTools_backend/backend/Program.cs

@@ -1 +1 @@
 using backend.Data;
+using backend.Email;
 using backend.Helpers;
 using backend.Services;
@@ -50 +51 @@
 builder.Services.AddScoped<ISmsService, SmsService>();
 
+builder.Services.AddTransient<IEmailSender, EmailSender>();
+
 builder.Services.AddDbContext<DataContext>(p => p.UseNpgsql(builder.Configuration.GetConnectionString("DefaultConnection")));
 

resTools_backend/backend/Services/UserService.cs

@@ -1 @@
-namespace backend.Services;
+namespace backend.Services;
 
 using backend.Data;
 using backend.DTOs;
+using backend.Email;
 using backend.Entities;
 using backend.Helpers;
@@ -11 +12 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
+using System.Security.Cryptography;
+using System.Text;
 
 public interface IUserService
@@ -17 +20 @@
     Task<AuthenticateResponse> Register(CreateUserRequest req, bool isFirst);
     Task<User> GetById(int id);
+    Task SendEmailConfirmation(string email);
+    Task SendPasswordReset(string email);
+    Task ConfirmEmail(User user, string checkValid);
+    Task ResetPassword(string checkValid, string password);
 }
 
@@ -23 +30 @@
     private readonly AppSettings _appSettings;
     private readonly DataContext _context = null;
+    private readonly IEmailSender _emailSender;
 
-    public UserService(IOptions<AppSettings> appSettings, DataContext context)
+    public UserService(IOptions<AppSettings> appSettings, DataContext context, IEmailSender emailSender)
     {
         _appSettings = appSettings.Value;
         _context = context;
+        _emailSender = emailSender;
     }
 
@@ -40 +49 @@
         var token = generateJwtToken(user);
 
-        return new AuthenticateResponse { Email = user.Email, Id = user.Id, Token = token, IsAdmin = user.IsAdmin};
+        return new AuthenticateResponse { Email = user.Email, Id = user.Id, Token = token, IsAdmin = user.IsAdmin, IsConfirmed = user.IsConfirmed};
+    }
+
+    public async Task ConfirmEmail(User user, string checkValid)
+    {
+        if(user.ConfirmationURL != checkValid)
+        {
+            throw new Exception("Invalid check");
+        }
+        if(user.ConfirmationValidTo < DateTime.UtcNow)
+        {
+            throw new Exception("Link expired");
+        }
+
+        user.IsConfirmed = true;
+        _context.Users.Update(user);
+        await _context.SaveChangesAsync();
     }
 
@@ -50 +75 @@
     public async Task<AuthenticateResponse> Register(CreateUserRequest req, bool isFirst)
     {
-        User user = new User() { Email = req.Email, Password = req.Password, IsAdmin = isFirst };
+        User user = new User() { Email = req.Email, Password = req.Password, IsAdmin = isFirst, IsConfirmed = false };
         await _context.Users.AddAsync(user);
         await _context.SaveChangesAsync();
         var token = generateJwtToken(user);
-        return new AuthenticateResponse { Email = user.Email, Id = user.Id, Token = token, IsAdmin = user.IsAdmin };
+        return new AuthenticateResponse { Email = user.Email, Id = user.Id, Token = token, IsAdmin = user.IsAdmin, IsConfirmed = false };
+    }
+
+    public async Task ResetPassword(string checkValid, string password)
+    {
+        var user = await _context.Users.Where(x => x.PasswordResetURL == checkValid).FirstOrDefaultAsync();
+        if (user == null)
+        {
+            throw new Exception("Invalid check");
+        }
+        if (user.PasswordResetValidTo < DateTime.UtcNow)
+        {
+            throw new Exception("Link expired");
+        }
+
+        user.Password = password;
+        _context.Users.Update(user);
+        await _context.SaveChangesAsync();
+    }
+
+    public async Task SendEmailConfirmation(string email)
+    {
+        User user = await _context.Users.FirstOrDefaultAsync(x => x.Email == email);
+        user.ConfirmationURL = Guid.NewGuid().ToString();
+        user.ConfirmationValidTo = DateTime.UtcNow.AddHours(24);
+        _context.Users.Update(user);
+        await _context.SaveChangesAsync();
+        await _emailSender.SendEmailAsync(
+            "Потврдете го вашиот емаил",
+            "Ве молиме кликнете на следниот линк за да го потврдите вашиот емаил: http://localhost:3000/confirm?id=" + user.ConfirmationURL,
+            email);
+    }
+
+    public async Task SendPasswordReset(string email)
+    {
+        User user = await _context.Users.FirstOrDefaultAsync(x => x.Email == email);
+        user.PasswordResetURL = Guid.NewGuid().ToString();
+        user.PasswordResetValidTo = DateTime.UtcNow.AddHours(24);
+        _context.Users.Update(user);
+        await _context.SaveChangesAsync();
+        await _emailSender.SendEmailAsync(
+           "Ресетирајте ја лозинката",
+           "Ве молиме кликнете на следниот линк за да ја ресетирате лозинката: http://localhost:3000/reset?id=" + user.PasswordResetURL,
+           email);
     }
 
@@ -71 +139 @@
         return tokenHandler.WriteToken(token);
     }
+    
+    private string sha256Hash(String value)
+    {
+        using (SHA256 hash = SHA256.Create())
+        {
+            return String.Concat(hash
+              .ComputeHash(Encoding.UTF8.GetBytes(value))
+              .Select(item => item.ToString("x2")));
+        }
+    }
 }

resTools_backend/backend/backend.csproj

@@ -1 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
@@ -22 +22 @@
     <PackageReference Include="Npgsql" Version="6.0.3" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.3" />
+    <PackageReference Include="SendGrid" Version="9.28.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
     <PackageReference Include="Swashbuckle.Core" Version="5.6.0" />