mirror of
https://github.com/bitwarden/server.git
synced 2024-11-25 12:45:18 +01:00
8471326b1e
* PM-7322 - AccountsController.cs - create empty method + empty req model to be able to create draft PR. * PM-7322 - Start on RegisterFinishRequestModel.cs * PM-7322 - WIP on Complete Registration endpoint * PM-7322 - UserService.cs - RegisterUserAsync - Tweak of token to be orgInviteToken as we are adding a new email verification token to the mix. * PM-7322 - UserService - Rename MP to MPHash * PM-7322 - More WIP progress on getting new finish registration process in place. * PM-7322 Create IRegisterUserCommand * PM-7322 - RegisterUserCommand.cs - first WIP draft * PM-7322 - Implement use of new command in Identity. * PM-7322 - Rename RegisterUserViaOrgInvite to just be RegisterUser as orgInvite is optional. * PM07322 - Test RegisterUserCommand.RegisterUser(...) happy paths and one bad request path. * PM-7322 - More WIP on RegisterUserCommand.cs and tests * PM-7322 - RegisterUserCommand.cs - refactor ValidateOrgInviteToken logic to always validate the token if we have one. * PM-7322 - RegisterUserCommand.cs - Refactor OrgInviteToken validation to be more clear + validate org invite token even in open registration scenarios + added tests. * PM-7322 - Add more test coverage to RegisterUserWithOptionalOrgInvite * PM-7322 - IRegisterUserCommand - DOCS * PM-7322 - Test RegisterUser * PM-7322 - IRegisterUserCommand - Add more docs. * PM-7322 - Finish updating all existing user service register calls to use the new command. * PM-7322 - RegistrationEmailVerificationTokenable.cs changes + tests * PM-7322 - RegistrationEmailVerificationTokenable.cs changed to only verify email as it's the only thing we need to verify + updated tests. * PM-7322 - Get RegisterUserViaEmailVerificationToken built and tested * PM-7322 - AccountsController.cs - get bones of PostRegisterFinish in place * PM-7322 - SendVerificationEmailForRegistrationCommand - Feature flag timing attack delays per architecture discussion with a default of keeping them around. * PM-7322 - RegisterFinishRequestModel.cs - EmailVerificationToken must be optional for org invite scenarios. * PM-7322 - HandlebarsMailService.cs - SendRegistrationVerificationEmailAsync - must URL encode email to avoid invalid email upon submission to server on complete registration step * PM-7322 - RegisterUserCommandTests.cs - add API key assertions * PM-7322 - Clean up RegisterUserCommand.cs * PM-7322 - Refactor AccountsController.cs existing org invite method and new process to consider new feature flag for delays. * PM-7322 - Add feature flag svc to AccountsControllerTests.cs + add TODO * PM-7322 - AccountsController.cs - Refactor shared IdentityResult logic into private helper. * PM-7322 - Work on getting PostRegisterFinish tests in place. * PM-7322 - AccountsControllerTests.cs - test new method. * PM-7322 - RegisterFinishRequestModel.cs - Update to use required keyword instead of required annotations as it is easier to catch mistakes. * PM-7322 - Fix misspelling * PM-7322 - Integration tests for RegistrationWithEmailVerification * PM-7322 - Fix leaky integration tests. * PM-7322 - Another leaky test fix. * PM-7322 - AccountsControllerTests.cs - fix RegistrationWithEmailVerification_WithOrgInviteToken_Succeeds * PM-7322 - AccountsControllerTests.cs - Finish out integration test suite!
95 lines
3.8 KiB
C#
95 lines
3.8 KiB
C#
using System.Net.Http.Json;
|
|
using System.Text.Json;
|
|
using Bit.Core.Auth.Models.Api.Request.Accounts;
|
|
using Bit.Core.Enums;
|
|
using Bit.Core.Utilities;
|
|
using Bit.Identity;
|
|
using Bit.Identity.Models.Request.Accounts;
|
|
using Bit.Test.Common.Helpers;
|
|
using Microsoft.AspNetCore.Http;
|
|
|
|
namespace Bit.IntegrationTestCommon.Factories;
|
|
|
|
public class IdentityApplicationFactory : WebApplicationFactoryBase<Startup>
|
|
{
|
|
public const string DefaultDeviceIdentifier = "92b9d953-b9b6-4eaf-9d3e-11d57144dfeb";
|
|
|
|
public async Task<HttpContext> RegisterAsync(RegisterRequestModel model)
|
|
{
|
|
return await Server.PostAsync("/accounts/register", JsonContent.Create(model));
|
|
}
|
|
|
|
public async Task<HttpContext> PostRegisterSendEmailVerificationAsync(RegisterSendVerificationEmailRequestModel model)
|
|
{
|
|
return await Server.PostAsync("/accounts/register/send-verification-email", JsonContent.Create(model));
|
|
}
|
|
|
|
public async Task<HttpContext> PostRegisterFinishAsync(RegisterFinishRequestModel model)
|
|
{
|
|
return await Server.PostAsync("/accounts/register/finish", JsonContent.Create(model));
|
|
}
|
|
|
|
public async Task<(string Token, string RefreshToken)> TokenFromPasswordAsync(string username,
|
|
string password,
|
|
string deviceIdentifier = DefaultDeviceIdentifier,
|
|
string clientId = "web",
|
|
DeviceType deviceType = DeviceType.FirefoxBrowser,
|
|
string deviceName = "firefox")
|
|
{
|
|
var context = await Server.PostAsync("/connect/token", new FormUrlEncodedContent(new Dictionary<string, string>
|
|
{
|
|
{ "scope", "api offline_access" },
|
|
{ "client_id", clientId },
|
|
{ "deviceType", ((int)deviceType).ToString() },
|
|
{ "deviceIdentifier", deviceIdentifier },
|
|
{ "deviceName", deviceName },
|
|
{ "grant_type", "password" },
|
|
{ "username", username },
|
|
{ "password", password },
|
|
}), context => context.Request.Headers.Append("Auth-Email", CoreHelpers.Base64UrlEncodeString(username)));
|
|
|
|
using var body = await AssertHelper.AssertResponseTypeIs<JsonDocument>(context);
|
|
var root = body.RootElement;
|
|
|
|
return (root.GetProperty("access_token").GetString(), root.GetProperty("refresh_token").GetString());
|
|
}
|
|
|
|
public async Task<string> TokenFromAccessTokenAsync(Guid clientId, string clientSecret,
|
|
DeviceType deviceType = DeviceType.SDK)
|
|
{
|
|
var context = await Server.PostAsync("/connect/token",
|
|
new FormUrlEncodedContent(new Dictionary<string, string>
|
|
{
|
|
{ "scope", "api.secrets" },
|
|
{ "client_id", clientId.ToString() },
|
|
{ "client_secret", clientSecret },
|
|
{ "grant_type", "client_credentials" },
|
|
{ "deviceType", ((int)deviceType).ToString() }
|
|
}));
|
|
|
|
using var body = await AssertHelper.AssertResponseTypeIs<JsonDocument>(context);
|
|
var root = body.RootElement;
|
|
|
|
return root.GetProperty("access_token").GetString();
|
|
}
|
|
|
|
public async Task<string> TokenFromOrganizationApiKeyAsync(string clientId, string clientSecret,
|
|
DeviceType deviceType = DeviceType.FirefoxBrowser)
|
|
{
|
|
var context = await Server.PostAsync("/connect/token",
|
|
new FormUrlEncodedContent(new Dictionary<string, string>
|
|
{
|
|
{ "scope", "api.organization" },
|
|
{ "client_id", clientId },
|
|
{ "client_secret", clientSecret },
|
|
{ "grant_type", "client_credentials" },
|
|
{ "deviceType", ((int)deviceType).ToString() }
|
|
}));
|
|
|
|
using var body = await AssertHelper.AssertResponseTypeIs<JsonDocument>(context);
|
|
var root = body.RootElement;
|
|
|
|
return root.GetProperty("access_token").GetString();
|
|
}
|
|
}
|