mirror of
https://github.com/bitwarden/browser
synced 2025-12-20 18:23:31 +00:00
* [AC-2302] Move organization-auth-request.service to bit-common folder * [AC-2302] Rename organization-auth-request.service to organization-auth-request-api.service * [AC-2302] Move logic from component to organization-auth-request.service * [AC-2302] Fix import path in OrganizationAuthRequestService * [AC-2302] Move imports to OrganizationsModule and delete unused CoreOrganizationModule * [AC-2302] Move the call to get userResetPasswordDetails into OrganizationAuthRequestService * [AC-2302] Remove @Injectable() and manually configure dependencies * [AC-2302] Add OrganizationAuthRequestService unit tests first draft * [AC-2302] Refactor device-approvals.component.ts to remove unused imports * [AC-2302] Set up jest on bit-common and add unit tests for OrganizationAuthRequestService * [AC-2302] Add bit-common to jest.config.js * [AC-2302] Update organizations.module.ts to include safeProviders declared in variable * [AC-2302] Remove services and views folders from bit-common * [AC-2302] Define path mapping * Adjust an import path The import path of `PendingAuthRequestView` in `OrganizationAuthRequestApiService` was pointing to the wrong place. I think this file was just recently moved, and the import didn't get updated. * Get paths working * Fix import * Update jest config to use ts-jest adn jsdom * Copy-paste path mappings from bit-web * Remove unnecessary test setup file * Undo unnecessary change * Fix remaining path mappings * Remove Bitwarden License mapping from OSS code * Fix bit-web so it uses its own tsconfig * Fix import path * Remove web-bit entrypoint from OSS tsconfig * Make DeviceApprovalsComponent standalone * Remove organization-auth-request-api.service export * Add BulkApproveAuthRequestsRequest class for bulk approval of authentication requests * Add api call for device bulk approvals * Add bulk device approval to OrganizationAuthRequestService * Add unit tests for bulk device approval method * Remove OrganizationsRoutingModule from DeviceApprovalsComponent imports * Remove CoreOrganizationModule from OrganizationsModule imports * Remove NoItemsModule from OrganizationsModule imports * Get keys for each item to approve * Update approvePendingRequests unit test * Use ApiService from JslibServicesModule * Update providers in device-approvals.component.ts * Add method to retrieve reset password details for multiple organization users * Add organizationUserId property to OrganizationUserResetPasswordDetailsResponse class * Use method to retrieve reset password details for multiple organization users * Rename ResetPasswordDetails to AccountRecoveryDetails * Update OrganizationAuthRequestService to use getManyOrganizationUserAccountRecoveryDetails * Update AdminAuthRequestUpdateWithIdRequest property names and imports * Refactor bulk approval functionality in organization auth requests * Rename update request AdminAuthRequestUpdateWithIdRequest to OrganizationAuthRequestUpdateRequest * Update organization-auth-request.service.spec.ts to use bulkUpdatePendingRequests method --------- Co-authored-by: Addison Beck <hello@addisonbeck.com> Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
184 lines
7.0 KiB
TypeScript
184 lines
7.0 KiB
TypeScript
import { MockProxy, mock } from "jest-mock-extended";
|
|
|
|
import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
|
|
import { OrganizationUserResetPasswordDetailsResponse } from "@bitwarden/common/admin-console/abstractions/organization-user/responses";
|
|
import { ListResponse } from "@bitwarden/common/models/response/list.response";
|
|
import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
|
|
import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
|
|
|
|
import { OrganizationAuthRequestApiService } from "./organization-auth-request-api.service";
|
|
import { OrganizationAuthRequestUpdateRequest } from "./organization-auth-request-update.request";
|
|
import { OrganizationAuthRequestService } from "./organization-auth-request.service";
|
|
import { PendingAuthRequestView } from "./pending-auth-request.view";
|
|
|
|
describe("OrganizationAuthRequestService", () => {
|
|
let organizationAuthRequestApiService: MockProxy<OrganizationAuthRequestApiService>;
|
|
let cryptoService: MockProxy<CryptoService>;
|
|
let organizationUserService: MockProxy<OrganizationUserService>;
|
|
let organizationAuthRequestService: OrganizationAuthRequestService;
|
|
|
|
beforeEach(() => {
|
|
organizationAuthRequestApiService = mock<OrganizationAuthRequestApiService>();
|
|
cryptoService = mock<CryptoService>();
|
|
organizationUserService = mock<OrganizationUserService>();
|
|
organizationAuthRequestService = new OrganizationAuthRequestService(
|
|
organizationAuthRequestApiService,
|
|
cryptoService,
|
|
organizationUserService,
|
|
);
|
|
});
|
|
|
|
afterEach(() => {
|
|
jest.resetAllMocks();
|
|
});
|
|
|
|
describe("listPendingRequests", () => {
|
|
it("should return a list of pending auth requests", async () => {
|
|
jest.spyOn(organizationAuthRequestApiService, "listPendingRequests");
|
|
|
|
const organizationId = "organizationId";
|
|
|
|
const pendingAuthRequest = new PendingAuthRequestView();
|
|
pendingAuthRequest.id = "requestId1";
|
|
pendingAuthRequest.userId = "userId1";
|
|
pendingAuthRequest.organizationUserId = "userId1";
|
|
pendingAuthRequest.email = "email1";
|
|
pendingAuthRequest.publicKey = "publicKey1";
|
|
pendingAuthRequest.requestDeviceIdentifier = "requestDeviceIdentifier1";
|
|
pendingAuthRequest.requestDeviceType = "requestDeviceType1";
|
|
pendingAuthRequest.requestIpAddress = "requestIpAddress1";
|
|
pendingAuthRequest.creationDate = new Date();
|
|
const mockPendingAuthRequests = [pendingAuthRequest];
|
|
organizationAuthRequestApiService.listPendingRequests
|
|
.calledWith(organizationId)
|
|
.mockResolvedValue(mockPendingAuthRequests);
|
|
|
|
const result = await organizationAuthRequestService.listPendingRequests(organizationId);
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result).toEqual(mockPendingAuthRequests);
|
|
expect(organizationAuthRequestApiService.listPendingRequests).toHaveBeenCalledWith(
|
|
organizationId,
|
|
);
|
|
});
|
|
|
|
it("should return an empty list", async () => {
|
|
jest.spyOn(organizationAuthRequestApiService, "listPendingRequests");
|
|
|
|
const invalidOrganizationId = "invalidOrganizationId";
|
|
const result =
|
|
await organizationAuthRequestService.listPendingRequests("invalidOrganizationId");
|
|
|
|
expect(result).toBeUndefined();
|
|
expect(organizationAuthRequestApiService.listPendingRequests).toHaveBeenCalledWith(
|
|
invalidOrganizationId,
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("denyPendingRequests", () => {
|
|
it("should deny the specified pending auth requests", async () => {
|
|
jest.spyOn(organizationAuthRequestApiService, "denyPendingRequests");
|
|
|
|
await organizationAuthRequestService.denyPendingRequests(
|
|
"organizationId",
|
|
"requestId1",
|
|
"requestId2",
|
|
);
|
|
|
|
expect(organizationAuthRequestApiService.denyPendingRequests).toHaveBeenCalledWith(
|
|
"organizationId",
|
|
"requestId1",
|
|
"requestId2",
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("approvePendingRequests", () => {
|
|
it("should approve the specified pending auth requests", async () => {
|
|
jest.spyOn(organizationAuthRequestApiService, "bulkUpdatePendingRequests");
|
|
|
|
const organizationId = "organizationId";
|
|
|
|
const organizationUserResetPasswordDetailsResponse = new ListResponse(
|
|
{
|
|
Data: [
|
|
{
|
|
organizationUserId: "organizationUserId1",
|
|
resetPasswordKey: "resetPasswordKey",
|
|
encryptedPrivateKey: "encryptedPrivateKey",
|
|
},
|
|
],
|
|
},
|
|
OrganizationUserResetPasswordDetailsResponse,
|
|
);
|
|
|
|
organizationUserService.getManyOrganizationUserAccountRecoveryDetails.mockResolvedValueOnce(
|
|
organizationUserResetPasswordDetailsResponse,
|
|
);
|
|
|
|
const encryptedUserKey = new EncString("encryptedUserKey");
|
|
cryptoService.rsaDecrypt.mockResolvedValue(new Uint8Array(32));
|
|
cryptoService.rsaEncrypt.mockResolvedValue(encryptedUserKey);
|
|
|
|
const mockPendingAuthRequest = new PendingAuthRequestView();
|
|
mockPendingAuthRequest.id = "requestId1";
|
|
mockPendingAuthRequest.organizationUserId = "organizationUserId1";
|
|
mockPendingAuthRequest.publicKey = "publicKey1";
|
|
|
|
await organizationAuthRequestService.approvePendingRequests(organizationId, [
|
|
mockPendingAuthRequest,
|
|
]);
|
|
|
|
expect(organizationAuthRequestApiService.bulkUpdatePendingRequests).toHaveBeenCalledWith(
|
|
organizationId,
|
|
[
|
|
new OrganizationAuthRequestUpdateRequest(
|
|
"requestId1",
|
|
true,
|
|
encryptedUserKey.encryptedString,
|
|
),
|
|
],
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("approvePendingRequest", () => {
|
|
it("should approve the specified pending auth request", async () => {
|
|
jest.spyOn(organizationAuthRequestApiService, "approvePendingRequest");
|
|
|
|
const organizationId = "organizationId";
|
|
|
|
const organizationUserResetPasswordDetailsResponse =
|
|
new OrganizationUserResetPasswordDetailsResponse({
|
|
resetPasswordKey: "resetPasswordKey",
|
|
encryptedPrivateKey: "encryptedPrivateKey",
|
|
});
|
|
|
|
organizationUserService.getOrganizationUserResetPasswordDetails.mockResolvedValue(
|
|
organizationUserResetPasswordDetailsResponse,
|
|
);
|
|
|
|
const encryptedUserKey = new EncString("encryptedUserKey");
|
|
cryptoService.rsaDecrypt.mockResolvedValue(new Uint8Array(32));
|
|
cryptoService.rsaEncrypt.mockResolvedValue(encryptedUserKey);
|
|
|
|
const mockPendingAuthRequest = new PendingAuthRequestView();
|
|
mockPendingAuthRequest.id = "requestId1";
|
|
mockPendingAuthRequest.organizationUserId = "organizationUserId1";
|
|
mockPendingAuthRequest.publicKey = "publicKey1";
|
|
|
|
await organizationAuthRequestService.approvePendingRequest(
|
|
organizationId,
|
|
mockPendingAuthRequest,
|
|
);
|
|
|
|
expect(organizationAuthRequestApiService.approvePendingRequest).toHaveBeenCalledWith(
|
|
organizationId,
|
|
mockPendingAuthRequest.id,
|
|
encryptedUserKey,
|
|
);
|
|
});
|
|
});
|
|
});
|