Skip to content

Commit

Permalink
feat(templates): rename general variable names in HttpClientProxy sou…
Browse files Browse the repository at this point in the history 
…rce generator #7508 (#7583)
  • Loading branch information
@ysmoradi
ysmoradi committed May 23, 2024
1 parent 0baaa6b commit 3b82d13
Show file tree
Hide file tree
Showing 12 changed files with 94 additions and 102 deletions.
14 changes: 7 additions & 7 deletions src/SourceGenerators/Bit.SourceGenerators/HttpClientProxy/HttpClientProxySourceGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,18 @@ public void Execute(GeneratorExecutionContext context)
generatedMethods.AppendLine($@"
public async {action.ReturnType.ToDisplayString()} {action.Method.Name}({parameters})
{{
{$@"var url = $""{action.Url}"";"}
{$@"var __url = $""{action.Url}"";"}
var dynamicQS = GetDynamicQueryString();
if (dynamicQS is not null)
{{
url += {(action.Url.Contains('?') ? "'&'" : "'?'")} + dynamicQS;
__url += {(action.Url.Contains('?') ? "'&'" : "'?'")} + dynamicQS;
}}
{(action.DoesReturnSomething ? $@"return (await prerenderStateService.GetValue(url, async () =>
{(action.DoesReturnSomething ? $@"return (await prerenderStateService.GetValue(__url, async () =>
{{" : string.Empty)}
using var request = new HttpRequestMessage(HttpMethod.{action.HttpMethod}, url);
{(action.BodyParameter is not null ? $@"request.Content = JsonContent.Create({action.BodyParameter.Name}, options.GetTypeInfo<{action.BodyParameter.Type.ToDisplayString()}>());" : string.Empty)}
{(action.DoesReturnIAsyncEnumerable ? "" : "using ")}var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead {(action.HasCancellationToken ? $", {action.CancellationTokenParameterName}" : string.Empty)});
{(action.DoesReturnSomething ? ($"return {(action.DoesReturnIAsyncEnumerable ? "" : "await")} response.Content.{(action.DoesReturnIAsyncEnumerable ? "ReadFromJsonAsAsyncEnumerable" : action.DoesReturnString ? "ReadAsStringAsync" : "ReadFromJsonAsync")}({jsonReadParameters});" +
using var __request = new HttpRequestMessage(HttpMethod.{action.HttpMethod}, __url);
{(action.BodyParameter is not null ? $@"__request.Content = JsonContent.Create({action.BodyParameter.Name}, options.GetTypeInfo<{action.BodyParameter.Type.ToDisplayString()}>());" : string.Empty)}
{(action.DoesReturnIAsyncEnumerable ? "" : "using ")}var __response = await httpClient.SendAsync(__request, HttpCompletionOption.ResponseHeadersRead {(action.HasCancellationToken ? $", {action.CancellationTokenParameterName}" : string.Empty)});
{(action.DoesReturnSomething ? ($"return {(action.DoesReturnIAsyncEnumerable ? "" : "await")} __response.Content.{(action.DoesReturnIAsyncEnumerable ? "ReadFromJsonAsAsyncEnumerable" : action.DoesReturnString ? "ReadAsStringAsync" : "ReadFromJsonAsync")}({jsonReadParameters});" +
$"}}))!;") : string.Empty)}
}}
");
Expand Down
4 changes: 1 addition & 3 deletions ...plate/Bit.Boilerplate/src/Boilerplate.Server/Controllers/Categories/CategoryController.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
using Boilerplate.Client.Core.Controllers.Categories;
using Boilerplate.Server.Models.Categories;
using Boilerplate.Shared.Dtos.Categories;

namespace Boilerplate.Server.Controllers;

[Route("api/[controller]/[action]")]
[ApiController]
[ApiController, Route("api/[controller]/[action]")]
public partial class CategoryController : AppControllerBase, ICategoryController
{
[HttpGet, EnableQuery]
Expand Down
3 changes: 1 addition & 2 deletions ...plate/Bit.Boilerplate/src/Boilerplate.Server/Controllers/Dashboard/DashboardController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@

namespace Boilerplate.Server.Controllers;

[Route("api/[controller]/[action]")]
[ApiController]
[ApiController, Route("api/[controller]/[action]")]
public partial class DashboardController : AppControllerBase, IDashboardController
{
[HttpGet]
Expand Down
70 changes: 35 additions & 35 deletions ...erplate/Bit.Boilerplate/src/Boilerplate.Server/Controllers/Identity/IdentityController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,33 @@ public partial class IdentityController : AppControllerBase, IIdentityController
/// These comments will also be used in swagger docs and ui.
/// </summary>
[HttpPost]
public async Task SignUp(SignUpRequestDto signUpRequest, CancellationToken cancellationToken)
public async Task SignUp(SignUpRequestDto request, CancellationToken cancellationToken)
{
//#if (captcha == "reCaptcha")
if (await googleRecaptchaHttpClient.Verify(signUpRequest.GoogleRecaptchaResponse, cancellationToken) is false)
if (await googleRecaptchaHttpClient.Verify(request.GoogleRecaptchaResponse, cancellationToken) is false)
throw new BadRequestException(Localizer[nameof(AppStrings.InvalidGoogleRecaptchaResponse)]);
//#endif

// Attempt to locate an existing user using either their email address or phone number. The enforcement of a unique username policy is integral to the aspnetcore identity framework.
var existingUser = await userManager.FindUser(new() { Email = signUpRequest.Email, PhoneNumber = signUpRequest.PhoneNumber });
var existingUser = await userManager.FindUser(new() { Email = request.Email, PhoneNumber = request.PhoneNumber });
if (existingUser is not null)
throw new BadRequestException(Localizer[nameof(AppStrings.DuplicateEmailOrPhoneNumber)]);

var userToAdd = new User { LockoutEnabled = true };

await userStore.SetUserNameAsync(userToAdd, signUpRequest.UserName!, cancellationToken);
await userStore.SetUserNameAsync(userToAdd, request.UserName!, cancellationToken);

if (string.IsNullOrEmpty(signUpRequest.Email) is false)
if (string.IsNullOrEmpty(request.Email) is false)
{
await ((IUserEmailStore<User>)userStore).SetEmailAsync(userToAdd, signUpRequest.Email!, cancellationToken);
await ((IUserEmailStore<User>)userStore).SetEmailAsync(userToAdd, request.Email!, cancellationToken);
}

if (string.IsNullOrEmpty(signUpRequest.PhoneNumber) is false)
if (string.IsNullOrEmpty(request.PhoneNumber) is false)
{
await ((IUserPhoneNumberStore<User>)userStore).SetPhoneNumberAsync(userToAdd, signUpRequest.PhoneNumber!, cancellationToken);
await ((IUserPhoneNumberStore<User>)userStore).SetPhoneNumberAsync(userToAdd, request.PhoneNumber!, cancellationToken);
}

var result = await userManager.CreateAsync(userToAdd, signUpRequest.Password!);
var result = await userManager.CreateAsync(userToAdd, request.Password!);

if (result.Succeeded is false)
{
Expand Down Expand Up @@ -89,17 +89,17 @@ public async Task SendConfirmEmailToken(SendEmailTokenRequestDto request, Cancel
}

[HttpPost]
public async Task ConfirmEmail(ConfirmEmailRequestDto body, CancellationToken cancellationToken)
public async Task ConfirmEmail(ConfirmEmailRequestDto request, CancellationToken cancellationToken)
{
var user = await userManager.FindByEmailAsync(body.Email!)
var user = await userManager.FindByEmailAsync(request.Email!)
?? throw new BadRequestException(Localizer[nameof(AppStrings.UserNotFound)]);

if (user.EmailConfirmed) return;

if (await userManager.IsLockedOutAsync(user))
throw new BadRequestException(Localizer[nameof(AppStrings.UserLockedOut), (DateTimeOffset.UtcNow - user.LockoutEnd!).Value.ToString("mm\\:ss")]);

var tokenIsValid = await userManager.VerifyUserTokenAsync(user, TokenOptions.DefaultPhoneProvider, $"VerifyEmail:{body.Email},Date:{user.EmailTokenRequestedOn}", body.Token!);
var tokenIsValid = await userManager.VerifyUserTokenAsync(user, TokenOptions.DefaultPhoneProvider, $"VerifyEmail:{request.Email},Date:{user.EmailTokenRequestedOn}", request.Token!);

if (tokenIsValid is false)
{
Expand Down Expand Up @@ -127,17 +127,17 @@ public async Task SendConfirmPhoneToken(SendPhoneTokenRequestDto request, Cancel
}

[HttpPost]
public async Task ConfirmPhone(ConfirmPhoneRequestDto body, CancellationToken cancellationToken)
public async Task ConfirmPhone(ConfirmPhoneRequestDto request, CancellationToken cancellationToken)
{
var user = await userManager.FindByPhoneNumber(body.PhoneNumber!)
var user = await userManager.FindByPhoneNumber(request.PhoneNumber!)
?? throw new BadRequestException(Localizer[nameof(AppStrings.UserNotFound)]);

if (await userManager.IsLockedOutAsync(user))
throw new BadRequestException(Localizer[nameof(AppStrings.UserLockedOut), (DateTimeOffset.UtcNow - user.LockoutEnd!).Value.ToString("mm\\:ss")]);

if (user.PhoneNumberConfirmed) return;

var tokenIsValid = await userManager.VerifyUserTokenAsync(user, TokenOptions.DefaultPhoneProvider, $"VerifyPhoneNumber:{body.PhoneNumber},Date:{user.PhoneNumberTokenRequestedOn}", body.Token!);
var tokenIsValid = await userManager.VerifyUserTokenAsync(user, TokenOptions.DefaultPhoneProvider, $"VerifyPhoneNumber:{request.PhoneNumber},Date:{user.PhoneNumberTokenRequestedOn}", request.Token!);

if (tokenIsValid is false)
{
Expand All @@ -151,15 +151,15 @@ public async Task ConfirmPhone(ConfirmPhoneRequestDto body, CancellationToken ca
}

[HttpPost]
public async Task<ActionResult<SignInResponseDto>> SignIn(SignInRequestDto signInRequest, CancellationToken cancellationToken)
public async Task<ActionResult<SignInResponseDto>> SignIn(SignInRequestDto request, CancellationToken cancellationToken)
{
signInManager.AuthenticationScheme = IdentityConstants.BearerScheme;

var user = await userManager.FindUser(signInRequest) ?? throw new UnauthorizedException(Localizer[nameof(AppStrings.InvalidUserCredentials)]);
var user = await userManager.FindUser(request) ?? throw new UnauthorizedException(Localizer[nameof(AppStrings.InvalidUserCredentials)]);

var result = string.IsNullOrEmpty(signInRequest.Password)
? await signInManager.OtpSignInAsync(user, signInRequest.Otp!)
: await signInManager.PasswordSignInAsync(user!.UserName!, signInRequest.Password!, isPersistent: false, lockoutOnFailure: true);
var result = string.IsNullOrEmpty(request.Password)
? await signInManager.OtpSignInAsync(user, request.Otp!)
: await signInManager.PasswordSignInAsync(user!.UserName!, request.Password!, isPersistent: false, lockoutOnFailure: true);

if (result.IsLockedOut)
{
Expand All @@ -168,17 +168,17 @@ public async Task<ActionResult<SignInResponseDto>> SignIn(SignInRequestDto signI

if (result.RequiresTwoFactor)
{
if (string.IsNullOrEmpty(signInRequest.TwoFactorCode) is false)
if (string.IsNullOrEmpty(request.TwoFactorCode) is false)
{
result = await signInManager.TwoFactorAuthenticatorSignInAsync(signInRequest.TwoFactorCode, false, false);
result = await signInManager.TwoFactorAuthenticatorSignInAsync(request.TwoFactorCode, false, false);
}
else if (string.IsNullOrEmpty(signInRequest.TwoFactorRecoveryCode) is false)
else if (string.IsNullOrEmpty(request.TwoFactorRecoveryCode) is false)
{
result = await signInManager.TwoFactorRecoveryCodeSignInAsync(signInRequest.TwoFactorRecoveryCode);
result = await signInManager.TwoFactorRecoveryCodeSignInAsync(request.TwoFactorRecoveryCode);
}
else if (string.IsNullOrEmpty(signInRequest.TwoFactorToken) is false)
else if (string.IsNullOrEmpty(request.TwoFactorToken) is false)
{
result = await signInManager.TwoFactorSignInAsync(TokenOptions.DefaultPhoneProvider, signInRequest.TwoFactorToken, false, false);
result = await signInManager.TwoFactorSignInAsync(TokenOptions.DefaultPhoneProvider, request.TwoFactorToken, false, false);
}
else
{
Expand All @@ -189,7 +189,7 @@ public async Task<ActionResult<SignInResponseDto>> SignIn(SignInRequestDto signI
if (result.Succeeded is false)
throw new UnauthorizedException(Localizer[nameof(AppStrings.InvalidUserCredentials)]);

if (string.IsNullOrEmpty(signInRequest.Otp) is false)
if (string.IsNullOrEmpty(request.Otp) is false)
{
await userManager.UpdateSecurityStampAsync(user); // invalidates the OTP.
}
Expand All @@ -198,10 +198,10 @@ public async Task<ActionResult<SignInResponseDto>> SignIn(SignInRequestDto signI
}

[HttpPost]
public async Task<ActionResult<TokenResponseDto>> Refresh(RefreshRequestDto refreshRequest)
public async Task<ActionResult<TokenResponseDto>> Refresh(RefreshRequestDto request)
{
var refreshTokenProtector = bearerTokenOptions.Get(IdentityConstants.BearerScheme).RefreshTokenProtector;
var refreshTicket = refreshTokenProtector.Unprotect(refreshRequest.RefreshToken);
var refreshTicket = refreshTokenProtector.Unprotect(request.RefreshToken);

if (refreshTicket?.Properties?.ExpiresUtc is not { } expiresUtc || DateTimeOffset.UtcNow >= expiresUtc ||
await signInManager.ValidateSecurityStampAsync(refreshTicket.Principal) is not User user)
Expand Down Expand Up @@ -300,31 +300,31 @@ async Task SendSms()
}

[HttpPost]
public async Task ResetPassword(ResetPasswordRequestDto resetPasswordRequest, CancellationToken cancellationToken)
public async Task ResetPassword(ResetPasswordRequestDto request, CancellationToken cancellationToken)
{
var user = await userManager.FindUser(resetPasswordRequest) ?? throw new ResourceNotFoundException(Localizer[nameof(AppStrings.UserNotFound)]);
var user = await userManager.FindUser(request) ?? throw new ResourceNotFoundException(Localizer[nameof(AppStrings.UserNotFound)]);

if (await userManager.IsLockedOutAsync(user))
throw new BadRequestException(Localizer[nameof(AppStrings.UserLockedOut), (DateTimeOffset.UtcNow - user.LockoutEnd!).Value.ToString("mm\\:ss")]);

bool tokenIsValid = await userManager.VerifyUserTokenAsync(user!, TokenOptions.DefaultPhoneProvider, $"ResetPassword,Date:{user.ResetPasswordTokenRequestedOn}", resetPasswordRequest.Token!);
bool tokenIsValid = await userManager.VerifyUserTokenAsync(user!, TokenOptions.DefaultPhoneProvider, $"ResetPassword,Date:{user.ResetPasswordTokenRequestedOn}", request.Token!);

if (tokenIsValid is false)
{
await userManager.AccessFailedAsync(user);
throw new BadRequestException();
}

var result = await userManager.ResetPasswordAsync(user!, await userManager.GeneratePasswordResetTokenAsync(user!), resetPasswordRequest.Password!);
var result = await userManager.ResetPasswordAsync(user!, await userManager.GeneratePasswordResetTokenAsync(user!), request.Password!);

if (result.Succeeded is false)
throw new ResourceValidationException(result.Errors.Select(e => new LocalizedString(e.Code, e.Description)).ToArray());
}

[HttpPost]
public async Task SendTwoFactorToken(IdentityRequestDto body, CancellationToken cancellationToken)
public async Task SendTwoFactorToken(IdentityRequestDto request, CancellationToken cancellationToken)
{
var user = await userManager.FindUser(body) ?? throw new ResourceNotFoundException(Localizer[nameof(AppStrings.UserNotFound)]);
var user = await userManager.FindUser(request) ?? throw new ResourceNotFoundException(Localizer[nameof(AppStrings.UserNotFound)]);

var resendDelay = (DateTimeOffset.Now - user.TwoFactorTokenRequestedOn) - AppSettings.IdentitySettings.TwoFactorTokenRequestResendDelay;

Expand Down
Loading

0 comments on commit 3b82d13

Please sign in to comment.