@salesforce/packaging 5.0.9-spi.3 → 5.0.9-spi.4

package/lib/interfaces/packagingInterfacesAndType.d.ts

@@ -193,6 +193,16 @@ export type PackageTrustLinkRecord = {
     EstablishedDate: string | null;
     RevokedDate: string | null;
 };
+export type PackageTrustLinkApproveOptions = {
+    requestId?: string;
+    authoringOrgId?: string;
+};
+export type PackageTrustLinkApproveResult = {
+    LinkRequestId: string;
+    AuthoringOrgId: string;
+    VerifiedOrgId: string;
+    Status: 'Accepted';
+};
 export type PackageTrustLinkUnlinkResult = {
     removed: boolean;
     LinkRequestId?: string;

package/lib/package/packageTrustLink.d.ts

@@ -1,5 +1,5 @@
 import { Connection } from '@salesforce/core';
-import { PackageTrustLinkListStatusFilter, PackageTrustLinkRecord, PackageTrustLinkRequestOptions, PackageTrustLinkRequestResult, PackageTrustLinkStatusResult, PackageTrustLinkUnlinkResult } from '../interfaces';
+import { PackageTrustLinkApproveOptions, PackageTrustLinkApproveResult, PackageTrustLinkListStatusFilter, PackageTrustLinkRecord, PackageTrustLinkRequestOptions, PackageTrustLinkRequestResult, PackageTrustLinkStatusResult, PackageTrustLinkUnlinkResult } from '../interfaces';
 export declare class PackageTrustLink {
     constructor();
     /**
@@ -34,6 +34,14 @@ export declare class PackageTrustLink {
      * Tooling statuses (`approved` → `Accepted`). Matches `sf package trust link list`.
      */
     static list(connection: Connection, status?: PackageTrustLinkListStatusFilter): Promise<PackageTrustLinkRecord[]>;
+    /**
+     * Approve a pending Public Secure (VerifiedDev) trust-link request for the connected Verified PBO.
+     *
+     * @param connection - Connection to the Verified Partner Business Org (PBO).
+     * @param options - Exactly one request ID or authoring org ID identifying the pending request.
+     * @returns the accepted trust relationship details.
+     */
+    static approve(connection: Connection, options: PackageTrustLinkApproveOptions): Promise<PackageTrustLinkApproveResult>;
     /**
      * Clear the connected authoring org's Public Secure (VerifiedDev) trust link, returning it to the
      * `Not Linked` state.

package/lib/package/packageTrustLink.js

@@ -16,6 +16,7 @@ const STATUS_FILTER_TO_API = {
     declined: 'Declined',
     revoked: 'Revoked',
 };
+const SALESFORCE_ID_PATTERN = /^[a-zA-Z0-9]{15}([a-zA-Z0-9]{3})?$/;
 const isStatusFilter = (status) => Object.prototype.hasOwnProperty.call(STATUS_FILTER_TO_API, status);
 const toApiStatus = (status) => {
     if (!isStatusFilter(status)) {
@@ -132,6 +133,68 @@ class PackageTrustLink {
             RevokedDate: RevokedDate ?? null,
         }));
     }
+    /**
+     * Approve a pending Public Secure (VerifiedDev) trust-link request for the connected Verified PBO.
+     *
+     * @param connection - Connection to the Verified Partner Business Org (PBO).
+     * @param options - Exactly one request ID or authoring org ID identifying the pending request.
+     * @returns the accepted trust relationship details.
+     */
+    static async approve(connection, options) {
+        if (Number(connection.getApiVersion()) < Number(MINIMUM_API_VERSION)) {
+            throw messages.createError('apiVersionTooLow', [MINIMUM_API_VERSION]);
+        }
+        if (Boolean(options.requestId) === Boolean(options.authoringOrgId)) {
+            throw messages.createError('exactlyOneApproveSelector');
+        }
+        const orgId = connection.getAuthInfoFields()?.orgId;
+        if (!orgId) {
+            throw messages.createError('missingOrgId');
+        }
+        const verifiedOrgId = (0, core_1.trimTo15)(orgId);
+        let selector;
+        let selectorValue;
+        if (options.requestId) {
+            if (!options.requestId.startsWith('2vt') ||
+                !SALESFORCE_ID_PATTERN.test(options.requestId) ||
+                !(0, core_1.validateSalesforceId)(options.requestId)) {
+                throw messages.createError('invalidTrustLinkRequestId', [options.requestId]);
+            }
+            selector = `Id = '${options.requestId}'`;
+            selectorValue = options.requestId;
+        }
+        else {
+            const authoringOrgId = options.authoringOrgId;
+            if (!authoringOrgId.startsWith('00D') ||
+                !SALESFORCE_ID_PATTERN.test(authoringOrgId) ||
+                !(0, core_1.validateSalesforceId)(authoringOrgId)) {
+                throw messages.createError('invalidAuthoringOrgId', [authoringOrgId]);
+            }
+            selector = `AuthoringOrg = '${(0, core_1.trimTo15)(authoringOrgId)}'`;
+            selectorValue = authoringOrgId;
+        }
+        const query = `SELECT Id, AuthoringOrg, VerifiedOrg, Status FROM ${TRUST_LINK_SOBJECT} ` +
+            `WHERE VerifiedOrg = '${verifiedOrgId}' AND OrganizationType = '${ORGANIZATION_TYPE_VERIFIED}' ` +
+            `AND AuthoringOrg != '${verifiedOrgId}' AND Status = 'Pending' AND ${selector} ORDER BY CreatedDate DESC LIMIT 1`;
+        const queryResult = await connection.autoFetchQuery(query, { tooling: true });
+        const pendingRequest = queryResult.records?.[0];
+        if (!pendingRequest) {
+            throw messages.createError('pendingTrustLinkNotFound', [selectorValue]);
+        }
+        const updateResult = await connection.tooling.update(TRUST_LINK_SOBJECT, {
+            Id: pendingRequest.Id,
+            Status: 'Accepted',
+        });
+        if (!updateResult.success) {
+            throw (0, packageUtils_1.combineSaveErrors)(TRUST_LINK_SOBJECT, 'update', updateResult.errors);
+        }
+        return {
+            LinkRequestId: pendingRequest.Id,
+            AuthoringOrgId: pendingRequest.AuthoringOrg,
+            VerifiedOrgId: pendingRequest.VerifiedOrg,
+            Status: 'Accepted',
+        };
+    }
     /**
      * Clear the connected authoring org's Public Secure (VerifiedDev) trust link, returning it to the
      * `Not Linked` state.

package/messages/package_trust_link.md

@@ -18,6 +18,22 @@ Unable to determine the target org ID from the current connection.
 
 The status %s is invalid. Valid values are: pending, approved, declined, revoked.
 
+# exactlyOneApproveSelector
+
+Specify exactly one trust link selector: a request ID or an authoring org ID.
+
+# invalidTrustLinkRequestId
+
+The trust link request ID %s isn't valid. Specify a valid 15- or 18-character Salesforce ID and retry the command.
+
+# invalidAuthoringOrgId
+
+The Authoring Org ID %s isn't valid. Specify a valid organization ID (starts with 00D and is 15 or 18 characters) and retry the command.
+
+# pendingTrustLinkNotFound
+
+No pending trust link request matching %s was found for this Verified Org. Run "sf package trust link list --status pending" to review pending requests.
+
 # trustLinkNotFound
 
 This org has no trust link to remove; it's already in the Not Linked state.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "5.0.9-spi.3",
+  "version": "5.0.9-spi.4",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",