identity: simplify user sign up

thecodrr · thecodrr · commit 9ae5db378d21 · 2026-02-16T13:43:04.000+05:00
diff --git a/Notesnook.API/Controllers/UsersController.cs b/Notesnook.API/Controllers/UsersController.cs
@@ -33,6 +33,7 @@ You should have received a copy of the Affero GNU General Public License
 using Streetwriters.Common.Accessors;
 using Streetwriters.Common.Extensions;
 using Streetwriters.Common.Messages;
+using Streetwriters.Common.Models;
 
 namespace Notesnook.API.Controllers
 {
@@ -43,12 +44,11 @@ public class UsersController(IUserService UserService, WampServiceAccessor servi
     {
         [HttpPost]
         [AllowAnonymous]
-        public async Task<IActionResult> Signup()
+        public async Task<IActionResult> Signup([FromForm] SignupForm form)
         {
             try
             {
-                await UserService.CreateUserAsync();
-                return Ok();
+                return Ok(await UserService.CreateUserAsync(form));
             }
             catch (Exception ex)
             {
diff --git a/Notesnook.API/Interfaces/IUserService.cs b/Notesnook.API/Interfaces/IUserService.cs
@@ -20,12 +20,13 @@ You should have received a copy of the Affero GNU General Public License
 using System.Threading.Tasks;
 using Notesnook.API.Models;
 using Notesnook.API.Models.Responses;
+using Streetwriters.Common.Models;
 
 namespace Notesnook.API.Interfaces
 {
     public interface IUserService
     {
-        Task CreateUserAsync();
+        Task<SignupResponse> CreateUserAsync(SignupForm form);
         Task DeleteUserAsync(string userId);
         Task DeleteUserAsync(string userId, string? jti, string password);
         Task<bool> ResetUserAsync(string userId, bool removeAttachments);
diff --git a/Notesnook.API/Models/Responses/SignupResponse.cs b/Notesnook.API/Models/Responses/SignupResponse.cs
diff --git a/Notesnook.API/Services/UserService.cs b/Notesnook.API/Services/UserService.cs
@@ -51,15 +51,16 @@ public class UserService(IHttpContextAccessor accessor,
         private IS3Service S3Service { get; set; } = s3Service;
         private readonly IUnitOfWork unit = unitOfWork;
 
-        public async Task CreateUserAsync()
+        public async Task<SignupResponse> CreateUserAsync(SignupForm form)
         {
-            SignupResponse response = await httpClient.ForwardAsync<SignupResponse>(this.HttpContextAccessor, $"{Servers.IdentityServer}/signup", HttpMethod.Post);
-            if (!response.Success || (response.Errors != null && response.Errors.Length > 0) || response.UserId == null)
+            SignupResponse response = await serviceAccessor.UserAccountService.CreateUserAsync(form.ClientId, form.Email, form.Password, HttpContextAccessor.HttpContext?.Request.Headers["User-Agent"].ToString());
+
+            if ((response.Errors != null && response.Errors.Length > 0) || response.UserId == null)
             {
                 logger.LogError("Failed to sign up user: {Response}", JsonSerializer.Serialize(response));
                 if (response.Errors != null && response.Errors.Length > 0)
                     throw new Exception(string.Join(" ", response.Errors));
-                else throw new Exception("Could not create a new account. Error code: " + response.StatusCode);
+                else throw new Exception("Could not create a new account.");
             }
 
             await Repositories.UsersSettings.InsertAsync(new UserSettings
@@ -84,7 +85,7 @@ await Repositories.UsersSettings.InsertAsync(new UserSettings
                 });
             }
 
-            logger.LogInformation("New user created: {Response}", JsonSerializer.Serialize(response));
+            return response;
         }
 
         public async Task<UserResponse> GetUserAsync(string userId)
diff --git a/Streetwriters.Common/Interfaces/IUserAccountService.cs b/Streetwriters.Common/Interfaces/IUserAccountService.cs
@@ -16,5 +16,7 @@ public interface IUserAccountService
         Task<bool> ResetPasswordAsync(string userId, string newPassword);
         [WampProcedure("co.streetwriters.identity.users.clear_sessions")]
         Task<bool> ClearSessionsAsync(string userId, string clientId, bool all, string jti, string? refreshToken);
+        [WampProcedure("co.streetwriters.identity.users.create_user")]
+        Task<SignupResponse> CreateUserAsync(string clientId, string email, string password, string? userAgent = null);
     }
 }
diff --git a/Streetwriters.Common/Models/SignupForm.cs b/Streetwriters.Common/Models/SignupForm.cs
@@ -21,7 +21,7 @@ You should have received a copy of the Affero GNU General Public License
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Streetwriters.Identity.Models
+namespace Streetwriters.Common.Models
 {
     public class SignupForm
     {
diff --git a/Streetwriters.Common/Models/SignupResponse.cs b/Streetwriters.Common/Models/SignupResponse.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+using Streetwriters.Common.Models;
+
+namespace Streetwriters.Common.Models
+{
+    public class SignupResponse
+    {
+        [JsonPropertyName("access_token")]
+        public string AccessToken { get; set; }
+        [JsonPropertyName("expires_in")]
+        public int AccessTokenLifetime { get; set; }
+        [JsonPropertyName("refresh_token")]
+        public string RefreshToken { get; set; }
+        [JsonPropertyName("scope")]
+        public string Scope { get; set; }
+        [JsonPropertyName("user_id")]
+        public string UserId { get; set; }
+        public string[]? Errors { get; set; }
+
+        public static SignupResponse Error(IEnumerable<string> errors)
+        {
+            return new SignupResponse
+            {
+                Errors = [.. errors]
+            };
+        }
+    }
+}
diff --git a/Streetwriters.Identity/Controllers/AccountController.cs b/Streetwriters.Identity/Controllers/AccountController.cs
@@ -38,6 +38,7 @@ You should have received a copy of the Affero GNU General Public License
 using Streetwriters.Common.Messages;
 using Streetwriters.Common.Models;
 using Streetwriters.Identity.Enums;
+using Streetwriters.Identity.Extensions;
 using Streetwriters.Identity.Interfaces;
 using Streetwriters.Identity.Models;
 using Streetwriters.Identity.Services;
@@ -125,7 +126,7 @@ public async Task<IActionResult> SendVerificationEmail([FromForm] string newEmai
             {
                 ArgumentNullException.ThrowIfNull(user.Email);
                 var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
-                var callbackUrl = Url.TokenLink(user.Id.ToString(), code, client.Id, TokenType.CONFRIM_EMAIL);
+                var callbackUrl = UrlExtensions.TokenLink(user.Id.ToString(), code, client.Id, TokenType.CONFRIM_EMAIL);
                 await EmailSender.SendConfirmationEmailAsync(user.Email, callbackUrl, client);
             }
             else
@@ -158,7 +159,7 @@ public async Task<IActionResult> ResetUserPassword([FromForm] ResetPasswordForm
             if (!await UserService.IsUserValidAsync(UserManager, user, form.ClientId)) return Ok();
 
             var code = await UserManager.GenerateUserTokenAsync(user, TokenOptions.DefaultProvider, "ResetPassword");
-            var callbackUrl = Url.TokenLink(user.Id.ToString(), code, client.Id, TokenType.RESET_PASSWORD);
+            var callbackUrl = UrlExtensions.TokenLink(user.Id.ToString(), code, client.Id, TokenType.RESET_PASSWORD);
 #if (DEBUG || STAGING)
             return Ok(callbackUrl);
 #else
diff --git a/Streetwriters.Identity/Controllers/SignupController.cs b/Streetwriters.Identity/Controllers/SignupController.cs
diff --git a/Streetwriters.Identity/Extensions/UrlExtensions.cs b/Streetwriters.Identity/Extensions/UrlExtensions.cs
@@ -25,25 +25,24 @@ You should have received a copy of the Affero GNU General Public License
 using Streetwriters.Identity.Controllers;
 using Streetwriters.Identity.Enums;
 
-namespace Microsoft.AspNetCore.Mvc
+namespace Streetwriters.Identity.Extensions
 {
-    public static class UrlHelperExtensions
+    public static class UrlExtensions
     {
-        public static string? TokenLink(this IUrlHelper urlHelper, string userId, string code, string clientId, TokenType type)
+        public static string? TokenLink(string userId, string code, string clientId, TokenType type)
         {
-
-            return urlHelper.ActionLink(
+            var url = new UriBuilder();
 #if (DEBUG || STAGING)
-            host: $"{Servers.IdentityServer.Hostname}:{Servers.IdentityServer.Port}",
-            protocol: "http",
+            url.Host = $"{Servers.IdentityServer.Hostname}";
+            url.Port = Servers.IdentityServer.Port;
+            url.Scheme = "http";
 #else
-            host: Servers.IdentityServer.PublicURL.Host,
-            protocol: Servers.IdentityServer.PublicURL.Scheme,
+            url.Host = Servers.IdentityServer.PublicURL.Host;
+            url.Scheme = Servers.IdentityServer.PublicURL.Scheme;
 #endif
-            action: nameof(AccountController.ConfirmToken),
-            controller: "Account",
-            values: new { userId, code, clientId, type });
-
+            url.Path = "account/confirm";
+            url.Query = $"userId={Uri.EscapeDataString(userId)}&code={Uri.EscapeDataString(code)}&clientId={Uri.EscapeDataString(clientId)}&type={Uri.EscapeDataString(type.ToString())}";
+            return url.ToString();
         }
     }
 }
diff --git a/Streetwriters.Identity/Interfaces/ITokenGenerationService.cs b/Streetwriters.Identity/Interfaces/ITokenGenerationService.cs
@@ -19,15 +19,17 @@ You should have received a copy of the Affero GNU General Public License
 
 using System.Security.Claims;
 using System.Threading.Tasks;
+using IdentityServer4.ResponseHandling;
 using IdentityServer4.Validation;
 using Streetwriters.Common.Models;
 
 namespace Streetwriters.Identity.Interfaces
 {
     public interface ITokenGenerationService
     {
-        Task<string> CreateAccessTokenAsync(User user, string clientId);
-        Task<string> CreateAccessTokenFromValidatedRequestAsync(ValidatedTokenRequest validatedRequest, User user, string[] scopes, int lifetime = 60);
-        Task<ClaimsPrincipal> TransformTokenRequestAsync(ValidatedTokenRequest request, User user, string grantType, string[] scopes, int lifetime = 20 * 60);
+        Task<string> CreateAccessTokenAsync(User user, string clientId, int lifetime = 1800);
+        Task<string> CreateAccessTokenFromValidatedRequestAsync(ValidatedTokenRequest validatedRequest, User user, string[] scopes, int lifetime = 1200);
+        Task<ClaimsPrincipal> TransformTokenRequestAsync(ValidatedTokenRequest request, User user, string grantType, string[] scopes, int lifetime = 1200);
+        Task<TokenResponse?> CreateUserTokensAsync(User user, string clientId, int lifetime = 1800);
     }
 }
diff --git a/Streetwriters.Identity/Services/TokenGenerationService.cs b/Streetwriters.Identity/Services/TokenGenerationService.cs
diff --git a/Streetwriters.Identity/Services/UserAccountService.cs b/Streetwriters.Identity/Services/UserAccountService.cs

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ You should have received a copy of the Affero GNU General Public License`
`33`	`33`	`using Streetwriters.Common.Accessors;`
`34`	`34`	`using Streetwriters.Common.Extensions;`
`35`	`35`	`using Streetwriters.Common.Messages;`
	`36`	`+using Streetwriters.Common.Models;`
`36`	`37`
`37`	`38`	`namespace Notesnook.API.Controllers`
`38`	`39`	`{`
`@@ -43,12 +44,11 @@ public class UsersController(IUserService UserService, WampServiceAccessor servi`
`43`	`44`	`{`
`44`	`45`	`[HttpPost]`
`45`	`46`	`[AllowAnonymous]`
`46`		`- public async Task<IActionResult> Signup()`
	`47`	`+ public async Task<IActionResult> Signup([FromForm] SignupForm form)`
`47`	`48`	`{`
`48`	`49`	`try`
`49`	`50`	`{`
`50`		`- await UserService.CreateUserAsync();`
`51`		`- return Ok();`
	`51`	`+ return Ok(await UserService.CreateUserAsync(form));`
`52`	`52`	`}`
`53`	`53`	`catch (Exception ex)`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,13 @@ You should have received a copy of the Affero GNU General Public License`
`20`	`20`	`using System.Threading.Tasks;`
`21`	`21`	`using Notesnook.API.Models;`
`22`	`22`	`using Notesnook.API.Models.Responses;`
	`23`	`+using Streetwriters.Common.Models;`
`23`	`24`
`24`	`25`	`namespace Notesnook.API.Interfaces`
`25`	`26`	`{`
`26`	`27`	`public interface IUserService`
`27`	`28`	`{`
`28`		`- Task CreateUserAsync();`
	`29`	`+ Task<SignupResponse> CreateUserAsync(SignupForm form);`
`29`	`30`	`Task DeleteUserAsync(string userId);`
`30`	`31`	`Task DeleteUserAsync(string userId, string? jti, string password);`
`31`	`32`	`Task<bool> ResetUserAsync(string userId, bool removeAttachments);`
Original file line number	Diff line number	Diff line change
`@@ -51,15 +51,16 @@ public class UserService(IHttpContextAccessor accessor,`
`51`	`51`	`private IS3Service S3Service { get; set; } = s3Service;`
`52`	`52`	`private readonly IUnitOfWork unit = unitOfWork;`
`53`	`53`
`54`		`- public async Task CreateUserAsync()`
	`54`	`+ public async Task<SignupResponse> CreateUserAsync(SignupForm form)`
`55`	`55`	`{`
`56`		`- SignupResponse response = await httpClient.ForwardAsync<SignupResponse>(this.HttpContextAccessor, $"{Servers.IdentityServer}/signup", HttpMethod.Post);`
`57`		`- if (!response.Success \|\| (response.Errors != null && response.Errors.Length > 0) \|\| response.UserId == null)`
	`56`	`+ SignupResponse response = await serviceAccessor.UserAccountService.CreateUserAsync(form.ClientId, form.Email, form.Password, HttpContextAccessor.HttpContext?.Request.Headers["User-Agent"].ToString());`
	`57`	`+`
	`58`	`+ if ((response.Errors != null && response.Errors.Length > 0) \|\| response.UserId == null)`
`58`	`59`	`{`
`59`	`60`	`logger.LogError("Failed to sign up user: {Response}", JsonSerializer.Serialize(response));`
`60`	`61`	`if (response.Errors != null && response.Errors.Length > 0)`
`61`	`62`	`throw new Exception(string.Join(" ", response.Errors));`
`62`		`- else throw new Exception("Could not create a new account. Error code: " + response.StatusCode);`
	`63`	`+ else throw new Exception("Could not create a new account.");`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`await Repositories.UsersSettings.InsertAsync(new UserSettings`
`@@ -84,7 +85,7 @@ await Repositories.UsersSettings.InsertAsync(new UserSettings`
`84`	`85`	`});`
`85`	`86`	`}`
`86`	`87`
`87`		`- logger.LogInformation("New user created: {Response}", JsonSerializer.Serialize(response));`
	`88`	`+ return response;`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`public async Task<UserResponse> GetUserAsync(string userId)`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,7 @@ public interface IUserAccountService`
`16`	`16`	`Task<bool> ResetPasswordAsync(string userId, string newPassword);`
`17`	`17`	`[WampProcedure("co.streetwriters.identity.users.clear_sessions")]`
`18`	`18`	`Task<bool> ClearSessionsAsync(string userId, string clientId, bool all, string jti, string? refreshToken);`
	`19`	`+ [WampProcedure("co.streetwriters.identity.users.create_user")]`
	`20`	`+ Task<SignupResponse> CreateUserAsync(string clientId, string email, string password, string? userAgent = null);`
`19`	`21`	`}`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ You should have received a copy of the Affero GNU General Public License`
`21`	`21`	`using System.Runtime.Serialization;`
`22`	`22`	`using Microsoft.AspNetCore.Mvc;`
`23`	`23`
`24`		`-namespace Streetwriters.Identity.Models`
	`24`	`+namespace Streetwriters.Common.Models`
`25`	`25`	`{`
`26`	`26`	`public class SignupForm`
`27`	`27`	`{`