Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply WebOTP pattern to short messages in Boilerplate (#9612) #9613

Merged
merged 10 commits into from
Jan 4, 2025
Merged

Apply WebOTP pattern to short messages in Boilerplate (#9612) #9613

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b61957d
Apply Web OTP pattern to Boilerplate short sent messages (#9612)
ysmoradi Jan 3, 2025
9e8b0ac
merge
ysmoradi Jan 3, 2025
202caff
Revert "Apply Web OTP pattern to Boilerplate short sent messages (#96…
ysmoradi Jan 4, 2025
950e1cf
fix
ysmoradi Jan 4, 2025
3e4487b
merge
ysmoradi Jan 4, 2025
7578e90
fix
ysmoradi Jan 4, 2025
c658db9
fix
ysmoradi Jan 4, 2025
4f8a9e4
fix
ysmoradi Jan 4, 2025
19683c0
add BitOtpInput to change email and phone sections
msynk Jan 4, 2025
686d938
Merge branch '9612-boilerplate-project-template-sms-messages-are-not-…
msynk Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...erver/Boilerplate.Server.Api/Controllers/Identity/IdentityController.PhoneConfirmation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ private async Task SendConfirmPhoneToken(User user, CancellationToken cancellati
var phoneNumber = user.PhoneNumber!;
var token = await userManager.GenerateUserTokenAsync(user, TokenOptions.DefaultPhoneProvider, FormattableString.Invariant($"VerifyPhoneNumber:{phoneNumber},{user.PhoneNumberTokenRequestedOn?.ToUniversalTime()}"));

await phoneService.SendSms(Localizer[nameof(AppStrings.ConfirmPhoneTokenSmsText), token], phoneNumber, cancellationToken);
var message = Localizer[nameof(AppStrings.ConfirmPhoneTokenSmsText), token];
var smsMessage = $"{message}{Environment.NewLine}@{HttpContext.Request.GetWebAppUrl().Host} #{token}" /* Web OTP */;
await phoneService.SendSms(smsMessage, phoneNumber, cancellationToken);
}
}
3 changes: 2 additions & 1 deletion ...rc/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.ResetPassword.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ public async Task SendResetPasswordToken(SendResetPasswordTokenRequestDto reques

if (await userManager.IsPhoneNumberConfirmedAsync(user))
{
sendMessagesTasks.Add(phoneService.SendSms(message, user.PhoneNumber!, cancellationToken));
var smsMessage = $"{message}{Environment.NewLine}@{HttpContext.Request.GetWebAppUrl().Host} #{token}" /* Web OTP */;
sendMessagesTasks.Add(phoneService.SendSms(smsMessage, user.PhoneNumber!, cancellationToken));
}

//#if (signalR == true)
Expand Down
7 changes: 5 additions & 2 deletions ....Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,9 @@ public async Task SendOtp(IdentityRequestDto request, string? returnUrl = null,

if (await userManager.IsPhoneNumberConfirmedAsync(user))
{
var smsMessage = Localizer[nameof(AppStrings.OtpShortText), await userManager.GenerateUserTokenAsync(user, TokenOptions.DefaultPhoneProvider, FormattableString.Invariant($"Otp_Sms,{user.OtpRequestedOn?.ToUniversalTime()}"))].ToString();
var token = await userManager.GenerateUserTokenAsync(user, TokenOptions.DefaultPhoneProvider, FormattableString.Invariant($"Otp_Sms,{user.OtpRequestedOn?.ToUniversalTime()}"));
var message = Localizer[nameof(AppStrings.OtpShortText), token].ToString();
var smsMessage = $"{message}{Environment.NewLine}@{HttpContext.Request.GetWebAppUrl().Host} #{token}" /* Web OTP */;
sendMessagesTasks.Add(phoneService.SendSms(smsMessage, user.PhoneNumber!, cancellationToken));
}

Expand Down Expand Up @@ -368,7 +370,8 @@ public async Task SendTwoFactorToken(SignInRequestDto request, CancellationToken

if (firstStepAuthenticationMethod != "Sms" && await userManager.IsPhoneNumberConfirmedAsync(user))
{
sendMessagesTasks.Add(phoneService.SendSms(message, user.PhoneNumber!, cancellationToken));
var smsMessage = $"{message}{Environment.NewLine}@{HttpContext.Request.GetWebAppUrl().Host} #{token}" /* Web OTP */;
sendMessagesTasks.Add(phoneService.SendSms(smsMessage, user.PhoneNumber!, cancellationToken));
}

if (firstStepAuthenticationMethod != "Push")
Expand Down
14 changes: 9 additions & 5 deletions .../Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/UserController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,10 @@ public async Task SendChangePhoneNumberToken(SendPhoneTokenRequestDto request, C

var token = await userManager.GenerateChangePhoneNumberTokenAsync(user!, request.PhoneNumber!);

await phoneService.SendSms(Localizer[nameof(AppStrings.ChangePhoneNumberTokenSmsText), token], request.PhoneNumber!, cancellationToken);
var message = Localizer[nameof(AppStrings.ChangePhoneNumberTokenSmsText), token];
var smsMessage = $"{message}{Environment.NewLine}@{HttpContext.Request.GetWebAppUrl().Host} #{token}" /* Web OTP */;

await phoneService.SendSms(smsMessage, request.PhoneNumber!, cancellationToken);
}

[HttpPost]
Expand Down Expand Up @@ -388,7 +391,7 @@ public async Task SendElevatedAccessToken(CancellationToken cancellationToken)

List<Task> sendMessagesTasks = [];

var messageText = Localizer[nameof(AppStrings.ElevatedAccessToken), token].ToString();
var message = Localizer[nameof(AppStrings.ElevatedAccessToken), token].ToString();

if (await userManager.IsEmailConfirmedAsync(user))
{
Expand All @@ -397,7 +400,8 @@ public async Task SendElevatedAccessToken(CancellationToken cancellationToken)

if (await userManager.IsPhoneNumberConfirmedAsync(user))
{
sendMessagesTasks.Add(phoneService.SendSms(messageText, user.PhoneNumber!, cancellationToken));
var smsMessage = $"{message}{Environment.NewLine}@{HttpContext.Request.GetWebAppUrl().Host} #{token}" /* Web OTP */;
sendMessagesTasks.Add(phoneService.SendSms(smsMessage, user.PhoneNumber!, cancellationToken));
}

//#if (signalR == true)
Expand All @@ -406,11 +410,11 @@ public async Task SendElevatedAccessToken(CancellationToken cancellationToken)
.Where(us => us.UserId == user.Id && us.Id != currentUserSessionId && us.SignalRConnectionId != null)
.Select(us => us.SignalRConnectionId!)
.ToArrayAsync(cancellationToken);
sendMessagesTasks.Add(appHubContext.Clients.Clients(userSessionIdsExceptCurrentUserSessionId).SendAsync(SignalREvents.SHOW_MESSAGE, messageText, cancellationToken));
sendMessagesTasks.Add(appHubContext.Clients.Clients(userSessionIdsExceptCurrentUserSessionId).SendAsync(SignalREvents.SHOW_MESSAGE, message, cancellationToken));
//#endif

//#if (notification == true)
sendMessagesTasks.Add(pushNotificationService.RequestPush(message: messageText, userRelatedPush: true, customSubscriptionFilter: us => us.UserSession!.UserId == user.Id && us.UserSessionId != currentUserSessionId, cancellationToken: cancellationToken));
sendMessagesTasks.Add(pushNotificationService.RequestPush(message: message, userRelatedPush: true, customSubscriptionFilter: us => us.UserSession!.UserId == user.Id && us.UserSessionId != currentUserSessionId, cancellationToken: cancellationToken));
//#endif

await Task.WhenAll(sendMessagesTasks);
Expand Down
Loading