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

package/lib/interfaces/packagingInterfacesAndType.d.ts

@@ -193,16 +193,31 @@ export type PackageTrustLinkRecord = {
     EstablishedDate: string | null;
     RevokedDate: string | null;
 };
-export type PackageTrustLinkApproveOptions = {
+export type PackageTrustLinkSelectorOptions = {
     requestId?: string;
     authoringOrgId?: string;
 };
+export type PackageTrustLinkApproveOptions = PackageTrustLinkSelectorOptions;
+export type PackageTrustLinkDenyOptions = PackageTrustLinkSelectorOptions;
+export type PackageTrustLinkRevokeOptions = PackageTrustLinkSelectorOptions;
 export type PackageTrustLinkApproveResult = {
     LinkRequestId: string;
     AuthoringOrgId: string;
     VerifiedOrgId: string;
     Status: 'Accepted';
 };
+export type PackageTrustLinkDenyResult = {
+    LinkRequestId: string;
+    AuthoringOrgId: string;
+    VerifiedOrgId: string;
+    Status: 'Declined';
+};
+export type PackageTrustLinkRevokeResult = {
+    LinkRequestId: string;
+    AuthoringOrgId: string;
+    VerifiedOrgId: string;
+    Status: 'Revoked';
+};
 export type PackageTrustLinkUnlinkResult = {
     removed: boolean;
     LinkRequestId?: string;

package/lib/package/packageTrustLink.d.ts

@@ -1,5 +1,5 @@
 import { Connection } from '@salesforce/core';
-import { PackageTrustLinkApproveOptions, PackageTrustLinkApproveResult, PackageTrustLinkListStatusFilter, PackageTrustLinkRecord, PackageTrustLinkRequestOptions, PackageTrustLinkRequestResult, PackageTrustLinkStatusResult, PackageTrustLinkUnlinkResult } from '../interfaces';
+import { PackageTrustLinkApproveOptions, PackageTrustLinkApproveResult, PackageTrustLinkDenyOptions, PackageTrustLinkDenyResult, PackageTrustLinkListStatusFilter, PackageTrustLinkRecord, PackageTrustLinkRequestOptions, PackageTrustLinkRequestResult, PackageTrustLinkRevokeOptions, PackageTrustLinkRevokeResult, PackageTrustLinkStatusResult, PackageTrustLinkUnlinkResult } from '../interfaces';
 export declare class PackageTrustLink {
     constructor();
     /**
@@ -42,6 +42,28 @@ export declare class PackageTrustLink {
      * @returns the accepted trust relationship details.
      */
     static approve(connection: Connection, options: PackageTrustLinkApproveOptions): Promise<PackageTrustLinkApproveResult>;
+    /**
+     * Deny a pending Public Secure (VerifiedDev) trust-link request for the connected Verified PBO.
+     *
+     * Core only allows Pending → Declined on the verified-org copy. This does not delete the
+     * relationship; the authoring org can unlink and request again.
+     *
+     * @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 declined trust relationship details.
+     */
+    static deny(connection: Connection, options: PackageTrustLinkDenyOptions): Promise<PackageTrustLinkDenyResult>;
+    /**
+     * Revoke an accepted Public Secure (VerifiedDev) trust link for the connected Verified PBO.
+     *
+     * Core only allows Accepted → Revoked on the verified-org copy. Pending requests must be
+     * denied instead; already-declined or already-revoked links cannot be revoked again.
+     *
+     * @param connection - Connection to the Verified Partner Business Org (PBO).
+     * @param options - Exactly one request ID or authoring org ID identifying the accepted link.
+     * @returns the revoked trust relationship details.
+     */
+    static revoke(connection: Connection, options: PackageTrustLinkRevokeOptions): Promise<PackageTrustLinkRevokeResult>;
     /**
      * Clear the connected authoring org's Public Secure (VerifiedDev) trust link, returning it to the
      * `Not Linked` state.

package/lib/package/packageTrustLink.js

@@ -16,7 +16,6 @@ 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)) {
@@ -141,59 +140,33 @@ class PackageTrustLink {
      * @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',
-        };
+        return updateInboundTrustLink(connection, options, 'Pending', 'Accepted', 'pendingTrustLinkNotFound');
+    }
+    /**
+     * Deny a pending Public Secure (VerifiedDev) trust-link request for the connected Verified PBO.
+     *
+     * Core only allows Pending → Declined on the verified-org copy. This does not delete the
+     * relationship; the authoring org can unlink and request again.
+     *
+     * @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 declined trust relationship details.
+     */
+    static async deny(connection, options) {
+        return updateInboundTrustLink(connection, options, 'Pending', 'Declined', 'pendingTrustLinkNotFound');
+    }
+    /**
+     * Revoke an accepted Public Secure (VerifiedDev) trust link for the connected Verified PBO.
+     *
+     * Core only allows Accepted → Revoked on the verified-org copy. Pending requests must be
+     * denied instead; already-declined or already-revoked links cannot be revoked again.
+     *
+     * @param connection - Connection to the Verified Partner Business Org (PBO).
+     * @param options - Exactly one request ID or authoring org ID identifying the accepted link.
+     * @returns the revoked trust relationship details.
+     */
+    static async revoke(connection, options) {
+        return updateInboundTrustLink(connection, options, 'Accepted', 'Revoked', 'acceptedTrustLinkNotFound');
     }
     /**
      * Clear the connected authoring org's Public Secure (VerifiedDev) trust link, returning it to the
@@ -227,6 +200,57 @@ class PackageTrustLink {
     }
 }
 exports.PackageTrustLink = PackageTrustLink;
+async function updateInboundTrustLink(connection, options, requiredStatus, nextStatus, notFoundMessage) {
+    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') || !(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') || !(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 = '${requiredStatus}' AND ${selector} ORDER BY CreatedDate DESC LIMIT 1`;
+    const queryResult = await connection.autoFetchQuery(query, { tooling: true });
+    const matchingRequest = queryResult.records?.[0];
+    if (!matchingRequest) {
+        throw messages.createError(notFoundMessage, [selectorValue]);
+    }
+    const updateResult = await connection.tooling.update(TRUST_LINK_SOBJECT, {
+        Id: matchingRequest.Id,
+        Status: nextStatus,
+    });
+    if (!updateResult.success) {
+        throw (0, packageUtils_1.combineSaveErrors)(TRUST_LINK_SOBJECT, 'update', updateResult.errors);
+    }
+    return {
+        LinkRequestId: matchingRequest.Id,
+        AuthoringOrgId: matchingRequest.AuthoringOrg,
+        VerifiedOrgId: matchingRequest.VerifiedOrg,
+        Status: nextStatus,
+    };
+}
 async function queryExistingTrustLink(connection) {
     const query = `SELECT Id, VerifiedOrg, Status, EstablishedDate, RevokedDate, CreatedDate FROM ${TRUST_LINK_SOBJECT} LIMIT 1`;
     const result = await connection.autoFetchQuery(query, { tooling: true });

package/messages/package_trust_link.md

@@ -34,6 +34,10 @@ The Authoring Org ID %s isn't valid. Specify a valid organization ID (starts wit
 
 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.
 
+# acceptedTrustLinkNotFound
+
+No accepted trust link matching %s was found for this Verified Org. Run "sf package trust link list --status approved" to review approved links.
+
 # 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.4",
+  "version": "5.0.9-spi.5",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",