diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 98a1f9e443a..fc1ee245846 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -20587,20 +20587,17 @@
"pamTargetSystemNotFound": {
"message": "Target system not found."
},
- "pamAccessConnectorSearch": {
- "message": "Search access connectors"
- },
- "pamAccessConnectorNew": {
- "message": "New access connector"
- },
"pamAccessConnectorRegister": {
"message": "Register access connector"
},
- "pamAccessConnectorEmptyStateTitle": {
- "message": "No access connectors registered"
+ "pamAccessConnectorsEmptyTitle": {
+ "message": "No access connectors yet"
},
- "pamAccessConnectorEmptyStateDescription": {
- "message": "Register an access connector to start rotating credentials."
+ "pamAccessConnectorsEmptyDescription": {
+ "message": "Access connectors run inside your network and change passwords on your target systems. Register one to get started."
+ },
+ "pamAccessConnectorTargetSystems": {
+ "message": "Target systems"
},
"pamAccessConnectorConnection": {
"message": "Connection"
@@ -20620,14 +20617,11 @@
"pamAccessConnectorAssignTargetSystemsDisabled": {
"message": "Activate this access connector to assign target systems."
},
- "pamAccessConnectorAssignTargetDisabled": {
- "message": "Target systems can only be assigned while the access connector is active."
+ "pamAccessConnectorEdit": {
+ "message": "Edit access connector"
},
- "pamAccessConnectorViewDetails": {
- "message": "View details"
- },
- "pamAccessConnectorAssignTargets": {
- "message": "Assign targets"
+ "pamAccessConnectorAssignTargetSystems": {
+ "message": "Assign target systems"
},
"pamAccessConnectorDeleteAccessConnector": {
"message": "Delete access connector"
@@ -20644,9 +20638,6 @@
"pamAccessConnectorTargetSystemsHint": {
"message": "Choose the target systems this access connector can rotate passwords on. Only target systems that use automatic rotation can be assigned."
},
- "pamAccessConnectorAssignSelectHint": {
- "message": "Only target systems set to automatic rotation can be assigned."
- },
"pamAccessConnectorAssignNoOptions": {
"message": "All automatic target systems are already assigned to this access connector."
},
@@ -20677,77 +20668,62 @@
}
}
},
- "pamAccessConnectorUnassignConfirmTitle": {
- "message": "Remove assignment?"
- },
- "pamAccessConnectorUnassignConfirmContent": {
- "message": "Remove $NAME$ from this access connector? Active rotation jobs claimed by this access connector will continue to completion.",
- "placeholders": {
- "name": {
- "content": "$1",
- "example": "Production database"
- }
- }
- },
- "pamAccessConnectorUnassigned": {
- "message": "Target system removed."
- },
"pamAccessConnectorDeactivate": {
"message": "Deactivate"
},
"pamAccessConnectorActivate": {
"message": "Activate"
},
- "pamAccessConnectorDeactivateConfirmTitle": {
- "message": "Deactivate access connector?"
+ "pamAccessConnectorDeactivateDialogTitle": {
+ "message": "Deactivate access connector"
},
- "pamAccessConnectorDeactivateConfirmContent": {
- "message": "Deactivate $NAME$? It stops claiming new rotation jobs and any jobs it is currently running are released. You can activate it again later.",
- "placeholders": {
- "name": {
- "content": "$1",
- "example": "On-prem production server"
- }
- }
+ "pamAccessConnectorDeactivateDialogContent": {
+ "message": "This access connector won't take new rotations. Rotations in progress are released."
},
"pamAccessConnectorDeactivated": {
"message": "Access connector deactivated."
},
+ "pamAccessConnectorDeactivateFailed": {
+ "message": "Couldn't deactivate. Try again."
+ },
"pamAccessConnectorActivated": {
"message": "Access connector activated."
},
- "pamAccessConnectorDeleteConfirmTitle": {
- "message": "Delete access connector?"
+ "pamAccessConnectorDeleteDialogTitle": {
+ "message": "Delete access connector"
},
- "pamAccessConnectorDeleteConfirmContent": {
- "message": "Deleting $NAME$ is permanent and invalidates its credentials. This access connector held the organization key in memory. If you suspect a compromise, rotate the organization key as a remediation. Running rotation jobs are released. Register a new access connector to resume rotation.",
- "placeholders": {
- "name": {
- "content": "$1",
- "example": "On-prem production server"
- }
- }
+ "pamAccessConnectorDeleteDialogContent": {
+ "message": "Its token stops working, and rotations in progress are released. This can't be undone."
},
"pamAccessConnectorDeleted": {
"message": "Access connector deleted."
},
+ "pamAccessConnectorDeleteFailed": {
+ "message": "Couldn't delete. Try again."
+ },
"pamAccessConnectorSaved": {
"message": "Access connector saved."
},
+ "pamAccessConnectorSaveFailed": {
+ "message": "Access connector wasn't saved. Try again."
+ },
+ "pamAccessConnectorSaveFailedCallout": {
+ "message": "Access connector wasn't saved. Check your connection, then select Save again."
+ },
"pamAccessConnectorRegisterTitle": {
"message": "Register access connector"
},
- "pamAccessConnectorNamePlaceholder": {
- "message": "e.g. On-prem production server"
+ "pamAccessConnectorRegisterDescription": {
+ "message": "You'll get a token to add to the access connector's configuration. It's shown only once."
},
- "pamAccessConnectorNameHint": {
- "message": "A descriptive name to identify this access connector. Max 200 characters."
+ "pamAccessConnectorNameRecognizableHint": {
+ "message": "Use a name your team will recognize, for example East datacenter."
},
"pamAccessConnectorRegistered": {
"message": "Access connector registered."
},
- "pamAccessConnectorNoResults": {
- "message": "No access connectors match your filters."
+ "pamAccessConnectorRegisterFailed": {
+ "message": "Access connector wasn't registered. Try again."
},
"pamAccessConnectorDetailTitle": {
"message": "Access connector"
@@ -20758,35 +20734,38 @@
"pamAccessConnectorTabConfiguration": {
"message": "Configuration"
},
- "pamAccessConnectorTabHistory": {
- "message": "History"
+ "pamAccessConnectorTabRotationHistory": {
+ "message": "Rotation history"
},
- "pamAccessConnectorActivityEmpty": {
- "message": "No rotation activity yet."
+ "pamAccessConnectorRotationHeading": {
+ "message": "Rotation"
},
- "pamAccessConnectorActiveHint": {
- "message": "When inactive, the access connector does not claim new rotation jobs and any jobs it is running are released."
+ "pamAccessConnectorTargetSystemsPlaceholder": {
+ "message": "Choose target systems"
+ },
+ "pamAccessConnectorDisconnectedCallout": {
+ "message": "This access connector isn't connected, so it can't rotate passwords. Check that it's running on its machine and can reach Bitwarden."
+ },
+ "pamAccessConnectorNeverConnectedCallout": {
+ "message": "Finish setting up. Add the token and each target system's connection details to this access connector's configuration, then start it."
},
"pamAccessConnectorTokenTitle": {
"message": "Access connector token"
},
- "pamAccessConnectorTokenWarningTitle": {
- "message": "Save this token now"
+ "pamAccessConnectorTokenShownOnceWarning": {
+ "message": "Copy this token now, since you can't see it again after you close this."
},
- "pamAccessConnectorTokenWarningBody": {
- "message": "This token is shown only once and cannot be retrieved later. Copy it and deliver it out of band to the operator who will run this access connector, then paste it into the connector's configuration file. If the token is lost, delete this access connector and register a new one."
+ "pamAccessConnectorTokenConfigurationHint": {
+ "message": "Add it to the access connector's configuration to connect it."
},
- "pamAccessConnectorTokenLabel": {
- "message": "Access connector token"
- },
- "pamAccessConnectorTokenHint": {
- "message": "This token will not be shown again."
+ "pamAccessConnectorTokenStored": {
+ "message": "I stored this token securely"
},
"pamAccessConnectorTokenCopy": {
"message": "Copy token"
},
- "pamAccessConnectorTokenCopied": {
- "message": "Access connector token copied."
+ "pamTokenCopied": {
+ "message": "Token copied."
},
"pamRotationConfigSearch": {
"message": "Search managed credentials"
@@ -21268,12 +21247,6 @@
"pamRotationJobStatusUnknown": {
"message": "Unknown"
},
- "pamRotationAssignmentPendingAssign": {
- "message": "Pending assignment"
- },
- "pamRotationAssignmentPendingUnassign": {
- "message": "Pending removal"
- },
"pamRotationAttemptStatusExecuting": {
"message": "Executing"
},
@@ -21489,9 +21462,9 @@
"pamAuditAccessConnector": {
"message": "Access connector"
},
- "pamAccessConnectorAssignmentCountSingular": {
- "message": "$COUNT$ target",
- "description": "Count of target systems assigned to an access connector. Activating the count reveals their names.",
+ "pamAccessConnectorTargetSystemCountSingular": {
+ "message": "$COUNT$ target system",
+ "description": "Count of target systems assigned to an access connector, in the access connectors table.",
"placeholders": {
"count": {
"content": "$1",
@@ -21499,9 +21472,9 @@
}
}
},
- "pamAccessConnectorAssignmentCount": {
- "message": "$COUNT$ targets",
- "description": "Count of target systems assigned to an access connector. Activating the count reveals their names.",
+ "pamAccessConnectorTargetSystemCount": {
+ "message": "$COUNT$ target systems",
+ "description": "Count of target systems assigned to an access connector, in the access connectors table.",
"placeholders": {
"count": {
"content": "$1",
@@ -21511,7 +21484,7 @@
},
"pamAccessConnectorAssignmentsNone": {
"message": "None",
- "description": "Shown in the assigned targets column when an access connector has no target systems assigned."
+ "description": "Shown in the target systems column when an access connector has no target systems assigned."
},
"pamRotationConfigNoActiveTargetSystems": {
"message": "No active target systems to choose from."
diff --git a/bitwarden_license/bit-pam-components/src/helpers/access-connector-confirm.ts b/bitwarden_license/bit-pam-components/src/helpers/access-connector-confirm.ts
index 87a376cec16..b84ddc34b0d 100644
--- a/bitwarden_license/bit-pam-components/src/helpers/access-connector-confirm.ts
+++ b/bitwarden_license/bit-pam-components/src/helpers/access-connector-confirm.ts
@@ -1,20 +1,21 @@
import { SimpleDialogOptions } from "@bitwarden/components";
-export function accessConnectorDeactivateConfirmOptions(name: string): SimpleDialogOptions {
+/** Shared by the access connectors table and the detail page, so both ask the same question. */
+export function accessConnectorDeactivateConfirmOptions(): SimpleDialogOptions {
return {
- title: { key: "pamAccessConnectorDeactivateConfirmTitle" },
- content: { key: "pamAccessConnectorDeactivateConfirmContent", placeholders: [name] },
+ title: { key: "pamAccessConnectorDeactivateDialogTitle" },
+ content: { key: "pamAccessConnectorDeactivateDialogContent" },
acceptButtonText: { key: "pamAccessConnectorDeactivate" },
cancelButtonText: { key: "cancel" },
type: "warning",
};
}
-export function accessConnectorDeleteConfirmOptions(name: string): SimpleDialogOptions {
+export function accessConnectorDeleteConfirmOptions(): SimpleDialogOptions {
return {
- title: { key: "pamAccessConnectorDeleteConfirmTitle" },
- content: { key: "pamAccessConnectorDeleteConfirmContent", placeholders: [name] },
- acceptButtonText: { key: "delete" },
+ title: { key: "pamAccessConnectorDeleteDialogTitle" },
+ content: { key: "pamAccessConnectorDeleteDialogContent" },
+ acceptButtonText: { key: "pamAccessConnectorDeleteAccessConnector" },
cancelButtonText: { key: "cancel" },
type: "danger",
};
diff --git a/bitwarden_license/bit-web/src/app/pam/rotation/access-connectors/access-connector-detail.component.html b/bitwarden_license/bit-web/src/app/pam/rotation/access-connectors/access-connector-detail.component.html
index d67916300a2..009a65fcba0 100644
--- a/bitwarden_license/bit-web/src/app/pam/rotation/access-connectors/access-connector-detail.component.html
+++ b/bitwarden_license/bit-web/src/app/pam/rotation/access-connectors/access-connector-detail.component.html
@@ -6,28 +6,106 @@
parentIcon="bwi-access-connector"
[current]="titleText()"
/>
-
- @if (accessConnector()) {
+
+ @if (statusBadge(); as badge) {
+
{{ "status" | i18n }}:
{{ (enabled() ? "active" : "inactive") | i18n }}{{ badge.labelKey | i18n }}
+
+ }
+
+ @if (accessConnector() && activeTab() === "configuration") {
+ @if (!enabled()) {
+
}
-
+
+