Skip to content

[PM-12469] Move remaining Admin Password Reset code to AC team #7680

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

Open
eliykat wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[PM-12469] Move remaining Admin Password Reset code to AC team #7680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using Bit.Api.AdminConsole.Authorization.Requirements;
using Bit.Api.AdminConsole.Models.Request.Organizations;
using Bit.Api.AdminConsole.Models.Response.Organizations;
using Bit.Api.Models.Request.Organizations;
using Bit.Api.Models.Response;
using Bit.Core;
using Bit.Core.AdminConsole.Models.Data;
Expand Down
2 changes: 1 addition & 1 deletion ...anizationUserResetPasswordRequestModel.cs → ...anizationUserResetPasswordRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Bit.Core.AdminConsole.OrganizationFeatures.AccountRecovery.v2;
using Bit.Core.Entities;

namespace Bit.Api.Models.Request.Organizations;
namespace Bit.Api.AdminConsole.Models.Request.Organizations;

public class OrganizationUserResetPasswordRequestModel
{
Expand Down
2 changes: 1 addition & 1 deletion src/Api/Auth/Models/Request/Accounts/UpdateTempPasswordRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#nullable disable

using System.ComponentModel.DataAnnotations;
using Bit.Api.Models.Request.Organizations;
using Bit.Api.AdminConsole.Models.Request.Organizations;

namespace Bit.Api.Auth.Models.Request.Accounts;

Expand Down
4 changes: 3 additions & 1 deletion ...odels/Mail/AdminResetPasswordViewModel.cs → ...odels/Mail/AdminResetPasswordViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace Bit.Core.Models.Mail;
using Bit.Core.Models.Mail;

namespace Bit.Core.AdminConsole.Models.Mail;

public class AdminResetPasswordViewModel : BaseMailModel
{
Expand Down
0 ...tRecoveryDetailsByOrganizationUserIds.sql → ...tRecoveryDetailsByOrganizationUserIds.sql
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...egrationTest/AdminConsole/Controllers/OrganizationUsersControllerPutResetPasswordTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Net;
using Bit.Api.AdminConsole.Authorization;
using Bit.Api.AdminConsole.Models.Request.Organizations;
using Bit.Api.IntegrationTest.Factories;
using Bit.Api.IntegrationTest.Helpers;
using Bit.Api.Models.Request.Organizations;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Core.AdminConsole.Enums;
Expand Down
1 change: 0 additions & 1 deletion test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Bit.Api.AdminConsole.Authorization.Collections;
using Bit.Api.AdminConsole.Controllers;
using Bit.Api.AdminConsole.Models.Request.Organizations;
using Bit.Api.Models.Request.Organizations;
using Bit.Core;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
Expand Down
Loading