diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f6eabead7cb..f1e009eed93 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -253,8 +253,10 @@ apps/browser/src/background/nativeMessaging.background.ts @bitwarden/team- apps/desktop/src/services/biometric-message-handler.service.ts @bitwarden/team-key-management-dev ## PAM -bitwarden_license/bit-web/src/app/pam @bitwarden/team-pam-dev apps/web/src/app/pam @bitwarden/team-pam-dev +bitwarden_license/bit-pam @bitwarden/team-pam-dev +bitwarden_license/bit-pam-components @bitwarden/team-pam-dev +bitwarden_license/bit-web/src/app/pam @bitwarden/team-pam-dev libs/pam @bitwarden/team-pam-dev ## Automation driver ## diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml index 904c3ef05c7..7e2da6b60b2 100644 --- a/.github/workflows/build-browser.yml +++ b/.github/workflows/build-browser.yml @@ -195,12 +195,16 @@ jobs: mkdir -p browser-source/apps/browser cp -r apps/browser/* browser-source/apps/browser - # Copy bitwarden_license/bit-browser and its bit-common dependency to the Browser source directory + # Copy bitwarden_license/bit-browser and its bit-common, bit-pam and bit-pam-components dependencies to the Browser source directory if [[ ${{matrix.license_type.include_bitwarden_license_folder}} == "true" ]]; then mkdir -p browser-source/bitwarden_license/bit-browser cp -r bitwarden_license/bit-browser/* browser-source/bitwarden_license/bit-browser mkdir -p browser-source/bitwarden_license/bit-common cp -r bitwarden_license/bit-common/* browser-source/bitwarden_license/bit-common + mkdir -p browser-source/bitwarden_license/bit-pam + cp -r bitwarden_license/bit-pam/* browser-source/bitwarden_license/bit-pam + mkdir -p browser-source/bitwarden_license/bit-pam-components + cp -r bitwarden_license/bit-pam-components/* browser-source/bitwarden_license/bit-pam-components fi # Copy libs to Browser source directory diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml index e3968304f9d..4d427333357 100644 --- a/.github/workflows/build-web.yml +++ b/.github/workflows/build-web.yml @@ -13,6 +13,8 @@ on: paths: - 'apps/web/**' - 'bitwarden_license/bit-common/**' + - 'bitwarden_license/bit-pam/**' + - 'bitwarden_license/bit-pam-components/**' - 'bitwarden_license/bit-web/**' - 'libs/**' - '*' @@ -27,6 +29,8 @@ on: paths: - 'apps/web/**' - 'bitwarden_license/bit-common/**' + - 'bitwarden_license/bit-pam/**' + - 'bitwarden_license/bit-pam-components/**' - 'bitwarden_license/bit-web/**' - 'libs/**' - '*' diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 3631355bd3d..ccf2a278b32 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -57,6 +57,7 @@ jobs: filters: | storyFiles: - "apps/!(cli)/**" + - "bitwarden_license/bit-pam-components/**" - "bitwarden_license/bit-web/src/app/**" - "libs/!(eslint)/**" - "package.json" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f137a5251c5..8aed89ddce3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -83,7 +83,7 @@ jobs: artifact: jest-coverage-cli junit: junit-cli.xml - name: Libs - paths: libs bitwarden_license/bit-common + paths: libs bitwarden_license/bit-common bitwarden_license/bit-pam bitwarden_license/bit-pam-components artifact: jest-coverage-libs junit: junit-libs.xml diff --git a/apps/browser/tailwind.config.js b/apps/browser/tailwind.config.js index 03375febdae..d7f9bf89508 100644 --- a/apps/browser/tailwind.config.js +++ b/apps/browser/tailwind.config.js @@ -7,6 +7,7 @@ const config = require("../../libs/components/tailwind.config.base"); const browserContent = [ path.resolve(__dirname, "./src/**/*.{html,ts,mdx}"), path.resolve(__dirname, "../../bitwarden_license/bit-browser/src/**/*.{html,ts,mdx}"), + path.resolve(__dirname, "../../bitwarden_license/bit-pam-components/src/**/*.{html,ts}"), ]; config.content = [...config.content, ...browserContent]; diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js index e62ef2aa21f..1c1c2c11bbb 100644 --- a/apps/web/tailwind.config.js +++ b/apps/web/tailwind.config.js @@ -7,6 +7,7 @@ const config = require("../../libs/components/tailwind.config.base"); const webContent = [ path.resolve(__dirname, "./src/**/*.{html,ts,mdx}"), path.resolve(__dirname, "../../bitwarden_license/bit-web/src/**/*.{html,ts,mdx}"), + path.resolve(__dirname, "../../bitwarden_license/bit-pam-components/src/**/*.{html,ts}"), ]; config.content = [...config.content, ...webContent]; diff --git a/bitwarden_license/bit-pam-components/jest.config.js b/bitwarden_license/bit-pam-components/jest.config.js new file mode 100644 index 00000000000..f504fd3bbed --- /dev/null +++ b/bitwarden_license/bit-pam-components/jest.config.js @@ -0,0 +1,24 @@ +const { pathsToModuleNameMapper } = require("ts-jest"); +const { compilerOptions } = require("../../tsconfig.base"); +const sharedConfig = require("../../libs/shared/jest.config.angular"); + +/** @type {import('jest').Config} */ +module.exports = { + ...sharedConfig, + displayName: "bit-pam-components tests", + testEnvironment: "jsdom", + moduleNameMapper: pathsToModuleNameMapper( + { + "@bitwarden/common/spec": ["libs/common/spec"], + "@bitwarden/common": ["libs/common/src/*"], + "@bitwarden/admin-console/common": ["libs/admin-console/src/common"], + ...(compilerOptions?.paths ?? {}), + }, + { + prefix: "/../../", + }, + ), + setupFilesAfterEnv: ["/test.setup.ts"], + transformIgnorePatterns: ["node_modules/(?!(.*\\.mjs$|@angular|rxjs|@bitwarden))"], + moduleFileExtensions: ["ts", "js", "html", "mjs"], +}; diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/extend-lease-dialog/extend-lease-dialog.component.html b/bitwarden_license/bit-pam-components/src/access-requests/extend-lease-dialog/extend-lease-dialog.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/access-requests/extend-lease-dialog/extend-lease-dialog.component.html rename to bitwarden_license/bit-pam-components/src/access-requests/extend-lease-dialog/extend-lease-dialog.component.html diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/extend-lease-dialog/extend-lease-dialog.component.ts b/bitwarden_license/bit-pam-components/src/access-requests/extend-lease-dialog/extend-lease-dialog.component.ts similarity index 98% rename from bitwarden_license/bit-web/src/app/pam/access-requests/extend-lease-dialog/extend-lease-dialog.component.ts rename to bitwarden_license/bit-pam-components/src/access-requests/extend-lease-dialog/extend-lease-dialog.component.ts index 0e2764e1902..effbbaff4b1 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/extend-lease-dialog/extend-lease-dialog.component.ts +++ b/bitwarden_license/bit-pam-components/src/access-requests/extend-lease-dialog/extend-lease-dialog.component.ts @@ -1,6 +1,7 @@ import { ChangeDetectionStrategy, Component, inject } from "@angular/core"; import { FormBuilder, ReactiveFormsModule, Validators } from "@angular/forms"; +import { AccessLeaseExtensionRequest, EXTENSION_DURATION_OPTIONS } from "@bitwarden/bit-pam"; import { AsyncActionsModule, ButtonModule, @@ -12,8 +13,6 @@ import { } from "@bitwarden/components"; import { I18nPipe } from "@bitwarden/ui-common"; -import { AccessLeaseExtensionRequest, EXTENSION_DURATION_OPTIONS } from "../.."; - /** Collects a lease extension. The reason is required because the server rejects an empty one. */ @Component({ selector: "pam-extend-lease-dialog", diff --git a/bitwarden_license/bit-web/src/app/pam/access-state-badge/access-badge-ticker.service.spec.ts b/bitwarden_license/bit-pam-components/src/access-state-badge/access-badge-ticker.service.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/access-state-badge/access-badge-ticker.service.spec.ts rename to bitwarden_license/bit-pam-components/src/access-state-badge/access-badge-ticker.service.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/access-state-badge/access-badge-ticker.service.ts b/bitwarden_license/bit-pam-components/src/access-state-badge/access-badge-ticker.service.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/access-state-badge/access-badge-ticker.service.ts rename to bitwarden_license/bit-pam-components/src/access-state-badge/access-badge-ticker.service.ts diff --git a/bitwarden_license/bit-web/src/app/pam/access-state-badge/access-state-badge.component.html b/bitwarden_license/bit-pam-components/src/access-state-badge/access-state-badge.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/access-state-badge/access-state-badge.component.html rename to bitwarden_license/bit-pam-components/src/access-state-badge/access-state-badge.component.html diff --git a/bitwarden_license/bit-web/src/app/pam/access-state-badge/access-state-badge.component.spec.ts b/bitwarden_license/bit-pam-components/src/access-state-badge/access-state-badge.component.spec.ts similarity index 98% rename from bitwarden_license/bit-web/src/app/pam/access-state-badge/access-state-badge.component.spec.ts rename to bitwarden_license/bit-pam-components/src/access-state-badge/access-state-badge.component.spec.ts index a1973065308..be85303bdfa 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-state-badge/access-state-badge.component.spec.ts +++ b/bitwarden_license/bit-pam-components/src/access-state-badge/access-state-badge.component.spec.ts @@ -1,8 +1,8 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { AccessBadgeState } from "@bitwarden/bit-pam"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { AccessBadgeState } from "./access-badge-state"; import { AccessStateBadgeComponent } from "./access-state-badge.component"; describe("AccessStateBadgeComponent", () => { diff --git a/bitwarden_license/bit-web/src/app/pam/access-state-badge/access-state-badge.component.ts b/bitwarden_license/bit-pam-components/src/access-state-badge/access-state-badge.component.ts similarity index 96% rename from bitwarden_license/bit-web/src/app/pam/access-state-badge/access-state-badge.component.ts rename to bitwarden_license/bit-pam-components/src/access-state-badge/access-state-badge.component.ts index 23dc1f4a50e..871a59c0a21 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-state-badge/access-state-badge.component.ts +++ b/bitwarden_license/bit-pam-components/src/access-state-badge/access-state-badge.component.ts @@ -9,12 +9,10 @@ import { import { toObservable, toSignal } from "@angular/core/rxjs-interop"; import { EMPTY, switchMap } from "rxjs"; +import { formatRemaining, AccessBadgeState, ENDING_SOON_THRESHOLD_MS } from "@bitwarden/bit-pam"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { BadgeComponent, BadgeVariant } from "@bitwarden/components"; -import { formatRemaining } from "../date/format-remaining"; - -import { AccessBadgeState, ENDING_SOON_THRESHOLD_MS } from "./access-badge-state"; import { AccessBadgeTickerService } from "./access-badge-ticker.service"; type BadgeIcon = diff --git a/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/cipher-view-banner.component.html b/bitwarden_license/bit-pam-components/src/cipher-view-banner/cipher-view-banner.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/cipher-view-banner/cipher-view-banner.component.html rename to bitwarden_license/bit-pam-components/src/cipher-view-banner/cipher-view-banner.component.html diff --git a/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/cipher-view-banner.component.spec.ts b/bitwarden_license/bit-pam-components/src/cipher-view-banner/cipher-view-banner.component.spec.ts similarity index 99% rename from bitwarden_license/bit-web/src/app/pam/cipher-view-banner/cipher-view-banner.component.spec.ts rename to bitwarden_license/bit-pam-components/src/cipher-view-banner/cipher-view-banner.component.spec.ts index bbfd22a8b78..22423d2ffbb 100644 --- a/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/cipher-view-banner.component.spec.ts +++ b/bitwarden_license/bit-pam-components/src/cipher-view-banner/cipher-view-banner.component.spec.ts @@ -3,6 +3,23 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, NEVER, of, Subject } from "rxjs"; +import { + AccessLeaseSdkService, + AccessRefreshService, + AccessRequestSdkService, + LeasingErrorService, + REQUEST_ACCESS_SERVER_ERRORS, + composeRequestWindow, + toDateInputValue, + formatDuration, + DefaultAccessRefreshService, +} from "@bitwarden/bit-pam"; +import type { + AccessLeaseView, + AccessPreCheckView, + AccessRequestView, + CipherAccessStateView, +} from "@bitwarden/bit-pam"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -14,24 +31,7 @@ import { RevealedCipherService } from "@bitwarden/common/vault/abstractions/reve import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService, ToastService } from "@bitwarden/components"; -import { - AccessLeaseSdkService, - AccessRefreshService, - AccessRequestSdkService, - LeasingErrorService, - REQUEST_ACCESS_SERVER_ERRORS, - composeRequestWindow, - toDateInputValue, -} from ".."; -import type { - AccessLeaseView, - AccessPreCheckView, - AccessRequestView, - CipherAccessStateView, -} from "../abstractions/access-lease"; -import { formatDuration } from "../date/format-duration"; import { AccessRequestCancelService } from "../services/access-request-cancel.service"; -import { DefaultAccessRefreshService } from "../services/default-access-refresh.service"; import { MyLeasesService } from "../services/my-leases.service"; import { CipherViewBannerComponent } from "./cipher-view-banner.component"; diff --git a/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/cipher-view-banner.component.ts b/bitwarden_license/bit-pam-components/src/cipher-view-banner/cipher-view-banner.component.ts similarity index 98% rename from bitwarden_license/bit-web/src/app/pam/cipher-view-banner/cipher-view-banner.component.ts rename to bitwarden_license/bit-pam-components/src/cipher-view-banner/cipher-view-banner.component.ts index 43e20c59a00..32a82046b18 100644 --- a/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/cipher-view-banner.component.ts +++ b/bitwarden_license/bit-pam-components/src/cipher-view-banner/cipher-view-banner.component.ts @@ -31,30 +31,6 @@ import { switchMap, } from "rxjs"; -import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; -import { getUserId } from "@bitwarden/common/auth/services/account.service"; -import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; -import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; -import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; -import { CipherId } from "@bitwarden/common/types/guid"; -import { RevealedCipherService } from "@bitwarden/common/vault/abstractions/revealed-cipher.service"; -import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import { - AsyncActionsModule, - ButtonModule, - CardComponent, - DialogService, - FormFieldModule, - IconButtonModule, - IconModule, - IconTileComponent, - ToastService, - TypographyModule, -} from "@bitwarden/components"; -import { I18nPipe } from "@bitwarden/ui-common"; - import { type AccessApprovalMode, AccessLeaseSdkService, @@ -80,19 +56,45 @@ import { toDateInputValue, toTimeInputValue, windowEndAt, -} from ".."; + ENDING_SOON_THRESHOLD_MS, + formatCompoundDuration, + formatDuration, + formatRemaining, + isGovernedCipher, + isUnlicensedError, + callerOrganizations$, + unlicensedForPam, +} from "@bitwarden/bit-pam"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { getUserId } from "@bitwarden/common/auth/services/account.service"; +import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; +import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { CipherId } from "@bitwarden/common/types/guid"; +import { RevealedCipherService } from "@bitwarden/common/vault/abstractions/revealed-cipher.service"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; +import { + AsyncActionsModule, + ButtonModule, + CardComponent, + DialogService, + FormFieldModule, + IconButtonModule, + IconModule, + IconTileComponent, + ToastService, + TypographyModule, +} from "@bitwarden/components"; +import { I18nPipe } from "@bitwarden/ui-common"; + import { ExtendLeaseDialogComponent } from "../access-requests/extend-lease-dialog/extend-lease-dialog.component"; -import { ENDING_SOON_THRESHOLD_MS } from "../access-state-badge/access-badge-state"; import { AccessBadgeTickerService } from "../access-state-badge/access-badge-ticker.service"; import { DurationLongPipe } from "../date/duration-long.pipe"; import { DurationShortPipe } from "../date/duration-short.pipe"; -import { formatCompoundDuration, formatDuration } from "../date/format-duration"; -import { formatRemaining } from "../date/format-remaining"; -import { isGovernedCipher } from "../helpers/governed-cipher"; -import { isUnlicensedError } from "../helpers/pam-license-error"; import { AccessRequestCancelService } from "../services/access-request-cancel.service"; import { MyLeasesService } from "../services/my-leases.service"; -import { callerOrganizations$, unlicensedForPam } from "../services/pam-membership"; import { REQUEST_WINDOW_ERROR_KEY, diff --git a/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/request-access-window.validators.ts b/bitwarden_license/bit-pam-components/src/cipher-view-banner/request-access-window.validators.ts similarity index 97% rename from bitwarden_license/bit-web/src/app/pam/cipher-view-banner/request-access-window.validators.ts rename to bitwarden_license/bit-pam-components/src/cipher-view-banner/request-access-window.validators.ts index 8ea855fa926..06f3a0bbbdc 100644 --- a/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/request-access-window.validators.ts +++ b/bitwarden_license/bit-pam-components/src/cipher-view-banner/request-access-window.validators.ts @@ -4,7 +4,7 @@ import { type RequestWindowFormValue, type RequestWindowProblem, requestWindowProblem, -} from "../helpers/request-access-window"; +} from "@bitwarden/bit-pam"; export const REQUEST_WINDOW_ERROR_KEY = "requestWindow"; diff --git a/bitwarden_license/bit-web/src/app/pam/date/duration-long.pipe.spec.ts b/bitwarden_license/bit-pam-components/src/date/duration-long.pipe.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/date/duration-long.pipe.spec.ts rename to bitwarden_license/bit-pam-components/src/date/duration-long.pipe.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/date/duration-long.pipe.ts b/bitwarden_license/bit-pam-components/src/date/duration-long.pipe.ts similarity index 88% rename from bitwarden_license/bit-web/src/app/pam/date/duration-long.pipe.ts rename to bitwarden_license/bit-pam-components/src/date/duration-long.pipe.ts index 9c88b79087e..389b4dabbf2 100644 --- a/bitwarden_license/bit-web/src/app/pam/date/duration-long.pipe.ts +++ b/bitwarden_license/bit-pam-components/src/date/duration-long.pipe.ts @@ -1,6 +1,6 @@ import { LOCALE_ID, Pipe, PipeTransform, inject } from "@angular/core"; -import { formatDuration } from "./format-duration"; +import { formatDuration } from "@bitwarden/bit-pam"; /** Spelled-out, localized duration label, e.g. `15 minutes`, `4 hours`, `1 day`. */ @Pipe({ diff --git a/bitwarden_license/bit-web/src/app/pam/date/duration-short.pipe.spec.ts b/bitwarden_license/bit-pam-components/src/date/duration-short.pipe.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/date/duration-short.pipe.spec.ts rename to bitwarden_license/bit-pam-components/src/date/duration-short.pipe.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/date/duration-short.pipe.ts b/bitwarden_license/bit-pam-components/src/date/duration-short.pipe.ts similarity index 87% rename from bitwarden_license/bit-web/src/app/pam/date/duration-short.pipe.ts rename to bitwarden_license/bit-pam-components/src/date/duration-short.pipe.ts index 1c8109358c0..221d34d38c3 100644 --- a/bitwarden_license/bit-web/src/app/pam/date/duration-short.pipe.ts +++ b/bitwarden_license/bit-pam-components/src/date/duration-short.pipe.ts @@ -1,6 +1,6 @@ import { LOCALE_ID, Pipe, PipeTransform, inject } from "@angular/core"; -import { formatDuration } from "./format-duration"; +import { formatDuration } from "@bitwarden/bit-pam"; /** Compact, localized duration label, e.g. `15m`, `4h`, `1d`. */ @Pipe({ diff --git a/bitwarden_license/bit-web/src/app/pam/date/relative-time.pipe.spec.ts b/bitwarden_license/bit-pam-components/src/date/relative-time.pipe.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/date/relative-time.pipe.spec.ts rename to bitwarden_license/bit-pam-components/src/date/relative-time.pipe.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/date/relative-time.pipe.ts b/bitwarden_license/bit-pam-components/src/date/relative-time.pipe.ts similarity index 91% rename from bitwarden_license/bit-web/src/app/pam/date/relative-time.pipe.ts rename to bitwarden_license/bit-pam-components/src/date/relative-time.pipe.ts index 12138271e84..7a2c329a8ca 100644 --- a/bitwarden_license/bit-web/src/app/pam/date/relative-time.pipe.ts +++ b/bitwarden_license/bit-pam-components/src/date/relative-time.pipe.ts @@ -1,6 +1,6 @@ import { LOCALE_ID, Pipe, PipeTransform, inject } from "@angular/core"; -import { formatRelativeTime } from ".."; +import { formatRelativeTime } from "@bitwarden/bit-pam"; /** A localized relative phrase, e.g. "5 min. ago" or "in 2 hr.". */ @Pipe({ diff --git a/bitwarden_license/bit-web/src/app/pam/date/remaining-time.pipe.spec.ts b/bitwarden_license/bit-pam-components/src/date/remaining-time.pipe.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/date/remaining-time.pipe.spec.ts rename to bitwarden_license/bit-pam-components/src/date/remaining-time.pipe.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/date/remaining-time.pipe.ts b/bitwarden_license/bit-pam-components/src/date/remaining-time.pipe.ts similarity index 88% rename from bitwarden_license/bit-web/src/app/pam/date/remaining-time.pipe.ts rename to bitwarden_license/bit-pam-components/src/date/remaining-time.pipe.ts index 489b6a3b7a4..b3880ee7267 100644 --- a/bitwarden_license/bit-web/src/app/pam/date/remaining-time.pipe.ts +++ b/bitwarden_license/bit-pam-components/src/date/remaining-time.pipe.ts @@ -1,6 +1,6 @@ import { inject, LOCALE_ID, Pipe, PipeTransform } from "@angular/core"; -import { formatRemaining } from ".."; +import { formatRemaining } from "@bitwarden/bit-pam"; /** Pure, so pass a ticking `nowMs` for the countdown to move. */ @Pipe({ diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/access-connector-confirm.ts b/bitwarden_license/bit-pam-components/src/helpers/access-connector-confirm.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/access-connector-confirm.ts rename to bitwarden_license/bit-pam-components/src/helpers/access-connector-confirm.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/access-rule-deactivate-confirm.spec.ts b/bitwarden_license/bit-pam-components/src/helpers/access-rule-deactivate-confirm.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/access-rule-deactivate-confirm.spec.ts rename to bitwarden_license/bit-pam-components/src/helpers/access-rule-deactivate-confirm.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/access-rule-deactivate-confirm.ts b/bitwarden_license/bit-pam-components/src/helpers/access-rule-deactivate-confirm.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/access-rule-deactivate-confirm.ts rename to bitwarden_license/bit-pam-components/src/helpers/access-rule-deactivate-confirm.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/access-rule-delete-confirm.spec.ts b/bitwarden_license/bit-pam-components/src/helpers/access-rule-delete-confirm.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/access-rule-delete-confirm.spec.ts rename to bitwarden_license/bit-pam-components/src/helpers/access-rule-delete-confirm.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/access-rule-delete-confirm.ts b/bitwarden_license/bit-pam-components/src/helpers/access-rule-delete-confirm.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/access-rule-delete-confirm.ts rename to bitwarden_license/bit-pam-components/src/helpers/access-rule-delete-confirm.ts diff --git a/bitwarden_license/bit-pam-components/src/index.ts b/bitwarden_license/bit-pam-components/src/index.ts new file mode 100644 index 00000000000..e34b3aee03d --- /dev/null +++ b/bitwarden_license/bit-pam-components/src/index.ts @@ -0,0 +1,17 @@ +export { accessRuleDeleteConfirmOptions } from "./helpers/access-rule-delete-confirm"; +export { accessRuleDeactivateConfirmOptions } from "./helpers/access-rule-deactivate-confirm"; +export { ExtendLeaseDialogComponent } from "./access-requests/extend-lease-dialog/extend-lease-dialog.component"; +export { AccessBadgeTickerService } from "./access-state-badge/access-badge-ticker.service"; +export { AccessStateBadgeComponent } from "./access-state-badge/access-state-badge.component"; +export { CipherViewBannerComponent } from "./cipher-view-banner/cipher-view-banner.component"; +export { DurationLongPipe } from "./date/duration-long.pipe"; +export { DurationShortPipe } from "./date/duration-short.pipe"; +export { RelativeTimePipe } from "./date/relative-time.pipe"; +export { RemainingTimePipe } from "./date/remaining-time.pipe"; +export { + accessConnectorDeactivateConfirmOptions, + accessConnectorDeleteConfirmOptions, +} from "./helpers/access-connector-confirm"; +export { ItemDetailsStateBadgeComponent } from "./item-details-state-badge/item-details-state-badge.component"; +export { AccessRequestCancelService } from "./services/access-request-cancel.service"; +export { MyLeasesService } from "./services/my-leases.service"; diff --git a/bitwarden_license/bit-web/src/app/pam/item-details-state-badge/item-details-state-badge.component.html b/bitwarden_license/bit-pam-components/src/item-details-state-badge/item-details-state-badge.component.html similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/item-details-state-badge/item-details-state-badge.component.html rename to bitwarden_license/bit-pam-components/src/item-details-state-badge/item-details-state-badge.component.html diff --git a/bitwarden_license/bit-web/src/app/pam/item-details-state-badge/item-details-state-badge.component.spec.ts b/bitwarden_license/bit-pam-components/src/item-details-state-badge/item-details-state-badge.component.spec.ts similarity index 98% rename from bitwarden_license/bit-web/src/app/pam/item-details-state-badge/item-details-state-badge.component.spec.ts rename to bitwarden_license/bit-pam-components/src/item-details-state-badge/item-details-state-badge.component.spec.ts index 5d1c23cb088..225d2d35374 100644 --- a/bitwarden_license/bit-web/src/app/pam/item-details-state-badge/item-details-state-badge.component.spec.ts +++ b/bitwarden_license/bit-pam-components/src/item-details-state-badge/item-details-state-badge.component.spec.ts @@ -1,6 +1,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { BehaviorSubject, of, Subject } from "rxjs"; +import { AccessRefreshService, AccessRequestSdkService } from "@bitwarden/bit-pam"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -10,9 +11,6 @@ import { RevealedCipherService } from "@bitwarden/common/vault/abstractions/reve import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import type { CipherAccessStateView } from "@bitwarden/sdk-internal"; -import { AccessRefreshService } from "../abstractions/access-refresh.service"; -import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; - import { ItemDetailsStateBadgeComponent } from "./item-details-state-badge.component"; describe("ItemDetailsStateBadgeComponent", () => { diff --git a/bitwarden_license/bit-web/src/app/pam/item-details-state-badge/item-details-state-badge.component.ts b/bitwarden_license/bit-pam-components/src/item-details-state-badge/item-details-state-badge.component.ts similarity index 90% rename from bitwarden_license/bit-web/src/app/pam/item-details-state-badge/item-details-state-badge.component.ts rename to bitwarden_license/bit-pam-components/src/item-details-state-badge/item-details-state-badge.component.ts index eeff683949f..5639ca2659a 100644 --- a/bitwarden_license/bit-web/src/app/pam/item-details-state-badge/item-details-state-badge.component.ts +++ b/bitwarden_license/bit-pam-components/src/item-details-state-badge/item-details-state-badge.component.ts @@ -13,6 +13,15 @@ import { take, } from "rxjs"; +import { + AccessRefreshService, + AccessRequestSdkService, + AccessBadgeState, + cipherAccessBadgeState, + isGovernedCipher, + liveActiveLease, +} from "@bitwarden/bit-pam"; +import type { CipherAccessStateView } from "@bitwarden/bit-pam"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; @@ -22,14 +31,8 @@ import { CipherId } from "@bitwarden/common/types/guid"; import { RevealedCipherService } from "@bitwarden/common/vault/abstractions/revealed-cipher.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import type { CipherAccessStateView } from "../abstractions/access-lease"; -import { AccessRefreshService } from "../abstractions/access-refresh.service"; -import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; -import { AccessBadgeState, cipherAccessBadgeState } from "../access-state-badge/access-badge-state"; import { AccessBadgeTickerService } from "../access-state-badge/access-badge-ticker.service"; import { AccessStateBadgeComponent } from "../access-state-badge/access-state-badge.component"; -import { isGovernedCipher } from "../helpers/governed-cipher"; -import { liveActiveLease } from "../helpers/lease-liveness"; /** * Binds `ITEM_DETAILS_BADGE`, the access-state pill on the open item's name row. A live diff --git a/bitwarden_license/bit-web/src/app/pam/services/access-request-cancel.service.spec.ts b/bitwarden_license/bit-pam-components/src/services/access-request-cancel.service.spec.ts similarity index 95% rename from bitwarden_license/bit-web/src/app/pam/services/access-request-cancel.service.spec.ts rename to bitwarden_license/bit-pam-components/src/services/access-request-cancel.service.spec.ts index 7685b0bd423..233f0ba5492 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/access-request-cancel.service.spec.ts +++ b/bitwarden_license/bit-pam-components/src/services/access-request-cancel.service.spec.ts @@ -1,15 +1,13 @@ import { mock, MockProxy } from "jest-mock-extended"; import { NEVER } from "rxjs"; +import { AccessRequestSdkService, DefaultAccessRefreshService } from "@bitwarden/bit-pam"; +import type { AccessRequestId, CipherAccessStateView } from "@bitwarden/bit-pam"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { DialogService, ToastService } from "@bitwarden/components"; -import type { AccessRequestId, CipherAccessStateView } from "../abstractions/access-lease"; -import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; - import { AccessRequestCancelService } from "./access-request-cancel.service"; -import { DefaultAccessRefreshService } from "./default-access-refresh.service"; const CIPHER_ID = "cipher-1"; const REQUEST_ID = "request-1" as unknown as AccessRequestId; diff --git a/bitwarden_license/bit-web/src/app/pam/services/access-request-cancel.service.ts b/bitwarden_license/bit-pam-components/src/services/access-request-cancel.service.ts similarity index 96% rename from bitwarden_license/bit-web/src/app/pam/services/access-request-cancel.service.ts rename to bitwarden_license/bit-pam-components/src/services/access-request-cancel.service.ts index f172201a164..535c9c8a3c6 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/access-request-cancel.service.ts +++ b/bitwarden_license/bit-pam-components/src/services/access-request-cancel.service.ts @@ -1,9 +1,8 @@ +import { AccessRefreshService, AccessRequestSdkService } from "@bitwarden/bit-pam"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { DialogService, ToastService } from "@bitwarden/components"; -import { AccessRefreshService, AccessRequestSdkService } from ".."; - /** * Withdraws the caller's outstanding request for a gated cipher, for entry points that start from a * cipher rather than a request id. diff --git a/bitwarden_license/bit-web/src/app/pam/services/my-leases.service.spec.ts b/bitwarden_license/bit-pam-components/src/services/my-leases.service.spec.ts similarity index 94% rename from bitwarden_license/bit-web/src/app/pam/services/my-leases.service.spec.ts rename to bitwarden_license/bit-pam-components/src/services/my-leases.service.spec.ts index c2bad94c343..7e56125ae59 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/my-leases.service.spec.ts +++ b/bitwarden_license/bit-pam-components/src/services/my-leases.service.spec.ts @@ -1,11 +1,10 @@ import { mock, MockProxy } from "jest-mock-extended"; import { firstValueFrom } from "rxjs"; +import { AccessLeaseSdkService } from "@bitwarden/bit-pam"; +import type { AccessLeaseView } from "@bitwarden/bit-pam"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; -import type { AccessLeaseView } from "../abstractions/access-lease"; -import { AccessLeaseSdkService } from "../abstractions/access-lease-sdk.service"; - import { MyLeasesService } from "./my-leases.service"; /** Only the three fields the gate reads; the SDK view is wide and entirely server-populated. */ diff --git a/bitwarden_license/bit-web/src/app/pam/services/my-leases.service.ts b/bitwarden_license/bit-pam-components/src/services/my-leases.service.ts similarity index 93% rename from bitwarden_license/bit-web/src/app/pam/services/my-leases.service.ts rename to bitwarden_license/bit-pam-components/src/services/my-leases.service.ts index 8bbf4d5c403..d9c3e6d8727 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/my-leases.service.ts +++ b/bitwarden_license/bit-pam-components/src/services/my-leases.service.ts @@ -1,12 +1,11 @@ import { Injectable } from "@angular/core"; import { catchError, defer, map, Observable, of, shareReplay } from "rxjs"; +import { AccessLeaseSdkService } from "@bitwarden/bit-pam"; +import type { AccessLeaseView } from "@bitwarden/bit-pam"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; -import type { AccessLeaseView } from "../abstractions/access-lease"; -import { AccessLeaseSdkService } from "../abstractions/access-lease-sdk.service"; - /** How long a cached read serves new consumers, checked lazily on access. */ const CACHE_TTL_MS = 30_000; diff --git a/bitwarden_license/bit-pam-components/test.setup.ts b/bitwarden_license/bit-pam-components/test.setup.ts new file mode 100644 index 00000000000..3f9ef28ad00 --- /dev/null +++ b/bitwarden_license/bit-pam-components/test.setup.ts @@ -0,0 +1 @@ +import "@bitwarden/ui-common/setup-jest"; diff --git a/bitwarden_license/bit-pam-components/tsconfig.json b/bitwarden_license/bit-pam-components/tsconfig.json new file mode 100644 index 00000000000..2ac91700c60 --- /dev/null +++ b/bitwarden_license/bit-pam-components/tsconfig.json @@ -0,0 +1,6 @@ +{ + "extends": "../../tsconfig.base", + "files": ["../bit-common/src/platform/sdk/sdk-alias.d.ts"], + "include": ["src"], + "exclude": ["node_modules", "dist"] +} diff --git a/bitwarden_license/bit-pam-components/tsconfig.spec.json b/bitwarden_license/bit-pam-components/tsconfig.spec.json new file mode 100644 index 00000000000..fc8520e7376 --- /dev/null +++ b/bitwarden_license/bit-pam-components/tsconfig.spec.json @@ -0,0 +1,3 @@ +{ + "extends": "./tsconfig.json" +} diff --git a/bitwarden_license/bit-pam/jest.config.js b/bitwarden_license/bit-pam/jest.config.js new file mode 100644 index 00000000000..88a08b03e5f --- /dev/null +++ b/bitwarden_license/bit-pam/jest.config.js @@ -0,0 +1,16 @@ +const { pathsToModuleNameMapper } = require("ts-jest"); + +const { compilerOptions } = require("../../tsconfig.base"); + +const sharedConfig = require("../../libs/shared/jest.config.ts"); + +/** @type {import('jest').Config} */ +module.exports = { + ...sharedConfig, + displayName: "bit-pam tests", + preset: "ts-jest", + testEnvironment: "jsdom", + moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths ?? {}, { + prefix: "/../../", + }), +}; diff --git a/bitwarden_license/bit-web/src/app/pam/abstractions/access-event.service.ts b/bitwarden_license/bit-pam/src/abstractions/access-event.service.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/abstractions/access-event.service.ts rename to bitwarden_license/bit-pam/src/abstractions/access-event.service.ts diff --git a/bitwarden_license/bit-web/src/app/pam/abstractions/access-lease-sdk.service.ts b/bitwarden_license/bit-pam/src/abstractions/access-lease-sdk.service.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/abstractions/access-lease-sdk.service.ts rename to bitwarden_license/bit-pam/src/abstractions/access-lease-sdk.service.ts diff --git a/bitwarden_license/bit-web/src/app/pam/abstractions/access-lease.ts b/bitwarden_license/bit-pam/src/abstractions/access-lease.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/abstractions/access-lease.ts rename to bitwarden_license/bit-pam/src/abstractions/access-lease.ts diff --git a/bitwarden_license/bit-web/src/app/pam/abstractions/access-refresh.service.ts b/bitwarden_license/bit-pam/src/abstractions/access-refresh.service.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/abstractions/access-refresh.service.ts rename to bitwarden_license/bit-pam/src/abstractions/access-refresh.service.ts diff --git a/bitwarden_license/bit-web/src/app/pam/abstractions/access-request-sdk.service.ts b/bitwarden_license/bit-pam/src/abstractions/access-request-sdk.service.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/abstractions/access-request-sdk.service.ts rename to bitwarden_license/bit-pam/src/abstractions/access-request-sdk.service.ts diff --git a/bitwarden_license/bit-web/src/app/pam/abstractions/access-rule-sdk.service.ts b/bitwarden_license/bit-pam/src/abstractions/access-rule-sdk.service.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/abstractions/access-rule-sdk.service.ts rename to bitwarden_license/bit-pam/src/abstractions/access-rule-sdk.service.ts diff --git a/bitwarden_license/bit-web/src/app/pam/abstractions/access-rule.spec.ts b/bitwarden_license/bit-pam/src/abstractions/access-rule.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/abstractions/access-rule.spec.ts rename to bitwarden_license/bit-pam/src/abstractions/access-rule.spec.ts index f812b943da3..8a26f787aa6 100644 --- a/bitwarden_license/bit-web/src/app/pam/abstractions/access-rule.spec.ts +++ b/bitwarden_license/bit-pam/src/abstractions/access-rule.spec.ts @@ -1,4 +1,3 @@ -import type { AccessRuleError, AccessRuleErrorVariant } from "./access-rule"; import { accessRuleErrorMessage, isAccessRuleNotFound, @@ -6,6 +5,7 @@ import { isIpAllowlist, isKnownAccessCondition, } from "./access-rule"; +import type { AccessRuleError, AccessRuleErrorVariant } from "./access-rule"; function accessRuleError(variant: AccessRuleErrorVariant, message = "boom"): AccessRuleError { const error = new Error(message) as unknown as AccessRuleError; diff --git a/bitwarden_license/bit-web/src/app/pam/abstractions/access-rule.ts b/bitwarden_license/bit-pam/src/abstractions/access-rule.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/abstractions/access-rule.ts rename to bitwarden_license/bit-pam/src/abstractions/access-rule.ts diff --git a/bitwarden_license/bit-web/src/app/pam/abstractions/api-error.spec.ts b/bitwarden_license/bit-pam/src/abstractions/api-error.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/abstractions/api-error.spec.ts rename to bitwarden_license/bit-pam/src/abstractions/api-error.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/abstractions/api-error.ts b/bitwarden_license/bit-pam/src/abstractions/api-error.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/abstractions/api-error.ts rename to bitwarden_license/bit-pam/src/abstractions/api-error.ts diff --git a/bitwarden_license/bit-web/src/app/pam/abstractions/approval-sdk.service.ts b/bitwarden_license/bit-pam/src/abstractions/approval-sdk.service.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/abstractions/approval-sdk.service.ts rename to bitwarden_license/bit-pam/src/abstractions/approval-sdk.service.ts diff --git a/bitwarden_license/bit-web/src/app/pam/abstractions/leasing-error.service.ts b/bitwarden_license/bit-pam/src/abstractions/leasing-error.service.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/abstractions/leasing-error.service.ts rename to bitwarden_license/bit-pam/src/abstractions/leasing-error.service.ts diff --git a/bitwarden_license/bit-web/src/app/pam/access-state-badge/access-badge-state.spec.ts b/bitwarden_license/bit-pam/src/access-state-badge/access-badge-state.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/access-state-badge/access-badge-state.spec.ts rename to bitwarden_license/bit-pam/src/access-state-badge/access-badge-state.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/access-state-badge/access-badge-state.ts b/bitwarden_license/bit-pam/src/access-state-badge/access-badge-state.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/access-state-badge/access-badge-state.ts rename to bitwarden_license/bit-pam/src/access-state-badge/access-badge-state.ts diff --git a/bitwarden_license/bit-web/src/app/pam/date/elapsed.spec.ts b/bitwarden_license/bit-pam/src/date/elapsed.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/date/elapsed.spec.ts rename to bitwarden_license/bit-pam/src/date/elapsed.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/date/elapsed.ts b/bitwarden_license/bit-pam/src/date/elapsed.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/date/elapsed.ts rename to bitwarden_license/bit-pam/src/date/elapsed.ts diff --git a/bitwarden_license/bit-web/src/app/pam/date/format-duration.spec.ts b/bitwarden_license/bit-pam/src/date/format-duration.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/date/format-duration.spec.ts rename to bitwarden_license/bit-pam/src/date/format-duration.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/date/format-duration.ts b/bitwarden_license/bit-pam/src/date/format-duration.ts similarity index 96% rename from bitwarden_license/bit-web/src/app/pam/date/format-duration.ts rename to bitwarden_license/bit-pam/src/date/format-duration.ts index 35fc521ad16..521dddef326 100644 --- a/bitwarden_license/bit-web/src/app/pam/date/format-duration.ts +++ b/bitwarden_license/bit-pam/src/date/format-duration.ts @@ -1,4 +1,4 @@ -import { DurationUnit, pickDurationUnit } from ".."; +import { DurationUnit, pickDurationUnit } from "../helpers/lease-window.utils"; const formatters = new Map(); diff --git a/bitwarden_license/bit-web/src/app/pam/date/format-remaining.spec.ts b/bitwarden_license/bit-pam/src/date/format-remaining.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/date/format-remaining.spec.ts rename to bitwarden_license/bit-pam/src/date/format-remaining.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/date/format-remaining.ts b/bitwarden_license/bit-pam/src/date/format-remaining.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/date/format-remaining.ts rename to bitwarden_license/bit-pam/src/date/format-remaining.ts diff --git a/bitwarden_license/bit-web/src/app/pam/date/relative-time.spec.ts b/bitwarden_license/bit-pam/src/date/relative-time.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/date/relative-time.spec.ts rename to bitwarden_license/bit-pam/src/date/relative-time.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/date/relative-time.ts b/bitwarden_license/bit-pam/src/date/relative-time.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/date/relative-time.ts rename to bitwarden_license/bit-pam/src/date/relative-time.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/access-rule-copy.spec.ts b/bitwarden_license/bit-pam/src/helpers/access-rule-copy.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/access-rule-copy.spec.ts rename to bitwarden_license/bit-pam/src/helpers/access-rule-copy.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/access-rule-copy.ts b/bitwarden_license/bit-pam/src/helpers/access-rule-copy.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/access-rule-copy.ts rename to bitwarden_license/bit-pam/src/helpers/access-rule-copy.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/access-rule-error.spec.ts b/bitwarden_license/bit-pam/src/helpers/access-rule-error.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/access-rule-error.spec.ts rename to bitwarden_license/bit-pam/src/helpers/access-rule-error.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/access-rule-error.ts b/bitwarden_license/bit-pam/src/helpers/access-rule-error.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/access-rule-error.ts rename to bitwarden_license/bit-pam/src/helpers/access-rule-error.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/access-rule-request.spec.ts b/bitwarden_license/bit-pam/src/helpers/access-rule-request.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/access-rule-request.spec.ts rename to bitwarden_license/bit-pam/src/helpers/access-rule-request.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/access-rule-request.ts b/bitwarden_license/bit-pam/src/helpers/access-rule-request.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/access-rule-request.ts rename to bitwarden_license/bit-pam/src/helpers/access-rule-request.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/access-rule-table.spec.ts b/bitwarden_license/bit-pam/src/helpers/access-rule-table.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/access-rule-table.spec.ts rename to bitwarden_license/bit-pam/src/helpers/access-rule-table.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/access-rule-table.ts b/bitwarden_license/bit-pam/src/helpers/access-rule-table.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/access-rule-table.ts rename to bitwarden_license/bit-pam/src/helpers/access-rule-table.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/actionable-requests.spec.ts b/bitwarden_license/bit-pam/src/helpers/actionable-requests.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/actionable-requests.spec.ts rename to bitwarden_license/bit-pam/src/helpers/actionable-requests.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/actionable-requests.ts b/bitwarden_license/bit-pam/src/helpers/actionable-requests.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/actionable-requests.ts rename to bitwarden_license/bit-pam/src/helpers/actionable-requests.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/activate-access-error.spec.ts b/bitwarden_license/bit-pam/src/helpers/activate-access-error.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/activate-access-error.spec.ts rename to bitwarden_license/bit-pam/src/helpers/activate-access-error.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/activate-access-error.ts b/bitwarden_license/bit-pam/src/helpers/activate-access-error.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/activate-access-error.ts rename to bitwarden_license/bit-pam/src/helpers/activate-access-error.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/approval-method.spec.ts b/bitwarden_license/bit-pam/src/helpers/approval-method.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/approval-method.spec.ts rename to bitwarden_license/bit-pam/src/helpers/approval-method.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/approval-method.ts b/bitwarden_license/bit-pam/src/helpers/approval-method.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/approval-method.ts rename to bitwarden_license/bit-pam/src/helpers/approval-method.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/approval-window.spec.ts b/bitwarden_license/bit-pam/src/helpers/approval-window.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/approval-window.spec.ts rename to bitwarden_license/bit-pam/src/helpers/approval-window.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/approval-window.ts b/bitwarden_license/bit-pam/src/helpers/approval-window.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/approval-window.ts rename to bitwarden_license/bit-pam/src/helpers/approval-window.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/can-approve.spec.ts b/bitwarden_license/bit-pam/src/helpers/can-approve.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/can-approve.spec.ts rename to bitwarden_license/bit-pam/src/helpers/can-approve.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/can-approve.ts b/bitwarden_license/bit-pam/src/helpers/can-approve.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/can-approve.ts rename to bitwarden_license/bit-pam/src/helpers/can-approve.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/collection-conflicts.spec.ts b/bitwarden_license/bit-pam/src/helpers/collection-conflicts.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/collection-conflicts.spec.ts rename to bitwarden_license/bit-pam/src/helpers/collection-conflicts.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/collection-conflicts.ts b/bitwarden_license/bit-pam/src/helpers/collection-conflicts.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/collection-conflicts.ts rename to bitwarden_license/bit-pam/src/helpers/collection-conflicts.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/collection-names.spec.ts b/bitwarden_license/bit-pam/src/helpers/collection-names.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/collection-names.spec.ts rename to bitwarden_license/bit-pam/src/helpers/collection-names.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/collection-names.ts b/bitwarden_license/bit-pam/src/helpers/collection-names.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/collection-names.ts rename to bitwarden_license/bit-pam/src/helpers/collection-names.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/decide-access-error.spec.ts b/bitwarden_license/bit-pam/src/helpers/decide-access-error.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/decide-access-error.spec.ts rename to bitwarden_license/bit-pam/src/helpers/decide-access-error.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/decide-access-error.ts b/bitwarden_license/bit-pam/src/helpers/decide-access-error.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/decide-access-error.ts rename to bitwarden_license/bit-pam/src/helpers/decide-access-error.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/filter-rules-to-toggle.spec.ts b/bitwarden_license/bit-pam/src/helpers/filter-rules-to-toggle.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/filter-rules-to-toggle.spec.ts rename to bitwarden_license/bit-pam/src/helpers/filter-rules-to-toggle.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/filter-rules-to-toggle.ts b/bitwarden_license/bit-pam/src/helpers/filter-rules-to-toggle.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/filter-rules-to-toggle.ts rename to bitwarden_license/bit-pam/src/helpers/filter-rules-to-toggle.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/find-human-decision.spec.ts b/bitwarden_license/bit-pam/src/helpers/find-human-decision.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/find-human-decision.spec.ts rename to bitwarden_license/bit-pam/src/helpers/find-human-decision.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/find-human-decision.ts b/bitwarden_license/bit-pam/src/helpers/find-human-decision.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/find-human-decision.ts rename to bitwarden_license/bit-pam/src/helpers/find-human-decision.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/governed-cipher.spec.ts b/bitwarden_license/bit-pam/src/helpers/governed-cipher.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/governed-cipher.spec.ts rename to bitwarden_license/bit-pam/src/helpers/governed-cipher.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/governed-cipher.ts b/bitwarden_license/bit-pam/src/helpers/governed-cipher.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/governed-cipher.ts rename to bitwarden_license/bit-pam/src/helpers/governed-cipher.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/lease-liveness.spec.ts b/bitwarden_license/bit-pam/src/helpers/lease-liveness.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/lease-liveness.spec.ts rename to bitwarden_license/bit-pam/src/helpers/lease-liveness.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/lease-liveness.ts b/bitwarden_license/bit-pam/src/helpers/lease-liveness.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/lease-liveness.ts rename to bitwarden_license/bit-pam/src/helpers/lease-liveness.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/lease-window.utils.spec.ts b/bitwarden_license/bit-pam/src/helpers/lease-window.utils.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/lease-window.utils.spec.ts rename to bitwarden_license/bit-pam/src/helpers/lease-window.utils.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/lease-window.utils.ts b/bitwarden_license/bit-pam/src/helpers/lease-window.utils.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/lease-window.utils.ts rename to bitwarden_license/bit-pam/src/helpers/lease-window.utils.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/pam-license-error.ts b/bitwarden_license/bit-pam/src/helpers/pam-license-error.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/pam-license-error.ts rename to bitwarden_license/bit-pam/src/helpers/pam-license-error.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/request-access-error.spec.ts b/bitwarden_license/bit-pam/src/helpers/request-access-error.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/request-access-error.spec.ts rename to bitwarden_license/bit-pam/src/helpers/request-access-error.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/request-access-error.ts b/bitwarden_license/bit-pam/src/helpers/request-access-error.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/request-access-error.ts rename to bitwarden_license/bit-pam/src/helpers/request-access-error.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/request-access-window.spec.ts b/bitwarden_license/bit-pam/src/helpers/request-access-window.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/request-access-window.spec.ts rename to bitwarden_license/bit-pam/src/helpers/request-access-window.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/request-access-window.ts b/bitwarden_license/bit-pam/src/helpers/request-access-window.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/request-access-window.ts rename to bitwarden_license/bit-pam/src/helpers/request-access-window.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/requested-window.spec.ts b/bitwarden_license/bit-pam/src/helpers/requested-window.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/requested-window.spec.ts rename to bitwarden_license/bit-pam/src/helpers/requested-window.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/requested-window.ts b/bitwarden_license/bit-pam/src/helpers/requested-window.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/requested-window.ts rename to bitwarden_license/bit-pam/src/helpers/requested-window.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/selected-filter-strings.spec.ts b/bitwarden_license/bit-pam/src/helpers/selected-filter-strings.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/selected-filter-strings.spec.ts rename to bitwarden_license/bit-pam/src/helpers/selected-filter-strings.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/helpers/selected-filter-strings.ts b/bitwarden_license/bit-pam/src/helpers/selected-filter-strings.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/helpers/selected-filter-strings.ts rename to bitwarden_license/bit-pam/src/helpers/selected-filter-strings.ts diff --git a/bitwarden_license/bit-web/src/app/pam/index.ts b/bitwarden_license/bit-pam/src/index.ts similarity index 81% rename from bitwarden_license/bit-web/src/app/pam/index.ts rename to bitwarden_license/bit-pam/src/index.ts index 463eff7eaf0..655fbeb92be 100644 --- a/bitwarden_license/bit-web/src/app/pam/index.ts +++ b/bitwarden_license/bit-pam/src/index.ts @@ -15,7 +15,6 @@ export { } from "./abstractions/access-rule"; export { AccessRuleSdkService } from "./abstractions/access-rule-sdk.service"; export { apiErrorBodyMessage } from "./abstractions/api-error"; - export type { AccessApprovalMode, AccessApprover, @@ -42,7 +41,6 @@ export { AccessLeaseSdkService } from "./abstractions/access-lease-sdk.service"; export { AccessRefreshService } from "./abstractions/access-refresh.service"; export { AccessEventService } from "./abstractions/access-event.service"; export { LeasingErrorService } from "./abstractions/leasing-error.service"; - export { ACCESS_RULE_DESCRIPTION_MAX_LENGTH, ACCESS_RULE_NAME_MAX_LENGTH, @@ -55,8 +53,6 @@ export type { AccessRuleFormPatch, AccessRuleFormValue } from "./helpers/access- export { accessRuleToCopyRequest, copyRuleName } from "./helpers/access-rule-copy"; export { resolveCollectionNames } from "./helpers/collection-names"; export { conflictingCollectionIds } from "./helpers/collection-conflicts"; -export { accessRuleDeleteConfirmOptions } from "./helpers/access-rule-delete-confirm"; -export { accessRuleDeactivateConfirmOptions } from "./helpers/access-rule-deactivate-confirm"; export { filterRulesToToggle } from "./helpers/filter-rules-to-toggle"; export { approvalMethodLabelKeys } from "./helpers/approval-method"; export { @@ -75,11 +71,6 @@ export type { AccessRequestForApproval, UserForApproval } from "./helpers/can-ap export { elapsedLabel } from "./date/elapsed"; export type { ElapsedLabel } from "./date/elapsed"; export { ApprovalSdkService } from "./abstractions/approval-sdk.service"; -export { AuditApiService } from "./access-audit/audit-api.service"; -export { RotationSdkService } from "./rotation/rotation-sdk.service"; -export type { RotationConfigDescription } from "./rotation/rotation-sdk.service"; -export { AccessAuditEventKind } from "./access-audit/responses/access-audit-event.response"; -export type { AccessAuditEventResponse } from "./access-audit/responses/access-audit-event.response"; export { durationLabel, exactWindow, reasonText, relativeStart } from "./helpers/approval-window"; export type { LabelValue } from "./helpers/approval-window"; export { @@ -121,3 +112,19 @@ export { isRequestNoLongerPendingError, } from "./helpers/decide-access-error"; export { selectedFilterStrings } from "./helpers/selected-filter-strings"; +export { + cipherAccessBadgeState, + ENDING_SOON_THRESHOLD_MS, +} from "./access-state-badge/access-badge-state"; +export type { AccessBadgeState } from "./access-state-badge/access-badge-state"; +export { formatCompoundDuration, formatDuration } from "./date/format-duration"; +export { isGovernedCipher } from "./helpers/governed-cipher"; +export { isUnlicensedError } from "./helpers/pam-license-error"; +export { AccessLeasesSdkService } from "./services/access-leases-sdk.service"; +export { AccessRequestsSdkService } from "./services/access-requests-sdk.service"; +export { AccessRulesSdkService } from "./services/access-rules-sdk.service"; +export { ApprovalsSdkService } from "./services/approvals-sdk.service"; +export { DefaultAccessEventService } from "./services/default-access-event.service"; +export { DefaultAccessRefreshService } from "./services/default-access-refresh.service"; +export { DefaultLeasingErrorService } from "./services/default-leasing-error.service"; +export { callerOrganizations$, unlicensedForPam } from "./services/pam-membership"; diff --git a/bitwarden_license/bit-web/src/app/pam/services/access-leases-sdk.service.spec.ts b/bitwarden_license/bit-pam/src/services/access-leases-sdk.service.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/services/access-leases-sdk.service.spec.ts rename to bitwarden_license/bit-pam/src/services/access-leases-sdk.service.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/services/access-leases-sdk.service.ts b/bitwarden_license/bit-pam/src/services/access-leases-sdk.service.ts similarity index 97% rename from bitwarden_license/bit-web/src/app/pam/services/access-leases-sdk.service.ts rename to bitwarden_license/bit-pam/src/services/access-leases-sdk.service.ts index 29bbf01b3cd..aac68053a03 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/access-leases-sdk.service.ts +++ b/bitwarden_license/bit-pam/src/services/access-leases-sdk.service.ts @@ -14,7 +14,7 @@ import type { CipherView as SdkCipherView, } from "@bitwarden/sdk-internal"; -import { AccessLeaseSdkService } from ".."; +import { AccessLeaseSdkService } from "../abstractions/access-lease-sdk.service"; export class AccessLeasesSdkService implements AccessLeaseSdkService { constructor( diff --git a/bitwarden_license/bit-web/src/app/pam/services/access-requests-sdk.service.spec.ts b/bitwarden_license/bit-pam/src/services/access-requests-sdk.service.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/services/access-requests-sdk.service.spec.ts rename to bitwarden_license/bit-pam/src/services/access-requests-sdk.service.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/services/access-requests-sdk.service.ts b/bitwarden_license/bit-pam/src/services/access-requests-sdk.service.ts similarity index 98% rename from bitwarden_license/bit-web/src/app/pam/services/access-requests-sdk.service.ts rename to bitwarden_license/bit-pam/src/services/access-requests-sdk.service.ts index f966d7852fb..569efcbb6a4 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/access-requests-sdk.service.ts +++ b/bitwarden_license/bit-pam/src/services/access-requests-sdk.service.ts @@ -15,7 +15,7 @@ import type { CipherId as SdkCipherId, } from "@bitwarden/sdk-internal"; -import { AccessRequestSdkService } from ".."; +import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; export class AccessRequestsSdkService implements AccessRequestSdkService { /** diff --git a/bitwarden_license/bit-web/src/app/pam/services/access-rules-sdk.service.spec.ts b/bitwarden_license/bit-pam/src/services/access-rules-sdk.service.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/services/access-rules-sdk.service.spec.ts rename to bitwarden_license/bit-pam/src/services/access-rules-sdk.service.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/services/access-rules-sdk.service.ts b/bitwarden_license/bit-pam/src/services/access-rules-sdk.service.ts similarity index 98% rename from bitwarden_license/bit-web/src/app/pam/services/access-rules-sdk.service.ts rename to bitwarden_license/bit-pam/src/services/access-rules-sdk.service.ts index 37656c99f1d..71d24ff7c7d 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/access-rules-sdk.service.ts +++ b/bitwarden_license/bit-pam/src/services/access-rules-sdk.service.ts @@ -12,7 +12,7 @@ import type { OrganizationId as SdkOrganizationId, } from "@bitwarden/sdk-internal"; -import { AccessRuleSdkService } from ".."; +import { AccessRuleSdkService } from "../abstractions/access-rule-sdk.service"; export class AccessRulesSdkService extends AccessRuleSdkService { constructor( diff --git a/bitwarden_license/bit-web/src/app/pam/services/approvals-sdk.service.spec.ts b/bitwarden_license/bit-pam/src/services/approvals-sdk.service.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/services/approvals-sdk.service.spec.ts rename to bitwarden_license/bit-pam/src/services/approvals-sdk.service.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/services/approvals-sdk.service.ts b/bitwarden_license/bit-pam/src/services/approvals-sdk.service.ts similarity index 97% rename from bitwarden_license/bit-web/src/app/pam/services/approvals-sdk.service.ts rename to bitwarden_license/bit-pam/src/services/approvals-sdk.service.ts index 4d8efcd7681..4d320bfeb9d 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/approvals-sdk.service.ts +++ b/bitwarden_license/bit-pam/src/services/approvals-sdk.service.ts @@ -10,7 +10,7 @@ import type { AccessRequestView, } from "@bitwarden/sdk-internal"; -import { ApprovalSdkService } from ".."; +import { ApprovalSdkService } from "../abstractions/approval-sdk.service"; export class ApprovalsSdkService implements ApprovalSdkService { constructor( diff --git a/bitwarden_license/bit-web/src/app/pam/services/default-access-event.service.spec.ts b/bitwarden_license/bit-pam/src/services/default-access-event.service.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/services/default-access-event.service.spec.ts rename to bitwarden_license/bit-pam/src/services/default-access-event.service.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/services/default-access-event.service.ts b/bitwarden_license/bit-pam/src/services/default-access-event.service.ts similarity index 95% rename from bitwarden_license/bit-web/src/app/pam/services/default-access-event.service.ts rename to bitwarden_license/bit-pam/src/services/default-access-event.service.ts index 8032a822e9a..28ff5838216 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/default-access-event.service.ts +++ b/bitwarden_license/bit-pam/src/services/default-access-event.service.ts @@ -4,7 +4,7 @@ import { NotificationType } from "@bitwarden/common/enums/notification-type.enum import { NotificationResponse } from "@bitwarden/common/models/response/notification.response"; import { UserId } from "@bitwarden/common/types/guid"; -import { AccessEventService } from ".."; +import { AccessEventService } from "../abstractions/access-event.service"; /** * Reads `notifications$` directly rather than adding a `processNotification` case, which would put diff --git a/bitwarden_license/bit-web/src/app/pam/services/default-access-refresh.service.spec.ts b/bitwarden_license/bit-pam/src/services/default-access-refresh.service.spec.ts similarity index 97% rename from bitwarden_license/bit-web/src/app/pam/services/default-access-refresh.service.spec.ts rename to bitwarden_license/bit-pam/src/services/default-access-refresh.service.spec.ts index 2f6e8efecfc..ba2f563a224 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/default-access-refresh.service.spec.ts +++ b/bitwarden_license/bit-pam/src/services/default-access-refresh.service.spec.ts @@ -1,6 +1,6 @@ import { NEVER, Subject, Subscription } from "rxjs"; -import { AccessEventService } from ".."; +import { AccessEventService } from "../abstractions/access-event.service"; import { DefaultAccessRefreshService } from "./default-access-refresh.service"; diff --git a/bitwarden_license/bit-web/src/app/pam/services/default-access-refresh.service.ts b/bitwarden_license/bit-pam/src/services/default-access-refresh.service.ts similarity index 86% rename from bitwarden_license/bit-web/src/app/pam/services/default-access-refresh.service.ts rename to bitwarden_license/bit-pam/src/services/default-access-refresh.service.ts index 588cc541818..c2f363d5896 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/default-access-refresh.service.ts +++ b/bitwarden_license/bit-pam/src/services/default-access-refresh.service.ts @@ -1,6 +1,7 @@ import { filter, map, merge, Observable, Subject } from "rxjs"; -import { AccessEventService, AccessRefreshService } from ".."; +import { AccessEventService } from "../abstractions/access-event.service"; +import { AccessRefreshService } from "../abstractions/access-refresh.service"; /** * Merges local mutations with the server push, per subscription, so a client that never opens a diff --git a/bitwarden_license/bit-web/src/app/pam/services/default-leasing-error.service.ts b/bitwarden_license/bit-pam/src/services/default-leasing-error.service.ts similarity index 74% rename from bitwarden_license/bit-web/src/app/pam/services/default-leasing-error.service.ts rename to bitwarden_license/bit-pam/src/services/default-leasing-error.service.ts index 045810df241..003a7b5d59a 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/default-leasing-error.service.ts +++ b/bitwarden_license/bit-pam/src/services/default-leasing-error.service.ts @@ -1,6 +1,7 @@ import { isAccessLeaseError, isAccessRequestError, isApprovalError } from "@bitwarden/sdk-internal"; -import { type LeasingError, LeasingErrorService } from ".."; +import { type LeasingError } from "../abstractions/access-lease"; +import { LeasingErrorService } from "../abstractions/leasing-error.service"; /** The only place the wasm-backed error guards are imported at runtime. */ export class DefaultLeasingErrorService implements LeasingErrorService { diff --git a/bitwarden_license/bit-web/src/app/pam/services/pam-membership.spec.ts b/bitwarden_license/bit-pam/src/services/pam-membership.spec.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/services/pam-membership.spec.ts rename to bitwarden_license/bit-pam/src/services/pam-membership.spec.ts diff --git a/bitwarden_license/bit-web/src/app/pam/services/pam-membership.ts b/bitwarden_license/bit-pam/src/services/pam-membership.ts similarity index 100% rename from bitwarden_license/bit-web/src/app/pam/services/pam-membership.ts rename to bitwarden_license/bit-pam/src/services/pam-membership.ts diff --git a/bitwarden_license/bit-pam/tsconfig.json b/bitwarden_license/bit-pam/tsconfig.json new file mode 100644 index 00000000000..2ac91700c60 --- /dev/null +++ b/bitwarden_license/bit-pam/tsconfig.json @@ -0,0 +1,6 @@ +{ + "extends": "../../tsconfig.base", + "files": ["../bit-common/src/platform/sdk/sdk-alias.d.ts"], + "include": ["src"], + "exclude": ["node_modules", "dist"] +} diff --git a/bitwarden_license/bit-pam/tsconfig.spec.json b/bitwarden_license/bit-pam/tsconfig.spec.json new file mode 100644 index 00000000000..fc8520e7376 --- /dev/null +++ b/bitwarden_license/bit-pam/tsconfig.spec.json @@ -0,0 +1,3 @@ +{ + "extends": "./tsconfig.json" +} diff --git a/bitwarden_license/bit-web/src/app/pam/access-audit/access-audit-row.ts b/bitwarden_license/bit-web/src/app/pam/access-audit/access-audit-row.ts index 8b838cf2ae8..6fa0f0ba7be 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-audit/access-audit-row.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-audit/access-audit-row.ts @@ -1,4 +1,4 @@ -import { LabelValue, durationLabel, exactWindow } from "../helpers/approval-window"; +import { LabelValue, durationLabel, exactWindow } from "@bitwarden/bit-pam"; import { AccessAuditEventKind, diff --git a/bitwarden_license/bit-web/src/app/pam/access-audit/access-audit.component.ts b/bitwarden_license/bit-web/src/app/pam/access-audit/access-audit.component.ts index 8af907cc225..1b6b348640a 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-audit/access-audit.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-audit/access-audit.component.ts @@ -19,6 +19,7 @@ import { firstValueFrom, map, switchMap } from "rxjs"; import { OrganizationUserApiService } from "@bitwarden/admin-console/common"; import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; import { NoResults } from "@bitwarden/assets/svg"; +import { selectedFilterStrings } from "@bitwarden/bit-pam"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -58,7 +59,6 @@ import { import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module"; import { AccessNameResolverService } from "../access-requests/access-name-resolver.service"; -import { selectedFilterStrings } from "../helpers/selected-filter-strings"; import { AUDIT_TIME_PERIOD_LABEL_KEYS, diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/access-name-resolver.service.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/access-name-resolver.service.ts index 651ef8deda2..64a8044c48e 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/access-name-resolver.service.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/access-name-resolver.service.ts @@ -2,6 +2,7 @@ import { Injectable, inject } from "@angular/core"; import { firstValueFrom } from "rxjs"; import { CollectionService } from "@bitwarden/admin-console/common"; +import type { AccessRequestView } from "@bitwarden/bit-pam"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -9,8 +10,6 @@ import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.se import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import type { AccessRequestView } from "../abstractions/access-lease"; - /** * Display names from local vault state, keyed by raw id. A missing entry means the id isn't in the * caller's vault; callers fall back to the raw id or render nothing. diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-detail.service.spec.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-detail.service.spec.ts index 5d6a2b3cfbd..d545e242427 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-detail.service.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-detail.service.spec.ts @@ -3,20 +3,16 @@ import { ActivatedRoute, convertToParamMap } from "@angular/router"; import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, Subject, firstValueFrom, of } from "rxjs"; -import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; - import { AccessEventService, AccessLeaseSdkService, AccessRefreshService, AccessRequestSdkService, LeasingErrorService, -} from "../.."; -import type { - AccessLeaseId, - AccessRequestId, - AccessRequestView, -} from "../../abstractions/access-lease"; +} from "@bitwarden/bit-pam"; +import type { AccessLeaseId, AccessRequestId, AccessRequestView } from "@bitwarden/bit-pam"; +import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; + import { ApprovalRow } from "../../approvals/approval-row"; import { ApproverInboxService } from "../../approvals/approver-inbox.service"; import { diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-detail.service.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-detail.service.ts index ae11ec89dd9..a1ca8713930 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-detail.service.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-detail.service.ts @@ -14,11 +14,6 @@ import { switchMap, } from "rxjs"; -import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; -import { getUserId } from "@bitwarden/common/auth/services/account.service"; -import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; -import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; - import { AccessDecisionVerdict, AccessEventService, @@ -31,7 +26,12 @@ import { LeasingErrorService, canApprove, isRequestNoLongerPendingError, -} from "../.."; +} from "@bitwarden/bit-pam"; +import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { getUserId } from "@bitwarden/common/auth/services/account.service"; +import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; + import { ApprovalRow } from "../../approvals/approval-row"; import { ApproverInboxService } from "../../approvals/approver-inbox.service"; import { diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-dialog.component.spec.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-dialog.component.spec.ts index 403331afea2..90b61492c01 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-dialog.component.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-dialog.component.spec.ts @@ -3,12 +3,12 @@ import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, of } from "rxjs"; +import type { AccessRequestView } from "@bitwarden/bit-pam"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DIALOG_DATA, DialogRef, DialogService, ToastService } from "@bitwarden/components"; -import type { AccessRequestView } from "../../abstractions/access-lease"; import { ApprovalRow } from "../../approvals/approval-row"; import { DecideDialogComponent } from "../../approvals/decide-dialog/decide-dialog.component"; import { automaticDecision, humanDecision, selfEndDecision } from "../../testing/decision-builders"; diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-dialog.component.stories.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-dialog.component.stories.ts index 9e9ada3c0a1..3a089513536 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-dialog.component.stories.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-dialog.component.stories.ts @@ -2,13 +2,13 @@ import { importProvidersFrom } from "@angular/core"; import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular"; import { of } from "rxjs"; +import type { AccessRequestView } from "@bitwarden/bit-pam"; import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { DIALOG_DATA, DialogRef, DialogService, ToastService } from "@bitwarden/components"; import { PreloadedEnglishI18nModule } from "@bitwarden/web-vault/app/core/tests"; -import type { AccessRequestView } from "../../abstractions/access-lease"; import { ApprovalRow, toApprovalRow } from "../../approvals/approval-row"; import { DAY, diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-dialog.component.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-dialog.component.ts index b9692669281..48450173a7b 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-dialog.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/access-request-route/access-request-dialog.component.ts @@ -14,6 +14,21 @@ import { takeUntilDestroyed, toSignal } from "@angular/core/rxjs-interop"; import { filter } from "rxjs"; import { NoResults } from "@bitwarden/assets/svg"; +import { + AccessRequestView, + activateAccessErrorMessageKey, + durationLabel, + exactWindow, + humanApprover, + reasonText, + relativeStart, +} from "@bitwarden/bit-pam"; +import type { AccessDecisionVerdict } from "@bitwarden/bit-pam"; +import { + AccessStateBadgeComponent, + DurationShortPipe, + RemainingTimePipe, +} from "@bitwarden/bit-pam-components"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; @@ -33,21 +48,8 @@ import { } from "@bitwarden/components"; import { I18nPipe } from "@bitwarden/ui-common"; -import { - AccessRequestView, - activateAccessErrorMessageKey, - durationLabel, - exactWindow, - humanApprover, - reasonText, - relativeStart, -} from "../.."; -import type { AccessDecisionVerdict } from "../../abstractions/access-lease"; -import { AccessStateBadgeComponent } from "../../access-state-badge/access-state-badge.component"; import { ApproverActionsService } from "../../approvals/approver-actions.service"; import { isLiveManagedLease, isUnstartedApproval } from "../../approvals/managed-lease-row"; -import { DurationShortPipe } from "../../date/duration-short.pipe"; -import { RemainingTimePipe } from "../../date/remaining-time.pipe"; import { RequestSummaryComponent } from "../../request-summary/request-summary.component"; import { SummaryFieldComponent } from "../../request-summary/summary-field.component"; import { emptyResolvedNames, organizationNameFor } from "../access-name-resolver.service"; diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/approvals-tab.component.spec.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/approvals-tab.component.spec.ts index d0a5c7737de..e5d0bb0d50b 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/approvals-tab.component.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/approvals-tab.component.spec.ts @@ -6,12 +6,12 @@ import { provideRouter } from "@angular/router"; import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, of } from "rxjs"; +import type { AccessLeaseId, AccessRequestView } from "@bitwarden/bit-pam"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService, ToastService } from "@bitwarden/components"; -import type { AccessLeaseId, AccessRequestView } from "../abstractions/access-lease"; import { ApprovalRow, toApprovalRow } from "../approvals/approval-row"; import { ApproverInboxService } from "../approvals/approver-inbox.service"; import { ManagedLeaseRow, toManagedLeaseRow } from "../approvals/managed-lease-row"; diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/approvals-tab.component.stories.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/approvals-tab.component.stories.ts index 9f9538e1c27..c12055c5063 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/approvals-tab.component.stories.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/approvals-tab.component.stories.ts @@ -4,13 +4,13 @@ import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/an import { of } from "rxjs"; import { userEvent, within } from "storybook/test"; +import type { AccessLeaseId, AccessRequestView } from "@bitwarden/bit-pam"; import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { DialogService, ToastService } from "@bitwarden/components"; import { PreloadedEnglishI18nModule } from "@bitwarden/web-vault/app/core/tests"; -import type { AccessLeaseId, AccessRequestView } from "../abstractions/access-lease"; import { ApprovalRow, toApprovalRow } from "../approvals/approval-row"; import { ApproverInboxService } from "../approvals/approver-inbox.service"; import { ManagedLeaseRow, toManagedLeaseRow } from "../approvals/managed-lease-row"; diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/approvals-tab.component.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/approvals-tab.component.ts index 851c90e6c80..6f5d54c2ded 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/approvals-tab.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/approvals-tab.component.ts @@ -15,6 +15,13 @@ import { EMPTY, distinctUntilChanged, filter, map, switchMap } from "rxjs"; import { IconComponent } from "@bitwarden/angular/vault/components/icon.component"; import { NoResults } from "@bitwarden/assets/svg"; +import { AccessBadgeState } from "@bitwarden/bit-pam"; +import type { AccessDecisionVerdict } from "@bitwarden/bit-pam"; +import { + AccessBadgeTickerService, + AccessStateBadgeComponent, + DurationShortPipe, +} from "@bitwarden/bit-pam-components"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { skeletonLoadingDelay } from "@bitwarden/common/vault/utils/skeleton-loading.operator"; import { @@ -47,15 +54,10 @@ import { } from "@bitwarden/components"; import { I18nPipe } from "@bitwarden/ui-common"; -import type { AccessDecisionVerdict } from "../abstractions/access-lease"; -import { AccessBadgeState } from "../access-state-badge/access-badge-state"; -import { AccessBadgeTickerService } from "../access-state-badge/access-badge-ticker.service"; -import { AccessStateBadgeComponent } from "../access-state-badge/access-state-badge.component"; import { ApprovalRow } from "../approvals/approval-row"; import { ApproverActionsService, rowBusy } from "../approvals/approver-actions.service"; import { ApproverInboxService } from "../approvals/approver-inbox.service"; import { ManagedLeaseRow } from "../approvals/managed-lease-row"; -import { DurationShortPipe } from "../date/duration-short.pipe"; /** The fields the toolbar filters against, carried by both sections' row models. */ type FilterableRow = { searchText: string; collectionName: string | null; requester: string }; diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/extend-lease-dialog/extend-lease-dialog.component.stories.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/extend-lease-dialog/extend-lease-dialog.component.stories.ts index a2a6c192b6f..6c55765411a 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/extend-lease-dialog/extend-lease-dialog.component.stories.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/extend-lease-dialog/extend-lease-dialog.component.stories.ts @@ -2,11 +2,10 @@ import { importProvidersFrom } from "@angular/core"; import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular"; import { userEvent } from "storybook/test"; +import { ExtendLeaseDialogComponent } from "@bitwarden/bit-pam-components"; import { DialogRef } from "@bitwarden/components"; import { PreloadedEnglishI18nModule } from "@bitwarden/web-vault/app/core/tests"; -import { ExtendLeaseDialogComponent } from "./extend-lease-dialog.component"; - /** The dialog resolves through `DialogRef`; nothing here needs to observe the result. */ const dialogRef = { close: () => {} }; diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/history-row.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/history-row.ts index ab9a557b312..c83ca5212da 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/history-row.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/history-row.ts @@ -1,4 +1,4 @@ -import type { AccessRequestId } from "../abstractions/access-lease"; +import type { AccessRequestId } from "@bitwarden/bit-pam"; import { MyAccessRequestRow } from "./my-access-row"; diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/history-tab.component.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/history-tab.component.ts index 8885bee9fca..c1efada05b4 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/history-tab.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/history-tab.component.ts @@ -24,6 +24,8 @@ import { import { IconComponent } from "@bitwarden/angular/vault/components/icon.component"; import { NoResults } from "@bitwarden/assets/svg"; +import { ElapsedLabel, elapsedLabel, selectedFilterStrings } from "@bitwarden/bit-pam"; +import { AccessBadgeTickerService } from "@bitwarden/bit-pam-components"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { SyncService } from "@bitwarden/common/platform/sync"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; @@ -51,11 +53,8 @@ import { } from "@bitwarden/components"; import { I18nPipe } from "@bitwarden/ui-common"; -import { AccessBadgeTickerService } from "../access-state-badge/access-badge-ticker.service"; import { ApprovalPrivilegeService } from "../approvals/approval-privilege.service"; import { ApproverInboxService } from "../approvals/approver-inbox.service"; -import { ElapsedLabel, elapsedLabel } from "../date/elapsed"; -import { selectedFilterStrings } from "../helpers/selected-filter-strings"; import { HISTORY_STATUS_LABEL_KEYS, diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/my-access-row.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/my-access-row.ts index 9c4dea8c1e7..777cebc634b 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/my-access-row.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/my-access-row.ts @@ -1,6 +1,3 @@ -import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; -import type { BadgeVariant } from "@bitwarden/components"; - import { AccessLeaseId, AccessLeaseStatus, @@ -12,8 +9,10 @@ import { findHumanDecision, humanApprover, requestedWindowSeconds, -} from ".."; -import { AccessBadgeState } from "../access-state-badge/access-badge-state"; + AccessBadgeState, +} from "@bitwarden/bit-pam"; +import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; +import type { BadgeVariant } from "@bitwarden/components"; import { ResolvedNames } from "./access-name-resolver.service"; diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/my-access.service.spec.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/my-access.service.spec.ts index 6a8223c3eb1..4a761625bb3 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/my-access.service.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/my-access.service.spec.ts @@ -2,6 +2,12 @@ import { TestBed } from "@angular/core/testing"; import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, firstValueFrom, Subject } from "rxjs"; +import { + AccessEventService, + AccessLeaseSdkService, + AccessRefreshService, + AccessRequestSdkService, +} from "@bitwarden/bit-pam"; import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import type { AccessLeaseId, @@ -10,13 +16,6 @@ import type { AccessRequestView, } from "@bitwarden/sdk-internal"; -import { - AccessEventService, - AccessLeaseSdkService, - AccessRefreshService, - AccessRequestSdkService, -} from ".."; - import { AccessNameResolverService, ResolvedNames, diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/my-access.service.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/my-access.service.ts index c3d11ae3e53..fee3c227482 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/my-access.service.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/my-access.service.ts @@ -10,10 +10,6 @@ import { map, } from "rxjs"; -import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service"; -import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; -import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; - import { AccessEventService, AccessLeaseId, @@ -23,7 +19,10 @@ import { AccessRequestId, AccessRequestSdkService, AccessRequestView, -} from ".."; +} from "@bitwarden/bit-pam"; +import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { AccessNameResolverService, diff --git a/bitwarden_license/bit-web/src/app/pam/access-requests/my-requests-tab.component.ts b/bitwarden_license/bit-web/src/app/pam/access-requests/my-requests-tab.component.ts index 366ead83a82..e905e0976b7 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-requests/my-requests-tab.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-requests/my-requests-tab.component.ts @@ -13,6 +13,18 @@ import { RouterModule } from "@angular/router"; import { EMPTY, switchMap } from "rxjs"; import { IconComponent } from "@bitwarden/angular/vault/components/icon.component"; +import { + AccessLeaseId, + AccessRequestId, + activateAccessErrorMessageKey, + AccessBadgeState, +} from "@bitwarden/bit-pam"; +import { + AccessBadgeTickerService, + AccessStateBadgeComponent, + DurationShortPipe, + RemainingTimePipe, +} from "@bitwarden/bit-pam-components"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; @@ -41,13 +53,6 @@ import { } from "@bitwarden/components"; import { I18nPipe } from "@bitwarden/ui-common"; -import { AccessLeaseId, AccessRequestId, activateAccessErrorMessageKey } from ".."; -import { AccessBadgeState } from "../access-state-badge/access-badge-state"; -import { AccessBadgeTickerService } from "../access-state-badge/access-badge-ticker.service"; -import { AccessStateBadgeComponent } from "../access-state-badge/access-state-badge.component"; -import { DurationShortPipe } from "../date/duration-short.pipe"; -import { RemainingTimePipe } from "../date/remaining-time.pipe"; - import { MyAccessLeaseRow, MyAccessRequestRow, diff --git a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-collection-badges.component.ts b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-collection-badges.component.ts index f5129e787be..4581628ec99 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-collection-badges.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-collection-badges.component.ts @@ -1,5 +1,6 @@ import { ChangeDetectionStrategy, Component, computed, inject, input } from "@angular/core"; +import { resolveCollectionNames } from "@bitwarden/bit-pam"; import { CollectionAdminView } from "@bitwarden/common/admin-console/models/collections"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; @@ -7,8 +8,6 @@ import { BadgeModule } from "@bitwarden/components"; import type { CollectionId } from "@bitwarden/sdk-internal"; import { I18nPipe } from "@bitwarden/ui-common"; -import { resolveCollectionNames } from ".."; - /** * One count badge for a rule's collections, with their names as its tooltip so the column stays * narrow. diff --git a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-edit/access-rule-edit.component.spec.ts b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-edit/access-rule-edit.component.spec.ts index ba83ba3079a..d3f9657def6 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-edit/access-rule-edit.component.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-edit/access-rule-edit.component.spec.ts @@ -5,12 +5,16 @@ import { ActivatedRoute, provideRouter, Router } from "@angular/router"; import { Observable, of, Subject, throwError } from "rxjs"; import { CollectionAdminService } from "@bitwarden/admin-console/common"; +import { + ACCESS_RULE_DESCRIPTION_MAX_LENGTH, + AccessRuleSdkService, + AccessRuleView, +} from "@bitwarden/bit-pam"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { DialogService, SelectItemView, ToastService } from "@bitwarden/components"; -import { ACCESS_RULE_DESCRIPTION_MAX_LENGTH, AccessRuleSdkService, AccessRuleView } from "../.."; import { GovernedCollectionsService } from "../../services/governed-collections.service"; import { leaveThroughGuard } from "../../testing/unsaved-changes"; diff --git a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-edit/access-rule-edit.component.stories.ts b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-edit/access-rule-edit.component.stories.ts index 8bde0e805aa..15c6c1695eb 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-edit/access-rule-edit.component.stories.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-edit/access-rule-edit.component.stories.ts @@ -13,6 +13,7 @@ import { of } from "rxjs"; import { findByLabelText, findByText, userEvent } from "storybook/test"; import { CollectionAdminService } from "@bitwarden/admin-console/common"; +import { AccessRuleSdkService, AccessRuleView } from "@bitwarden/bit-pam"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; @@ -20,7 +21,6 @@ import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authenticatio import { DialogModule, DialogService, ToastService } from "@bitwarden/components"; import { PreloadedEnglishI18nModule } from "@bitwarden/web-vault/app/core/tests"; -import { AccessRuleSdkService, AccessRuleView } from "../.."; import { GovernedCollectionsService } from "../../services/governed-collections.service"; import { unsavedChangesDialogGuard } from "../../unsaved-changes.guard"; diff --git a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-edit/access-rule-edit.component.ts b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-edit/access-rule-edit.component.ts index 51850fdcc03..41b72505348 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-edit/access-rule-edit.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rule-edit/access-rule-edit.component.ts @@ -15,6 +15,31 @@ import { ActivatedRoute, Router, RouterLink } from "@angular/router"; import { firstValueFrom, map, switchMap } from "rxjs"; import { CollectionAdminService } from "@bitwarden/admin-console/common"; +import { + AccessRuleId, + AccessRuleView, + AccessCondition, + ACCESS_RULE_DESCRIPTION_MAX_LENGTH, + ACCESS_RULE_DURATION_PRESETS, + ACCESS_RULE_NAME_MAX_LENGTH, + accessRuleErrorMessageKey, + accessRuleToFormValue, + AccessRuleSdkService, + AccessRuleErrorField, + AccessRuleErrorOutcome, + classifyAccessRuleError, + conflictingCollectionIds, + DEFAULT_MAX_EXTENSION_DURATION_SECONDS, + EXTENSION_DURATION_OPTIONS, + formValueToRequest, + isAccessRuleNotFound, + isIpAllowlist, + isKnownAccessCondition, + NO_DURATION_CAP, + resolveCollectionNames, + snapToNearestAccessRuleDuration, +} from "@bitwarden/bit-pam"; +import { accessRuleDeleteConfirmOptions } from "@bitwarden/bit-pam-components"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -48,31 +73,6 @@ import { import { isGuid } from "@bitwarden/guid"; import { I18nPipe } from "@bitwarden/ui-common"; -import { - AccessRuleId, - AccessRuleView, - AccessCondition, - ACCESS_RULE_DESCRIPTION_MAX_LENGTH, - ACCESS_RULE_DURATION_PRESETS, - ACCESS_RULE_NAME_MAX_LENGTH, - accessRuleDeleteConfirmOptions, - accessRuleErrorMessageKey, - accessRuleToFormValue, - AccessRuleSdkService, - AccessRuleErrorField, - AccessRuleErrorOutcome, - classifyAccessRuleError, - conflictingCollectionIds, - DEFAULT_MAX_EXTENSION_DURATION_SECONDS, - EXTENSION_DURATION_OPTIONS, - formValueToRequest, - isAccessRuleNotFound, - isIpAllowlist, - isKnownAccessCondition, - NO_DURATION_CAP, - resolveCollectionNames, - snapToNearestAccessRuleDuration, -} from "../.."; import { GovernedCollectionsService } from "../../services/governed-collections.service"; import { HasUnsavedChangesDialog } from "../../unsaved-changes.guard"; import { ACCESS_RULE_TEMPLATES } from "../access-rule-templates"; diff --git a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rules.component.spec.ts b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rules.component.spec.ts index 63a23eb2eff..f394dd73a78 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rules.component.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rules.component.spec.ts @@ -5,6 +5,8 @@ import { ActivatedRoute, provideRouter, Router } from "@angular/router"; import { of } from "rxjs"; import { CollectionAdminService } from "@bitwarden/admin-console/common"; +import { AccessRuleSdkService, AccessRuleView } from "@bitwarden/bit-pam"; +import { accessRuleDeactivateConfirmOptions } from "@bitwarden/bit-pam-components"; import { CollectionAdminView } from "@bitwarden/common/admin-console/models/collections"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -16,7 +18,6 @@ import { } from "@bitwarden/components"; import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module"; -import { accessRuleDeactivateConfirmOptions, AccessRuleSdkService, AccessRuleView } from ".."; import { GovernedCollectionsService } from "../services/governed-collections.service"; import { AccessRulesComponent } from "./access-rules.component"; diff --git a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rules.component.stories.ts b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rules.component.stories.ts index f975377b992..e89b7055c3a 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rules.component.stories.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rules.component.stories.ts @@ -4,11 +4,15 @@ import { applicationConfig, Meta, moduleMetadata, StoryObj } from "@storybook/an import { of } from "rxjs"; import { CollectionAdminService } from "@bitwarden/admin-console/common"; +import { + ACCESS_RULE_DESCRIPTION_MAX_LENGTH, + AccessRuleSdkService, + AccessRuleView, +} from "@bitwarden/bit-pam"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { DialogService, ToastService } from "@bitwarden/components"; import { PreloadedEnglishI18nModule } from "@bitwarden/web-vault/app/core/tests"; -import { ACCESS_RULE_DESCRIPTION_MAX_LENGTH, AccessRuleSdkService, AccessRuleView } from ".."; import { GovernedCollectionsService } from "../services/governed-collections.service"; import { startClockAtStoryNow } from "../testing/story-fixtures"; diff --git a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rules.component.ts b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rules.component.ts index be623558736..a5ba9597668 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-rules/access-rules.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-rules/access-rules.component.ts @@ -12,6 +12,24 @@ import { toSignal } from "@angular/core/rxjs-interop"; import { ActivatedRoute, Router } from "@angular/router"; import { map } from "rxjs"; +import { + AccessRuleFilter, + AccessRuleId, + AccessRuleView, + AccessRuleStatusFilter, + accessRuleErrorMessageKey, + accessRuleMatchesFilter, + classifyAccessRuleError, + copyRuleName, + resolveCollectionNames, + filterRulesToToggle, +} from "@bitwarden/bit-pam"; +import { + accessRuleDeactivateConfirmOptions, + accessRuleDeleteConfirmOptions, + DurationLongPipe, + RelativeTimePipe, +} from "@bitwarden/bit-pam-components"; import { CollectionAdminView } from "@bitwarden/common/admin-console/models/collections"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; @@ -45,22 +63,6 @@ import { import { I18nPipe } from "@bitwarden/ui-common"; import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module"; -import { - AccessRuleFilter, - AccessRuleId, - AccessRuleView, - AccessRuleStatusFilter, - accessRuleDeactivateConfirmOptions, - accessRuleDeleteConfirmOptions, - accessRuleErrorMessageKey, - accessRuleMatchesFilter, - classifyAccessRuleError, - copyRuleName, - resolveCollectionNames, - filterRulesToToggle, -} from ".."; -import { DurationLongPipe } from "../date/duration-long.pipe"; -import { RelativeTimePipe } from "../date/relative-time.pipe"; import { AccessRulesService } from "../services/access-rules.service"; import { AccessRuleCollectionBadgesComponent } from "./access-rule-collection-badges.component"; diff --git a/bitwarden_license/bit-web/src/app/pam/access-rules/approval-method.pipe.spec.ts b/bitwarden_license/bit-web/src/app/pam/access-rules/approval-method.pipe.spec.ts index ef4d970a4fc..58b7db448fb 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-rules/approval-method.pipe.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-rules/approval-method.pipe.spec.ts @@ -1,10 +1,9 @@ import { TestBed } from "@angular/core/testing"; import { mock } from "jest-mock-extended"; +import { AccessCondition } from "@bitwarden/bit-pam"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { AccessCondition } from "../abstractions/access-rule"; - import { ApprovalMethodPipe } from "./approval-method.pipe"; describe("ApprovalMethodPipe", () => { diff --git a/bitwarden_license/bit-web/src/app/pam/access-rules/approval-method.pipe.ts b/bitwarden_license/bit-web/src/app/pam/access-rules/approval-method.pipe.ts index c63796dcbae..abe101fc904 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-rules/approval-method.pipe.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-rules/approval-method.pipe.ts @@ -1,9 +1,8 @@ import { Pipe, PipeTransform, inject } from "@angular/core"; +import { AccessCondition, approvalMethodLabelKeys } from "@bitwarden/bit-pam"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { AccessCondition, approvalMethodLabelKeys } from ".."; - @Pipe({ name: "approvalMethod" }) export class ApprovalMethodPipe implements PipeTransform { private readonly i18nService = inject(I18nService); diff --git a/bitwarden_license/bit-web/src/app/pam/access-state-badge/access-state-badge.component.stories.ts b/bitwarden_license/bit-web/src/app/pam/access-state-badge/access-state-badge.component.stories.ts index 54bcc10675b..f7dec4a9d34 100644 --- a/bitwarden_license/bit-web/src/app/pam/access-state-badge/access-state-badge.component.stories.ts +++ b/bitwarden_license/bit-web/src/app/pam/access-state-badge/access-state-badge.component.stories.ts @@ -1,11 +1,10 @@ import { Meta, StoryObj, moduleMetadata } from "@storybook/angular"; +import { AccessBadgeState } from "@bitwarden/bit-pam"; +import { AccessStateBadgeComponent } from "@bitwarden/bit-pam-components"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { I18nMockService } from "@bitwarden/components"; -import { AccessBadgeState } from "./access-badge-state"; -import { AccessStateBadgeComponent } from "./access-state-badge.component"; - const MINUTE = 60 * 1000; const HOUR = 60 * MINUTE; diff --git a/bitwarden_license/bit-web/src/app/pam/approvals/approval-row.spec.ts b/bitwarden_license/bit-web/src/app/pam/approvals/approval-row.spec.ts index fe1da762339..4a801143703 100644 --- a/bitwarden_license/bit-web/src/app/pam/approvals/approval-row.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/approvals/approval-row.spec.ts @@ -1,4 +1,5 @@ -import type { AccessRequestView } from "../abstractions/access-lease"; +import type { AccessRequestView } from "@bitwarden/bit-pam"; + import { ResolvedNames, emptyResolvedNames } from "../access-requests/access-name-resolver.service"; import { sortApprovalRows, toApprovalRow } from "./approval-row"; diff --git a/bitwarden_license/bit-web/src/app/pam/approvals/approval-row.ts b/bitwarden_license/bit-web/src/app/pam/approvals/approval-row.ts index bfc0e9799ab..19cbe252a5c 100644 --- a/bitwarden_license/bit-web/src/app/pam/approvals/approval-row.ts +++ b/bitwarden_license/bit-web/src/app/pam/approvals/approval-row.ts @@ -1,18 +1,19 @@ -import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; - -import type { AccessRequestId, AccessRequestView } from "../abstractions/access-lease"; -import { - ResolvedNames, - organizationNameFor, -} from "../access-requests/access-name-resolver.service"; -import { ElapsedLabel, elapsedLabel } from "../date/elapsed"; import { + ElapsedLabel, + elapsedLabel, durationLabel, exactWindow, LabelValue, reasonText, relativeStart, -} from "../helpers/approval-window"; +} from "@bitwarden/bit-pam"; +import type { AccessRequestId, AccessRequestView } from "@bitwarden/bit-pam"; +import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; + +import { + ResolvedNames, + organizationNameFor, +} from "../access-requests/access-name-resolver.service"; /** * A row in the approver's inbox. Display values are precomputed because `bitSortable` sorts on diff --git a/bitwarden_license/bit-web/src/app/pam/approvals/approver-actions.service.spec.ts b/bitwarden_license/bit-web/src/app/pam/approvals/approver-actions.service.spec.ts index 6d197bcc9c1..712c1fb4485 100644 --- a/bitwarden_license/bit-web/src/app/pam/approvals/approver-actions.service.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/approvals/approver-actions.service.spec.ts @@ -3,12 +3,11 @@ import { TestBed } from "@angular/core/testing"; import { mock, MockProxy } from "jest-mock-extended"; import { of } from "rxjs"; +import { DECIDE_ACCESS_SERVER_ERRORS } from "@bitwarden/bit-pam"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { DialogService, ToastService } from "@bitwarden/components"; -import { DECIDE_ACCESS_SERVER_ERRORS } from "../helpers/decide-access-error"; - import { ApproverActionsService, rowBusy } from "./approver-actions.service"; import { DecideDialogComponent, DecideDialogParams } from "./decide-dialog/decide-dialog.component"; diff --git a/bitwarden_license/bit-web/src/app/pam/approvals/approver-actions.service.ts b/bitwarden_license/bit-web/src/app/pam/approvals/approver-actions.service.ts index dc1257edb31..57e40ac5f0b 100644 --- a/bitwarden_license/bit-web/src/app/pam/approvals/approver-actions.service.ts +++ b/bitwarden_license/bit-web/src/app/pam/approvals/approver-actions.service.ts @@ -1,13 +1,12 @@ import { Injectable, WritableSignal, inject } from "@angular/core"; import { firstValueFrom } from "rxjs"; +import { decideAccessErrorMessageKey } from "@bitwarden/bit-pam"; +import type { AccessDecisionVerdict } from "@bitwarden/bit-pam"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { DialogService, ToastService } from "@bitwarden/components"; -import type { AccessDecisionVerdict } from "../abstractions/access-lease"; -import { decideAccessErrorMessageKey } from "../helpers/decide-access-error"; - import { DecideDialogComponent, DecideDialogParams } from "./decide-dialog/decide-dialog.component"; /** Raised once the approver confirms and the mutation starts; lowered once it settles. */ diff --git a/bitwarden_license/bit-web/src/app/pam/approvals/approver-inbox.service.spec.ts b/bitwarden_license/bit-web/src/app/pam/approvals/approver-inbox.service.spec.ts index 2f6a10ff0e4..195301b4372 100644 --- a/bitwarden_license/bit-web/src/app/pam/approvals/approver-inbox.service.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/approvals/approver-inbox.service.spec.ts @@ -2,27 +2,23 @@ import { TestBed } from "@angular/core/testing"; import { mock, MockProxy } from "jest-mock-extended"; import { Subject, firstValueFrom, of } from "rxjs"; -import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; -import { UserId } from "@bitwarden/common/types/guid"; - import { AccessEventService, AccessLeaseSdkService, AccessRefreshService, AccessRequestSdkService, ApprovalSdkService, -} from ".."; -import type { - AccessLeaseId, - AccessRequestId, - AccessRequestView, -} from "../abstractions/access-lease"; + DECIDE_ACCESS_SERVER_ERRORS, +} from "@bitwarden/bit-pam"; +import type { AccessLeaseId, AccessRequestId, AccessRequestView } from "@bitwarden/bit-pam"; +import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { UserId } from "@bitwarden/common/types/guid"; + import { AccessNameResolverService, ResolvedNames, emptyResolvedNames, } from "../access-requests/access-name-resolver.service"; -import { DECIDE_ACCESS_SERVER_ERRORS } from "../helpers/decide-access-error"; import { humanDecision } from "../testing/decision-builders"; import { ApproverInboxService } from "./approver-inbox.service"; diff --git a/bitwarden_license/bit-web/src/app/pam/approvals/approver-inbox.service.ts b/bitwarden_license/bit-web/src/app/pam/approvals/approver-inbox.service.ts index ea72094a9b0..6a904ab55b3 100644 --- a/bitwarden_license/bit-web/src/app/pam/approvals/approver-inbox.service.ts +++ b/bitwarden_license/bit-web/src/app/pam/approvals/approver-inbox.service.ts @@ -11,11 +11,6 @@ import { merge, } from "rxjs"; -import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; -import { getUserId } from "@bitwarden/common/auth/services/account.service"; -import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; -import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; - import { AccessDecisionVerdict, AccessEventService, @@ -28,7 +23,12 @@ import { ApprovalSdkService, canApprove, isRequestNoLongerPendingError, -} from ".."; +} from "@bitwarden/bit-pam"; +import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { getUserId } from "@bitwarden/common/auth/services/account.service"; +import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; +import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; + import { AccessNameResolverService, ResolvedNames, diff --git a/bitwarden_license/bit-web/src/app/pam/approvals/decide-dialog/decide-dialog.component.spec.ts b/bitwarden_license/bit-web/src/app/pam/approvals/decide-dialog/decide-dialog.component.spec.ts index 16231b6e6dc..9b346c4eab6 100644 --- a/bitwarden_license/bit-web/src/app/pam/approvals/decide-dialog/decide-dialog.component.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/approvals/decide-dialog/decide-dialog.component.spec.ts @@ -1,10 +1,10 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; +import type { AccessDecisionVerdict, AccessRequestView } from "@bitwarden/bit-pam"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { DIALOG_DATA, DialogRef } from "@bitwarden/components"; -import type { AccessDecisionVerdict, AccessRequestView } from "../../abstractions/access-lease"; import { emptyResolvedNames } from "../../access-requests/access-name-resolver.service"; import { ApprovalRow, toApprovalRow } from "../approval-row"; diff --git a/bitwarden_license/bit-web/src/app/pam/approvals/decide-dialog/decide-dialog.component.stories.ts b/bitwarden_license/bit-web/src/app/pam/approvals/decide-dialog/decide-dialog.component.stories.ts index 9c35ba67cf1..b38daa3d529 100644 --- a/bitwarden_license/bit-web/src/app/pam/approvals/decide-dialog/decide-dialog.component.stories.ts +++ b/bitwarden_license/bit-web/src/app/pam/approvals/decide-dialog/decide-dialog.component.stories.ts @@ -1,10 +1,10 @@ import { importProvidersFrom } from "@angular/core"; import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular"; +import type { AccessRequestView } from "@bitwarden/bit-pam"; import { DIALOG_DATA, DialogRef } from "@bitwarden/components"; import { PreloadedEnglishI18nModule } from "@bitwarden/web-vault/app/core/tests"; -import type { AccessRequestView } from "../../abstractions/access-lease"; import { emptyResolvedNames } from "../../access-requests/access-name-resolver.service"; import { ApprovalRow, toApprovalRow } from "../approval-row"; diff --git a/bitwarden_license/bit-web/src/app/pam/approvals/decide-dialog/decide-dialog.component.ts b/bitwarden_license/bit-web/src/app/pam/approvals/decide-dialog/decide-dialog.component.ts index 9390b7a721d..a37d07713e7 100644 --- a/bitwarden_license/bit-web/src/app/pam/approvals/decide-dialog/decide-dialog.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/approvals/decide-dialog/decide-dialog.component.ts @@ -12,6 +12,7 @@ import { import { toSignal } from "@angular/core/rxjs-interop"; import { FormBuilder, ReactiveFormsModule, Validators } from "@angular/forms"; +import type { AccessDecisionVerdict } from "@bitwarden/bit-pam"; import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils"; import { AsyncActionsModule, @@ -27,7 +28,6 @@ import { } from "@bitwarden/components"; import { I18nPipe } from "@bitwarden/ui-common"; -import type { AccessDecisionVerdict } from "../../abstractions/access-lease"; import { RequestSummaryComponent } from "../../request-summary/request-summary.component"; import { ApprovalRow } from "../approval-row"; diff --git a/bitwarden_license/bit-web/src/app/pam/approvals/inbox-request-filter.ts b/bitwarden_license/bit-web/src/app/pam/approvals/inbox-request-filter.ts index d8e57844697..cc0ca1fb15c 100644 --- a/bitwarden_license/bit-web/src/app/pam/approvals/inbox-request-filter.ts +++ b/bitwarden_license/bit-web/src/app/pam/approvals/inbox-request-filter.ts @@ -1,4 +1,4 @@ -import type { AccessRequestView } from "../abstractions/access-lease"; +import type { AccessRequestView } from "@bitwarden/bit-pam"; type TimeBoundedRequest = Pick; diff --git a/bitwarden_license/bit-web/src/app/pam/approvals/managed-lease-row.ts b/bitwarden_license/bit-web/src/app/pam/approvals/managed-lease-row.ts index 7cab63f3794..f7d81868446 100644 --- a/bitwarden_license/bit-web/src/app/pam/approvals/managed-lease-row.ts +++ b/bitwarden_license/bit-web/src/app/pam/approvals/managed-lease-row.ts @@ -1,12 +1,12 @@ -import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; - import type { AccessLeaseId, AccessLeaseStatus, AccessRequestId, AccessRequestStatus, AccessRequestView, -} from "../abstractions/access-lease"; +} from "@bitwarden/bit-pam"; +import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; + import { ResolvedNames } from "../access-requests/access-name-resolver.service"; import { LeaseExtensionSummary } from "../access-requests/my-access-row"; diff --git a/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/cipher-view-banner.component.stories.ts b/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/cipher-view-banner.component.stories.ts index 78f5a5c3fdb..d7363975f2f 100644 --- a/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/cipher-view-banner.component.stories.ts +++ b/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/cipher-view-banner.component.stories.ts @@ -2,6 +2,17 @@ import { importProvidersFrom } from "@angular/core"; import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular"; import { EMPTY, of } from "rxjs"; +import { + AccessLeaseSdkService, + AccessRefreshService, + AccessRequestSdkService, + LeasingErrorService, +} from "@bitwarden/bit-pam"; +import { + AccessRequestCancelService, + MyLeasesService, + CipherViewBannerComponent, +} from "@bitwarden/bit-pam-components"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -11,12 +22,6 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService, ToastService } from "@bitwarden/components"; import { PreloadedEnglishI18nModule } from "@bitwarden/web-vault/app/core/tests"; -import { AccessLeaseSdkService } from "../abstractions/access-lease-sdk.service"; -import { AccessRefreshService } from "../abstractions/access-refresh.service"; -import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; -import { LeasingErrorService } from "../abstractions/leasing-error.service"; -import { AccessRequestCancelService } from "../services/access-request-cancel.service"; -import { MyLeasesService } from "../services/my-leases.service"; import { HOUR, MINUTE, @@ -28,8 +33,6 @@ import { startClockAtStoryNow, } from "../testing/story-fixtures"; -import { CipherViewBannerComponent } from "./cipher-view-banner.component"; - const ORGANIZATION_ID = "org-1"; function organization(licensed: boolean): Organization { diff --git a/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/gated-cipher-view.stories.ts b/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/gated-cipher-view.stories.ts index 9540e23f9a7..3b9cda2c4f5 100644 --- a/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/gated-cipher-view.stories.ts +++ b/bitwarden_license/bit-web/src/app/pam/cipher-view-banner/gated-cipher-view.stories.ts @@ -5,6 +5,18 @@ import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/an import { EMPTY, of } from "rxjs"; import { CollectionService } from "@bitwarden/admin-console/common"; +import { + AccessLeaseSdkService, + AccessRefreshService, + AccessRequestSdkService, + LeasingErrorService, +} from "@bitwarden/bit-pam"; +import { + ItemDetailsStateBadgeComponent, + AccessRequestCancelService, + MyLeasesService, + CipherViewBannerComponent, +} from "@bitwarden/bit-pam-components"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service"; @@ -30,13 +42,6 @@ import { DialogService, ToastService } from "@bitwarden/components"; import { CipherViewComponent, CIPHER_VIEW_BANNER, ITEM_DETAILS_BADGE } from "@bitwarden/vault"; import { PreloadedEnglishI18nModule } from "@bitwarden/web-vault/app/core/tests"; -import { AccessLeaseSdkService } from "../abstractions/access-lease-sdk.service"; -import { AccessRefreshService } from "../abstractions/access-refresh.service"; -import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; -import { LeasingErrorService } from "../abstractions/leasing-error.service"; -import { ItemDetailsStateBadgeComponent } from "../item-details-state-badge/item-details-state-badge.component"; -import { AccessRequestCancelService } from "../services/access-request-cancel.service"; -import { MyLeasesService } from "../services/my-leases.service"; import { DAY, HOUR, @@ -48,8 +53,6 @@ import { startClockAtStoryNow, } from "../testing/story-fixtures"; -import { CipherViewBannerComponent } from "./cipher-view-banner.component"; - /** * The composed cipher view, showing card order and the name-row badge. Every vault item renders * through these templates, so {@link OrdinaryLogin} must show neither outlet. diff --git a/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/access-rule-summary.spec.ts b/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/access-rule-summary.spec.ts index dcd1ca9c784..dd9efa3a83f 100644 --- a/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/access-rule-summary.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/access-rule-summary.spec.ts @@ -1,4 +1,4 @@ -import type { AccessRuleView } from "../abstractions/access-rule"; +import type { AccessRuleView } from "@bitwarden/bit-pam"; import { accessRuleSummaryKeys, rulesGoverningCollection } from "./access-rule-summary"; diff --git a/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/access-rule-summary.ts b/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/access-rule-summary.ts index f3f81a9df47..1dc5c7d074f 100644 --- a/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/access-rule-summary.ts +++ b/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/access-rule-summary.ts @@ -1,5 +1,5 @@ -import type { AccessRuleView } from "../abstractions/access-rule"; -import { approvalMethodLabelKeys } from "../helpers/approval-method"; +import { approvalMethodLabelKeys } from "@bitwarden/bit-pam"; +import type { AccessRuleView } from "@bitwarden/bit-pam"; type SummarizableRule = Pick; diff --git a/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/collection-access-rule-callout.component.spec.ts b/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/collection-access-rule-callout.component.spec.ts index 18c5aab9d44..437a963be3d 100644 --- a/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/collection-access-rule-callout.component.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/collection-access-rule-callout.component.spec.ts @@ -3,14 +3,14 @@ import { provideRouter } from "@angular/router"; import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject } from "rxjs"; +import { AccessRuleSdkService } from "@bitwarden/bit-pam"; +import type { AccessRuleView } from "@bitwarden/bit-pam"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid"; import { DialogRef } from "@bitwarden/components"; -import { AccessRuleSdkService } from ".."; -import type { AccessRuleView } from "../abstractions/access-rule"; import { GovernedCollectionsService } from "../services/governed-collections.service"; import { CollectionAccessRuleCalloutComponent } from "./collection-access-rule-callout.component"; diff --git a/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/collection-access-rule-callout.component.stories.ts b/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/collection-access-rule-callout.component.stories.ts index 7531fde27b0..05d0820f210 100644 --- a/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/collection-access-rule-callout.component.stories.ts +++ b/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/collection-access-rule-callout.component.stories.ts @@ -3,11 +3,11 @@ import { RouterModule } from "@angular/router"; import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular"; import { of } from "rxjs"; +import type { AccessRuleView } from "@bitwarden/bit-pam"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid"; import { PreloadedEnglishI18nModule } from "@bitwarden/web-vault/app/core/tests"; -import type { AccessRuleView } from "../abstractions/access-rule"; import { GovernedCollectionsService } from "../services/governed-collections.service"; import { CollectionAccessRuleCalloutComponent } from "./collection-access-rule-callout.component"; diff --git a/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/collection-access-rule-callout.component.ts b/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/collection-access-rule-callout.component.ts index 9099ec17248..984d2588687 100644 --- a/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/collection-access-rule-callout.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/collection-access-rule-callout/collection-access-rule-callout.component.ts @@ -3,6 +3,7 @@ import { toObservable, toSignal } from "@angular/core/rxjs-interop"; import { RouterLink } from "@angular/router"; import { combineLatest, map, of, switchMap } from "rxjs"; +import { AccessRuleView } from "@bitwarden/bit-pam"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -10,7 +11,6 @@ import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid"; import { CalloutModule, DialogRef, LinkModule } from "@bitwarden/components"; import { I18nPipe } from "@bitwarden/ui-common"; -import { AccessRuleView } from ".."; import { GovernedCollectionsService } from "../services/governed-collections.service"; import { accessRuleSummaryKeys, rulesGoverningCollection } from "./access-rule-summary"; diff --git a/bitwarden_license/bit-web/src/app/pam/gated-collection-banner/gated-collection-banner.component.spec.ts b/bitwarden_license/bit-web/src/app/pam/gated-collection-banner/gated-collection-banner.component.spec.ts index 49ab9db1662..f6a4fa8b59b 100644 --- a/bitwarden_license/bit-web/src/app/pam/gated-collection-banner/gated-collection-banner.component.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/gated-collection-banner/gated-collection-banner.component.spec.ts @@ -2,13 +2,13 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, of, Subject } from "rxjs"; +import type { AccessRuleView } from "@bitwarden/bit-pam"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid"; -import type { AccessRuleView } from "../abstractions/access-rule"; import { GovernedCollectionsService } from "../services/governed-collections.service"; import { GatedCollectionBannerComponent } from "./gated-collection-banner.component"; diff --git a/bitwarden_license/bit-web/src/app/pam/provide-pam.ts b/bitwarden_license/bit-web/src/app/pam/provide-pam.ts index 6f00bd5ebdc..957695311a0 100644 --- a/bitwarden_license/bit-web/src/app/pam/provide-pam.ts +++ b/bitwarden_license/bit-web/src/app/pam/provide-pam.ts @@ -1,5 +1,28 @@ import { NgZone } from "@angular/core"; +import { + AccessLeasesSdkService, + AccessRequestsSdkService, + AccessRulesSdkService, + ApprovalsSdkService, + DefaultAccessEventService, + DefaultAccessRefreshService, + DefaultLeasingErrorService, + AccessEventService, + ApprovalSdkService, + AccessLeaseSdkService, + AccessRefreshService, + AccessRequestSdkService, + AccessRuleSdkService, + LeasingErrorService, +} from "@bitwarden/bit-pam"; +import { + AccessBadgeTickerService, + CipherViewBannerComponent, + ItemDetailsStateBadgeComponent, + AccessRequestCancelService, + MyLeasesService, +} from "@bitwarden/bit-pam-components"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -30,26 +53,16 @@ import { VAULT_CONTROLLED_ACCESS_FILTER } from "@bitwarden/web-vault/app/vault/i import { VAULT_FILTER_GATED_COLLECTION_INDICATOR } from "@bitwarden/web-vault/app/vault/individual-vault/vault-filter/shared/components/pam/vault-filter-gated-collection-indicator.token"; import { VAULT_GATED_COLLECTION_BANNER } from "@bitwarden/web-vault/app/vault/individual-vault/vault-gated-collection-banner.token"; +import { AuditApiService } from "./access-audit/audit-api.service"; import { DefaultAuditApiService } from "./access-audit/default-audit-api.service"; import { CidrValidationService } from "./access-rules/access-rule-edit/ip-allowlist/cidr-validation.service"; import { DefaultCidrValidationService } from "./access-rules/access-rule-edit/ip-allowlist/default-cidr-validation.service"; -import { AccessBadgeTickerService } from "./access-state-badge/access-badge-ticker.service"; import { ApprovalPrivilegeService } from "./approvals/approval-privilege.service"; -import { CipherViewBannerComponent } from "./cipher-view-banner/cipher-view-banner.component"; import { CollectionAccessRuleCalloutComponent } from "./collection-access-rule-callout/collection-access-rule-callout.component"; import { GatedCollectionBannerComponent } from "./gated-collection-banner/gated-collection-banner.component"; -import { ItemDetailsStateBadgeComponent } from "./item-details-state-badge/item-details-state-badge.component"; import { DefaultRotationSdkService } from "./rotation/default-rotation-sdk.service"; -import { AccessLeasesSdkService } from "./services/access-leases-sdk.service"; -import { AccessRequestCancelService } from "./services/access-request-cancel.service"; -import { AccessRequestsSdkService } from "./services/access-requests-sdk.service"; -import { AccessRulesSdkService } from "./services/access-rules-sdk.service"; -import { ApprovalsSdkService } from "./services/approvals-sdk.service"; -import { DefaultAccessEventService } from "./services/default-access-event.service"; -import { DefaultAccessRefreshService } from "./services/default-access-refresh.service"; -import { DefaultLeasingErrorService } from "./services/default-leasing-error.service"; +import { RotationSdkService } from "./rotation/rotation-sdk.service"; import { GovernedCollectionsService } from "./services/governed-collections.service"; -import { MyLeasesService } from "./services/my-leases.service"; import { DefaultPamNavBadgeService } from "./services/pam-nav-badge.service"; import { PamRevealedCipherService } from "./services/pam-revealed-cipher.service"; import { DefaultVaultRowAccessActionsService } from "./services/vault-row-access-actions.service"; @@ -60,18 +73,6 @@ import { GatedCollectionFilterIndicatorComponent } from "./vault-filter-gated-co import { controlledAccessColumn } from "./vault-item-column/controlled-access-column"; import { VaultRowLeaseBadgeComponent } from "./vault-row-lease-badge/vault-row-lease-badge.component"; -import { - AccessEventService, - ApprovalSdkService, - AuditApiService, - AccessLeaseSdkService, - AccessRefreshService, - AccessRequestSdkService, - AccessRuleSdkService, - LeasingErrorService, - RotationSdkService, -} from "."; - /** PAM's root-level providers, including every OSS seam it fills. */ export function providePam(): SafeProvider[] { return [ diff --git a/bitwarden_license/bit-web/src/app/pam/request-summary/request-summary.component.ts b/bitwarden_license/bit-web/src/app/pam/request-summary/request-summary.component.ts index 32391f122d6..076332a5315 100644 --- a/bitwarden_license/bit-web/src/app/pam/request-summary/request-summary.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/request-summary/request-summary.component.ts @@ -1,13 +1,12 @@ import { ChangeDetectionStrategy, Component, computed, inject, input } from "@angular/core"; import { IconComponent as VaultIconComponent } from "@bitwarden/angular/vault/components/icon.component"; +import type { LabelValue } from "@bitwarden/bit-pam"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils"; import { CardComponent, IconModule, TypographyModule } from "@bitwarden/components"; import { I18nPipe } from "@bitwarden/ui-common"; -import type { LabelValue } from "../helpers/approval-window"; - import { SummaryFieldComponent } from "./summary-field.component"; /** diff --git a/bitwarden_license/bit-web/src/app/pam/rotation/access-connectors/access-connector-detail.component.ts b/bitwarden_license/bit-web/src/app/pam/rotation/access-connectors/access-connector-detail.component.ts index 4ee85ec4603..f8c9a371c4d 100644 --- a/bitwarden_license/bit-web/src/app/pam/rotation/access-connectors/access-connector-detail.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/rotation/access-connectors/access-connector-detail.component.ts @@ -5,6 +5,10 @@ import { FormBuilder, ReactiveFormsModule } from "@angular/forms"; import { ActivatedRoute, Router } from "@angular/router"; import { map } from "rxjs"; +import { + accessConnectorDeactivateConfirmOptions, + accessConnectorDeleteConfirmOptions, +} from "@bitwarden/bit-pam-components"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { asUuid } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; @@ -33,10 +37,6 @@ import { import type { CipherId } from "@bitwarden/sdk-internal"; import { I18nPipe } from "@bitwarden/ui-common"; -import { - accessConnectorDeactivateConfirmOptions, - accessConnectorDeleteConfirmOptions, -} from "../../helpers/access-connector-confirm"; import { HasUnsavedChangesDialog } from "../../unsaved-changes.guard"; import { AssignmentPickerColumn, diff --git a/bitwarden_license/bit-web/src/app/pam/rotation/access-connectors/access-connectors-tab.component.ts b/bitwarden_license/bit-web/src/app/pam/rotation/access-connectors/access-connectors-tab.component.ts index cd56ebb6abe..b902d34a305 100644 --- a/bitwarden_license/bit-web/src/app/pam/rotation/access-connectors/access-connectors-tab.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/rotation/access-connectors/access-connectors-tab.component.ts @@ -13,6 +13,10 @@ import { ActivatedRoute, Router } from "@angular/router"; import { filter, firstValueFrom, map } from "rxjs"; import { NoResults } from "@bitwarden/assets/svg"; +import { + accessConnectorDeactivateConfirmOptions, + accessConnectorDeleteConfirmOptions, +} from "@bitwarden/bit-pam-components"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { asUuid } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; @@ -47,10 +51,6 @@ import { } from "@bitwarden/components"; import { I18nPipe } from "@bitwarden/ui-common"; -import { - accessConnectorDeactivateConfirmOptions, - accessConnectorDeleteConfirmOptions, -} from "../../helpers/access-connector-confirm"; import { assignableTargetSystems } from "../assignable"; import { filterOptions } from "../filter-options"; import { AccessConnectorId, TargetSystemId, TargetSystemView } from "../rotation"; diff --git a/bitwarden_license/bit-web/src/app/pam/rotation/rotation-error.ts b/bitwarden_license/bit-web/src/app/pam/rotation/rotation-error.ts index 05ee426adc3..e7469bebd40 100644 --- a/bitwarden_license/bit-web/src/app/pam/rotation/rotation-error.ts +++ b/bitwarden_license/bit-web/src/app/pam/rotation/rotation-error.ts @@ -1,4 +1,4 @@ -import { apiErrorBodyMessage } from "../abstractions/api-error"; +import { apiErrorBodyMessage } from "@bitwarden/bit-pam"; import type { RotationError, TargetSystemCreateError, TargetSystemId } from "./rotation"; diff --git a/bitwarden_license/bit-web/src/app/pam/rotation/target-systems/target-system-edit.component.ts b/bitwarden_license/bit-web/src/app/pam/rotation/target-systems/target-system-edit.component.ts index bb9688d2326..d9b75ad6e96 100644 --- a/bitwarden_license/bit-web/src/app/pam/rotation/target-systems/target-system-edit.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/rotation/target-systems/target-system-edit.component.ts @@ -13,6 +13,7 @@ import { } from "@angular/forms"; import { ActivatedRoute, Router } from "@angular/router"; +import { apiErrorBodyMessage } from "@bitwarden/bit-pam"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { asUuid, uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; @@ -42,7 +43,6 @@ import { } from "@bitwarden/components"; import { I18nPipe } from "@bitwarden/ui-common"; -import { apiErrorBodyMessage } from "../../abstractions/api-error"; import { HasUnsavedChangesDialog } from "../../unsaved-changes.guard"; import { accessConnectorConnectionLabelKey, diff --git a/bitwarden_license/bit-web/src/app/pam/services/access-rules.service.spec.ts b/bitwarden_license/bit-web/src/app/pam/services/access-rules.service.spec.ts index 969533b560c..44a34f1335a 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/access-rules.service.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/services/access-rules.service.spec.ts @@ -2,11 +2,10 @@ import { TestBed } from "@angular/core/testing"; import { firstValueFrom, of } from "rxjs"; import { CollectionAdminService } from "@bitwarden/admin-console/common"; +import { AccessRuleSdkService, AccessRuleView } from "@bitwarden/bit-pam"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { AccessRuleSdkService, AccessRuleView } from ".."; - import { AccessRulesService } from "./access-rules.service"; import { GovernedCollectionsService } from "./governed-collections.service"; diff --git a/bitwarden_license/bit-web/src/app/pam/services/access-rules.service.ts b/bitwarden_license/bit-web/src/app/pam/services/access-rules.service.ts index 335bbabdfe1..6c72ed56c1f 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/access-rules.service.ts +++ b/bitwarden_license/bit-web/src/app/pam/services/access-rules.service.ts @@ -2,19 +2,18 @@ import { Injectable, inject } from "@angular/core"; import { BehaviorSubject, Observable, firstValueFrom } from "rxjs"; import { CollectionAdminService } from "@bitwarden/admin-console/common"; -import { CollectionAdminView } from "@bitwarden/common/admin-console/models/collections"; -import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; -import { getUserId } from "@bitwarden/common/auth/services/account.service"; -import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; -import { OrganizationId } from "@bitwarden/common/types/guid"; - import { AccessRuleSdkService, AccessRuleView, accessRuleToCopyRequest, accessRuleToRequest, filterRulesToToggle, -} from ".."; +} from "@bitwarden/bit-pam"; +import { CollectionAdminView } from "@bitwarden/common/admin-console/models/collections"; +import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { getUserId } from "@bitwarden/common/auth/services/account.service"; +import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; +import { OrganizationId } from "@bitwarden/common/types/guid"; import { GovernedCollectionsService } from "./governed-collections.service"; diff --git a/bitwarden_license/bit-web/src/app/pam/services/governed-collections.service.spec.ts b/bitwarden_license/bit-web/src/app/pam/services/governed-collections.service.spec.ts index a4251a5fd04..feaaee1f62e 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/governed-collections.service.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/services/governed-collections.service.spec.ts @@ -1,12 +1,11 @@ import { mock, MockProxy } from "jest-mock-extended"; import { firstValueFrom } from "rxjs"; +import { AccessRuleSdkService } from "@bitwarden/bit-pam"; +import type { AccessRuleView } from "@bitwarden/bit-pam"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { OrganizationId } from "@bitwarden/common/types/guid"; -import type { AccessRuleView } from "../abstractions/access-rule"; -import { AccessRuleSdkService } from "../abstractions/access-rule-sdk.service"; - import { GovernedCollectionsService } from "./governed-collections.service"; const ORG_ID = "org-1" as OrganizationId; diff --git a/bitwarden_license/bit-web/src/app/pam/services/governed-collections.service.ts b/bitwarden_license/bit-web/src/app/pam/services/governed-collections.service.ts index 292b83c1c32..262b597a6a7 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/governed-collections.service.ts +++ b/bitwarden_license/bit-web/src/app/pam/services/governed-collections.service.ts @@ -1,12 +1,11 @@ import { Injectable } from "@angular/core"; import { catchError, defer, Observable, of, shareReplay } from "rxjs"; +import { AccessRuleSdkService } from "@bitwarden/bit-pam"; +import type { AccessRuleView } from "@bitwarden/bit-pam"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { OrganizationId } from "@bitwarden/common/types/guid"; -import type { AccessRuleView } from "../abstractions/access-rule"; -import { AccessRuleSdkService } from "../abstractions/access-rule-sdk.service"; - /** * How long a cached per-organization read serves new consumers. Checked lazily, so an open callout * keeps its value. diff --git a/bitwarden_license/bit-web/src/app/pam/services/pam-nav-badge.service.spec.ts b/bitwarden_license/bit-web/src/app/pam/services/pam-nav-badge.service.spec.ts index 54f0bc3b8c3..87291308d1d 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/pam-nav-badge.service.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/services/pam-nav-badge.service.spec.ts @@ -1,6 +1,14 @@ import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, Subject, Subscription } from "rxjs"; +import { + AccessEventService, + AccessRequestSdkService, + ApprovalSdkService, + DefaultAccessRefreshService, +} from "@bitwarden/bit-pam"; +import type { AccessRequestStatus, AccessRequestView } from "@bitwarden/bit-pam"; +import { AccessBadgeTickerService } from "@bitwarden/bit-pam-components"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -8,14 +16,8 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { UserId } from "@bitwarden/common/types/guid"; -import { AccessEventService } from "../abstractions/access-event.service"; -import type { AccessRequestStatus, AccessRequestView } from "../abstractions/access-lease"; -import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; -import { ApprovalSdkService } from "../abstractions/approval-sdk.service"; -import { AccessBadgeTickerService } from "../access-state-badge/access-badge-ticker.service"; import { ApprovalPrivilegeService } from "../approvals/approval-privilege.service"; -import { DefaultAccessRefreshService } from "./default-access-refresh.service"; import { DefaultPamNavBadgeService } from "./pam-nav-badge.service"; const FUTURE = new Date(Date.now() + 60 * 60 * 1000).toISOString(); diff --git a/bitwarden_license/bit-web/src/app/pam/services/pam-nav-badge.service.ts b/bitwarden_license/bit-web/src/app/pam/services/pam-nav-badge.service.ts index 6d614159e17..62559248d4a 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/pam-nav-badge.service.ts +++ b/bitwarden_license/bit-web/src/app/pam/services/pam-nav-badge.service.ts @@ -16,6 +16,15 @@ import { take, } from "rxjs"; +import { + AccessEventService, + AccessRefreshService, + AccessRequestSdkService, + AccessRequestView, + ApprovalSdkService, + isActionableRequest, +} from "@bitwarden/bit-pam"; +import { AccessBadgeTickerService } from "@bitwarden/bit-pam-components"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -25,15 +34,6 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service" import { uuidAsString } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; import { PamNavBadgeService } from "@bitwarden/web-vault/app/pam/pam-nav-badge.service"; -import { - AccessEventService, - AccessRefreshService, - AccessRequestSdkService, - AccessRequestView, - ApprovalSdkService, - isActionableRequest, -} from ".."; -import { AccessBadgeTickerService } from "../access-state-badge/access-badge-ticker.service"; import { ApprovalPrivilegeService } from "../approvals/approval-privilege.service"; import { isActionableInboxRequest } from "../approvals/inbox-request-filter"; diff --git a/bitwarden_license/bit-web/src/app/pam/services/pam-revealed-cipher.service.spec.ts b/bitwarden_license/bit-web/src/app/pam/services/pam-revealed-cipher.service.spec.ts index c2effd43892..9d5077b351a 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/pam-revealed-cipher.service.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/services/pam-revealed-cipher.service.spec.ts @@ -2,6 +2,13 @@ import { NgZone } from "@angular/core"; import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, firstValueFrom, Observable, Subject } from "rxjs"; +import { + AccessLeaseSdkService, + AccessRefreshService, + AccessRequestSdkService, +} from "@bitwarden/bit-pam"; +import type { CipherAccessStateView } from "@bitwarden/bit-pam"; +import { AccessBadgeTickerService } from "@bitwarden/bit-pam-components"; import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; @@ -10,12 +17,6 @@ import { CipherId, UserId } from "@bitwarden/common/types/guid"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import type { CipherView as SdkCipherView } from "@bitwarden/sdk-internal"; -import type { CipherAccessStateView } from "../abstractions/access-lease"; -import { AccessLeaseSdkService } from "../abstractions/access-lease-sdk.service"; -import { AccessRefreshService } from "../abstractions/access-refresh.service"; -import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; -import { AccessBadgeTickerService } from "../access-state-badge/access-badge-ticker.service"; - import { PamRevealedCipherService } from "./pam-revealed-cipher.service"; describe("PamRevealedCipherService", () => { diff --git a/bitwarden_license/bit-web/src/app/pam/services/pam-revealed-cipher.service.ts b/bitwarden_license/bit-web/src/app/pam/services/pam-revealed-cipher.service.ts index 6d1ffe50a85..71b70542b3c 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/pam-revealed-cipher.service.ts +++ b/bitwarden_license/bit-web/src/app/pam/services/pam-revealed-cipher.service.ts @@ -18,6 +18,15 @@ import { tap, } from "rxjs"; +import { + AccessRefreshService, + AccessRequestSdkService, + liveActiveLease, + rereadOnLapse, + AccessLeaseSdkService, +} from "@bitwarden/bit-pam"; +import type { CipherAccessStateView } from "@bitwarden/bit-pam"; +import { AccessBadgeTickerService } from "@bitwarden/bit-pam-components"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; @@ -27,11 +36,6 @@ import { RevealedCipherService } from "@bitwarden/common/vault/abstractions/reve import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { RestrictedCipherPolicy } from "@bitwarden/common/vault/utils/restricted-cipher-policy"; -import { AccessRefreshService, AccessRequestSdkService, liveActiveLease, rereadOnLapse } from ".."; -import type { CipherAccessStateView } from "../abstractions/access-lease"; -import { AccessLeaseSdkService } from "../abstractions/access-lease-sdk.service"; -import { AccessBadgeTickerService } from "../access-state-badge/access-badge-ticker.service"; - /** A revealed view and the end of the lease it was revealed under, in ms. */ type Entry = { view: CipherView; endsAt: number }; diff --git a/bitwarden_license/bit-web/src/app/pam/services/vault-row-access-actions.service.spec.ts b/bitwarden_license/bit-web/src/app/pam/services/vault-row-access-actions.service.spec.ts index 19c8d1e99a3..29f8d58fdca 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/vault-row-access-actions.service.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/services/vault-row-access-actions.service.spec.ts @@ -1,14 +1,12 @@ import { mock, MockProxy } from "jest-mock-extended"; import { firstValueFrom, NEVER, of, Subscription } from "rxjs"; +import { AccessRequestSdkService, DefaultAccessRefreshService } from "@bitwarden/bit-pam"; +import type { AccessRequestId, CipherAccessStateView } from "@bitwarden/bit-pam"; +import { AccessRequestCancelService } from "@bitwarden/bit-pam-components"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils"; -import type { AccessRequestId, CipherAccessStateView } from "../abstractions/access-lease"; -import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; - -import { AccessRequestCancelService } from "./access-request-cancel.service"; -import { DefaultAccessRefreshService } from "./default-access-refresh.service"; import { DefaultVaultRowAccessActionsService } from "./vault-row-access-actions.service"; const CIPHER_ID = "cipher-1"; diff --git a/bitwarden_license/bit-web/src/app/pam/services/vault-row-access-actions.service.ts b/bitwarden_license/bit-web/src/app/pam/services/vault-row-access-actions.service.ts index 35b7ff88497..3744f1b60e9 100644 --- a/bitwarden_license/bit-web/src/app/pam/services/vault-row-access-actions.service.ts +++ b/bitwarden_license/bit-web/src/app/pam/services/vault-row-access-actions.service.ts @@ -10,6 +10,8 @@ import { switchMap, } from "rxjs"; +import { AccessRefreshService, AccessRequestSdkService } from "@bitwarden/bit-pam"; +import { AccessRequestCancelService } from "@bitwarden/bit-pam-components"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { @@ -18,10 +20,6 @@ import { } from "@bitwarden/common/vault/utils/cipher-view-like-utils"; import { VaultRowAccessActionsService } from "@bitwarden/web-vault/app/vault/components/vault-items/vault-row-access-actions.service"; -import { AccessRefreshService, AccessRequestSdkService } from ".."; - -import { AccessRequestCancelService } from "./access-request-cancel.service"; - /** The one stream every ineligible cipher shares, so template reads stay referentially stable. */ const NEVER_CANCELABLE$ = of(false); diff --git a/bitwarden_license/bit-web/src/app/pam/testing/decision-builders.ts b/bitwarden_license/bit-web/src/app/pam/testing/decision-builders.ts index 96e4c648722..01fe26e2000 100644 --- a/bitwarden_license/bit-web/src/app/pam/testing/decision-builders.ts +++ b/bitwarden_license/bit-web/src/app/pam/testing/decision-builders.ts @@ -1,4 +1,4 @@ -import type { AccessApprover, AccessRequestDecisionView } from "../abstractions/access-lease"; +import type { AccessApprover, AccessRequestDecisionView } from "@bitwarden/bit-pam"; /** Fixed so a test asserting on a decision's timestamp doesn't depend on when it runs. */ const DECIDED_AT = "2026-06-10T10:30:00.000Z"; diff --git a/bitwarden_license/bit-web/src/app/pam/testing/story-fixtures.ts b/bitwarden_license/bit-web/src/app/pam/testing/story-fixtures.ts index a328bcf48e4..fc8a8e75e2d 100644 --- a/bitwarden_license/bit-web/src/app/pam/testing/story-fixtures.ts +++ b/bitwarden_license/bit-web/src/app/pam/testing/story-fixtures.ts @@ -1,6 +1,11 @@ import { provideZonelessChangeDetection } from "@angular/core"; import { of } from "rxjs"; +import type { + AccessLeaseView, + AccessRequestDecisionView, + AccessRequestView, +} from "@bitwarden/bit-pam"; import { LogoutService } from "@bitwarden/common/auth/logout"; import { VaultTimeoutSettingsService } from "@bitwarden/common/key-management/vault-timeout"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -10,11 +15,6 @@ import { Measurement } from "@bitwarden/logging"; import { LockService } from "@bitwarden/unlock"; import { ProductSwitcherService } from "@bitwarden/web-vault/app/layouts/product-switcher/shared/product-switcher.service"; -import type { - AccessLeaseView, - AccessRequestDecisionView, - AccessRequestView, -} from "../abstractions/access-lease"; import type { ResolvedNames } from "../access-requests/access-name-resolver.service"; /** diff --git a/bitwarden_license/bit-web/src/app/pam/vault-filter-controlled-access/controlled-access-vault-filter.service.spec.ts b/bitwarden_license/bit-web/src/app/pam/vault-filter-controlled-access/controlled-access-vault-filter.service.spec.ts index 476fff469e4..08388e120ec 100644 --- a/bitwarden_license/bit-web/src/app/pam/vault-filter-controlled-access/controlled-access-vault-filter.service.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/vault-filter-controlled-access/controlled-access-vault-filter.service.spec.ts @@ -2,6 +2,8 @@ import { TestBed } from "@angular/core/testing"; import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, combineLatest, firstValueFrom, of } from "rxjs"; +import { AccessRequestSdkService } from "@bitwarden/bit-pam"; +import type { CipherAccessStateView } from "@bitwarden/bit-pam"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; @@ -16,9 +18,6 @@ import { UNAVAILABLE_FILTER_ID, } from "@bitwarden/vault"; -import type { CipherAccessStateView } from "../abstractions/access-lease"; -import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; - import { ControlledAccessVaultFilterService } from "./controlled-access-vault-filter.service"; const PAM_ORG = "org-1"; diff --git a/bitwarden_license/bit-web/src/app/pam/vault-filter-controlled-access/controlled-access-vault-filter.service.ts b/bitwarden_license/bit-web/src/app/pam/vault-filter-controlled-access/controlled-access-vault-filter.service.ts index 8523a01b87b..2e11a874740 100644 --- a/bitwarden_license/bit-web/src/app/pam/vault-filter-controlled-access/controlled-access-vault-filter.service.ts +++ b/bitwarden_license/bit-web/src/app/pam/vault-filter-controlled-access/controlled-access-vault-filter.service.ts @@ -12,6 +12,11 @@ import { switchMap, } from "rxjs"; +import { + AccessRequestSdkService, + AccessBadgeState, + cipherAccessBadgeState, +} from "@bitwarden/bit-pam"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getOptionalUserId } from "@bitwarden/common/auth/services/account.service"; @@ -36,9 +41,6 @@ import { VaultControlledAccessFilter, } from "@bitwarden/web-vault/app/vault/individual-vault/vault-controlled-access-filter.token"; -import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; -import { AccessBadgeState, cipherAccessBadgeState } from "../access-state-badge/access-badge-state"; - type ControlledAccessFilterDefinition = Omit & { readonly nameKey: string; readonly kinds: readonly AccessBadgeState["kind"][]; diff --git a/bitwarden_license/bit-web/src/app/pam/vault-row-lease-badge/vault-row-lease-badge.component.spec.ts b/bitwarden_license/bit-web/src/app/pam/vault-row-lease-badge/vault-row-lease-badge.component.spec.ts index 5ae2050a998..352ee851437 100644 --- a/bitwarden_license/bit-web/src/app/pam/vault-row-lease-badge/vault-row-lease-badge.component.spec.ts +++ b/bitwarden_license/bit-web/src/app/pam/vault-row-lease-badge/vault-row-lease-badge.component.spec.ts @@ -2,6 +2,8 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, of, Subject } from "rxjs"; +import { AccessRefreshService, AccessRequestSdkService } from "@bitwarden/bit-pam"; +import { AccessBadgeTickerService } from "@bitwarden/bit-pam-components"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; @@ -9,10 +11,6 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import type { CipherAccessStateView } from "@bitwarden/sdk-internal"; -import { AccessRefreshService } from "../abstractions/access-refresh.service"; -import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; -import { AccessBadgeTickerService } from "../access-state-badge/access-badge-ticker.service"; - import { VaultRowLeaseBadgeComponent } from "./vault-row-lease-badge.component"; const PAM_ORG = "org-1"; diff --git a/bitwarden_license/bit-web/src/app/pam/vault-row-lease-badge/vault-row-lease-badge.component.stories.ts b/bitwarden_license/bit-web/src/app/pam/vault-row-lease-badge/vault-row-lease-badge.component.stories.ts index 62b62cb8523..47a76535543 100644 --- a/bitwarden_license/bit-web/src/app/pam/vault-row-lease-badge/vault-row-lease-badge.component.stories.ts +++ b/bitwarden_license/bit-web/src/app/pam/vault-row-lease-badge/vault-row-lease-badge.component.stories.ts @@ -2,6 +2,7 @@ import { importProvidersFrom } from "@angular/core"; import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular"; import { EMPTY, of } from "rxjs"; +import { AccessRefreshService, AccessRequestSdkService } from "@bitwarden/bit-pam"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -10,9 +11,6 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import type { CipherAccessStateView } from "@bitwarden/sdk-internal"; import { PreloadedEnglishI18nModule } from "@bitwarden/web-vault/app/core/tests"; -import { AccessRefreshService } from "../abstractions/access-refresh.service"; -import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; - import { VaultRowLeaseBadgeComponent } from "./vault-row-lease-badge.component"; type BadgeState = string | { active: { expiresAt: string } }; diff --git a/bitwarden_license/bit-web/src/app/pam/vault-row-lease-badge/vault-row-lease-badge.component.ts b/bitwarden_license/bit-web/src/app/pam/vault-row-lease-badge/vault-row-lease-badge.component.ts index bdccbef2b20..574b9344b7c 100644 --- a/bitwarden_license/bit-web/src/app/pam/vault-row-lease-badge/vault-row-lease-badge.component.ts +++ b/bitwarden_license/bit-web/src/app/pam/vault-row-lease-badge/vault-row-lease-badge.component.ts @@ -2,6 +2,14 @@ import { ChangeDetectionStrategy, Component, computed, inject, input } from "@an import { toObservable, toSignal } from "@angular/core/rxjs-interop"; import { catchError, combineLatest, from, map, merge, Observable, of, switchMap } from "rxjs"; +import { + AccessRefreshService, + AccessRequestSdkService, + AccessBadgeState, + cipherAccessBadgeState, + rereadOnLapse, +} from "@bitwarden/bit-pam"; +import { AccessBadgeTickerService, AccessStateBadgeComponent } from "@bitwarden/bit-pam-components"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getOptionalUserId } from "@bitwarden/common/auth/services/account.service"; @@ -13,13 +21,6 @@ import { CipherViewLikeUtils, } from "@bitwarden/common/vault/utils/cipher-view-like-utils"; -import { AccessRefreshService } from "../abstractions/access-refresh.service"; -import { AccessRequestSdkService } from "../abstractions/access-request-sdk.service"; -import { AccessBadgeState, cipherAccessBadgeState } from "../access-state-badge/access-badge-state"; -import { AccessBadgeTickerService } from "../access-state-badge/access-badge-ticker.service"; -import { AccessStateBadgeComponent } from "../access-state-badge/access-state-badge.component"; -import { rereadOnLapse } from "../helpers/lease-liveness"; - /** * Structural, since the host passes its own `CollectionView`/`CollectionAdminView`, which this * component must not import. Optional for the vault's pseudo-collections, which carry no flag. diff --git a/clients.code-workspace b/clients.code-workspace index 7e50d6a014d..2a2b5d0bddc 100644 --- a/clients.code-workspace +++ b/clients.code-workspace @@ -40,6 +40,14 @@ "name": "common (bit)", "path": "bitwarden_license/bit-common", }, + { + "name": "pam (bit)", + "path": "bitwarden_license/bit-pam", + }, + { + "name": "pam components (bit)", + "path": "bitwarden_license/bit-pam-components", + }, ], "settings": { "eslint.options": { diff --git a/eslint.config.mjs b/eslint.config.mjs index 64bad102bba..0bf9a522c39 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -378,6 +378,27 @@ export default tseslint.config( "no-restricted-imports": buildNoRestrictedImports(["@bitwarden/bit-common/*"]), }, }, + // bit-pam stays free of Angular so background scripts can use it; UI code goes in bit-pam-components. + { + files: ["bitwarden_license/bit-pam/src/**/*.ts"], + rules: { + "no-restricted-imports": buildNoRestrictedImports([ + "@bitwarden/bit-pam", + "@bitwarden/bit-pam-components", + "@angular", + "@bitwarden/angular", + "@bitwarden/components", + "@bitwarden/ui-common", + "@bitwarden/vault", + ]), + }, + }, + { + files: ["bitwarden_license/bit-pam-components/src/**/*.ts"], + rules: { + "no-restricted-imports": buildNoRestrictedImports(["@bitwarden/bit-pam-components"]), + }, + }, { files: ["apps/**/*.ts"], rules: { @@ -385,6 +406,8 @@ export default tseslint.config( "no-restricted-imports": buildNoRestrictedImports([ "bitwarden_license/**", "@bitwarden/bit-common/*", + "@bitwarden/bit-pam", + "@bitwarden/bit-pam-components", "@bitwarden/bit-web/*", ]), }, @@ -395,6 +418,8 @@ export default tseslint.config( "no-restricted-imports": buildNoRestrictedImports([ "bitwarden_license/**", "@bitwarden/bit-common/*", + "@bitwarden/bit-pam", + "@bitwarden/bit-pam-components", "@bitwarden/bit-web/*", "**/app/core/*", @@ -413,6 +438,8 @@ export default tseslint.config( "@angular", "bitwarden_license/**", "@bitwarden/bit-common/*", + "@bitwarden/bit-pam", + "@bitwarden/bit-pam-components", "@bitwarden/bit-web/*", "**/popup/*", @@ -426,6 +453,8 @@ export default tseslint.config( "no-restricted-imports": buildNoRestrictedImports([ "bitwarden_license/**", "@bitwarden/bit-common/*", + "@bitwarden/bit-pam", + "@bitwarden/bit-pam-components", "@bitwarden/bit-web/*", ]), }, @@ -442,6 +471,7 @@ export default tseslint.config( "apps/web/**/*.html", "apps/browser/**/*.html", "bitwarden_license/bit-web/**/*.html", + "bitwarden_license/bit-pam-components/**/*.html", "libs/**/*.html", ], rules: { @@ -702,7 +732,12 @@ export default tseslint.config( // `@bitwarden/*` alias. Scoped to libs here; the rule self-limits to the file's owning package. // https://contributing.bitwarden.com/contributing/code-style/web/typescript#imports-within-the-same-package { - files: ["libs/**/*.ts", "bitwarden_license/bit-common/src/**/*.ts"], + files: [ + "libs/**/*.ts", + "bitwarden_license/bit-common/src/**/*.ts", + "bitwarden_license/bit-pam/src/**/*.ts", + "bitwarden_license/bit-pam-components/src/**/*.ts", + ], rules: { "@bitwarden/platform/no-self-package-import": "error", }, diff --git a/jest.config.js b/jest.config.js index a84af62e2b2..617c84f942d 100644 --- a/jest.config.js +++ b/jest.config.js @@ -24,6 +24,8 @@ module.exports = { "/bitwarden_license/bit-cli/jest.config.js", "/bitwarden_license/bit-common/jest.config.js", "/bitwarden_license/bit-desktop/jest.config.js", + "/bitwarden_license/bit-pam/jest.config.js", + "/bitwarden_license/bit-pam-components/jest.config.js", "/bitwarden_license/bit-web/jest.config.js", "/libs/admin-console/jest.config.js", diff --git a/tsconfig.base.json b/tsconfig.base.json index 9b7efdb2d81..3c501c43195 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -30,6 +30,8 @@ "@bitwarden/automation-driver": ["./libs/automation-driver/src/index.ts"], "@bitwarden/billing": ["./libs/billing/src"], "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"], + "@bitwarden/bit-pam": ["./bitwarden_license/bit-pam/src"], + "@bitwarden/bit-pam-components": ["./bitwarden_license/bit-pam-components/src"], "@bitwarden/browser/*": ["./apps/browser/src/*"], "@bitwarden/cli/*": ["./apps/cli/src/*"], "@bitwarden/client-type": ["./libs/client-type/src/index.ts"], diff --git a/tsconfig.json b/tsconfig.json index 0b825820ef2..6733f54f8b4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,6 +11,8 @@ "bitwarden_license/bit-desktop/src/**/*", "bitwarden_license/bit-web/src/**/*", "bitwarden_license/bit-common/src/**/*", + "bitwarden_license/bit-pam/src/**/*", + "bitwarden_license/bit-pam-components/src/**/*", "bitwarden_license/bit-browser/src/**/*" ], "exclude": [