@adobe/spacecat-shared-tier-client 1.1.1 → 1.2.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@adobe/spacecat-shared-tier-client-v1.2.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-tier-client-v1.1.2...@adobe/spacecat-shared-tier-client-v1.2.0) (2025-10-08)
+
+
+### Features
+
+* revoke enrollment API ([#1009](https://github.com/adobe/spacecat-shared/issues/1009)) ([7617368](https://github.com/adobe/spacecat-shared/commit/7617368082375e37ee1f23a097e7f4cf6b29edd7))
+
+# [@adobe/spacecat-shared-tier-client-v1.1.2](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-tier-client-v1.1.1...@adobe/spacecat-shared-tier-client-v1.1.2) (2025-09-24)
+
+
+### Bug Fixes
+
+* move logs to debug ([#982](https://github.com/adobe/spacecat-shared/issues/982)) ([7a78c6e](https://github.com/adobe/spacecat-shared/commit/7a78c6ee011bbc8adf162644153170d3ebf29c83))
+
 # [@adobe/spacecat-shared-tier-client-v1.1.1](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-tier-client-v1.1.0...@adobe/spacecat-shared-tier-client-v1.1.1) (2025-09-22)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-tier-client",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Shared modules of the Spacecat Services - Tier Client",
   "type": "module",
   "engines": {

package/src/tier-client.js

@@ -16,7 +16,6 @@ import {
   Entitlement as EntitlementModel,
   Organization,
 } from '@adobe/spacecat-shared-data-access';
-
 /**
  * TierClient provides methods to manage entitlements and site enrollments.
  */
@@ -104,41 +103,28 @@ class TierClient {
   async checkValidEntitlement() {
     try {
       const orgId = this.organization.getId();
-      this.log.info(`Checking for valid entitlement for org ${orgId} and product ${this.productCode}`);
-
       const entitlement = await this.Entitlement
         .findByOrganizationIdAndProductCode(orgId, this.productCode);
 
       if (!entitlement) {
-        this.log.info(`No valid entitlement found for org ${orgId} and product ${this.productCode}`);
         return {};
       }
-
-      this.log.info(`Found valid entitlement: ${entitlement.getId()}`);
-
       // Only check for site enrollment if site is provided
       if (this.site) {
         const siteId = this.site.getId();
-        this.log.info(`Checking for valid site enrollment for site ${siteId} and entitlement ${entitlement.getId()}`);
-
         const siteEnrollments = await this.SiteEnrollment.allBySiteId(siteId);
         const validSiteEnrollment = siteEnrollments.find(
           (se) => se.getEntitlementId() === entitlement.getId(),
         );
 
         if (!validSiteEnrollment) {
-          this.log.info(`No valid site enrollment found for site ${siteId} and entitlement ${entitlement.getId()}`);
           return { entitlement };
         }
-
-        this.log.info(`Found valid site enrollment: ${validSiteEnrollment.getId()}`);
-
         return {
           entitlement,
           siteEnrollment: validSiteEnrollment,
         };
       } else {
-        this.log.info(`No site provided, returning entitlement only for org ${orgId}`);
         return { entitlement };
       }
     } catch (error) {
@@ -159,10 +145,7 @@ class TierClient {
       if (!Object.values(EntitlementModel.TIERS).includes(tier)) {
         throw new Error(`Invalid tier: ${tier}. Valid tiers: ${Object.values(EntitlementModel.TIERS).join(', ')}`);
       }
-
       const orgId = this.organization.getId();
-      this.log.info(`Creating/updating entitlement for org ${orgId}, product ${this.productCode}, tier ${tier}`);
-
       // Check what already exists
       const existing = await this.checkValidEntitlement();
 
@@ -172,7 +155,6 @@ class TierClient {
 
         // If tier doesn't match, update it
         if (currentTier !== tier) {
-          this.log.info(`Updating entitlement tier from ${currentTier} to ${tier} for org ${orgId}`);
           existing.entitlement.setTier(tier);
           await existing.entitlement.save();
         }
@@ -184,7 +166,6 @@ class TierClient {
             siteId,
             entitlementId: existing.entitlement.getId(),
           });
-          this.log.info(`Created site enrollment: ${siteEnrollment.getId()}`);
           return {
             entitlement: existing.entitlement,
             siteEnrollment,
@@ -205,8 +186,6 @@ class TierClient {
         },
       });
 
-      this.log.info(`Created new entitlement: ${entitlement.getId()}`);
-
       // If no site provided, return entitlement only
       if (!this.site) {
         return { entitlement };
@@ -219,8 +198,6 @@ class TierClient {
         entitlementId: entitlement.getId(),
       });
 
-      this.log.info(`Created site enrollment: ${siteEnrollment.getId()}`);
-
       return {
         entitlement,
         siteEnrollment,
@@ -230,6 +207,19 @@ class TierClient {
       throw error;
     }
   }
+
+  /**
+   * Revokes site enrollment for the current site.
+   * @returns {Promise<object>} HTTP response object.
+   */
+  async revokeSiteEnrollment() {
+    const existing = await this.checkValidEntitlement();
+    if (existing.siteEnrollment) {
+      await existing.siteEnrollment.remove();
+    } else {
+      throw new Error('Site enrollment not found');
+    }
+  }
 }
 
 export default TierClient;

package/test/tier-client.test.js

@@ -85,6 +85,7 @@ describe('TierClient', () => {
     log: {
       info: sandbox.stub(),
       error: sandbox.stub(),
+      debug: sandbox.stub(),
     },
     attributes: {
       authInfo: {
@@ -482,4 +483,64 @@ describe('TierClient', () => {
       expect(result).to.deep.equal({ entitlement: mockEntitlement });
     });
   });
+
+  describe('revokeSiteEnrollment', () => {
+    it('should successfully revoke site enrollment when it exists', async () => {
+      const mockSiteEnrollmentWithRemove = {
+        ...mockSiteEnrollment,
+        remove: sandbox.stub().resolves(),
+      };
+
+      mockDataAccess.Entitlement.findByOrganizationIdAndProductCode.resolves(mockEntitlement);
+      mockDataAccess.SiteEnrollment.allBySiteId.resolves([mockSiteEnrollmentWithRemove]);
+
+      await tierClient.revokeSiteEnrollment();
+
+      expect(mockSiteEnrollmentWithRemove.remove.calledOnce).to.be.true;
+    });
+
+    it('should throw error when site enrollment does not exist', async () => {
+      mockDataAccess.Entitlement.findByOrganizationIdAndProductCode.resolves(mockEntitlement);
+      mockDataAccess.SiteEnrollment.allBySiteId.resolves([]);
+
+      await expect(tierClient.revokeSiteEnrollment()).to.be.rejectedWith('Site enrollment not found');
+    });
+
+    it('should throw error when entitlement does not exist', async () => {
+      mockDataAccess.Entitlement.findByOrganizationIdAndProductCode.resolves(null);
+
+      await expect(tierClient.revokeSiteEnrollment()).to.be.rejectedWith('Site enrollment not found');
+    });
+
+    it('should handle database errors during revocation', async () => {
+      const mockSiteEnrollmentWithRemove = {
+        ...mockSiteEnrollment,
+        remove: sandbox.stub().rejects(new Error('Database error')),
+      };
+
+      mockDataAccess.Entitlement.findByOrganizationIdAndProductCode.resolves(mockEntitlement);
+      mockDataAccess.SiteEnrollment.allBySiteId.resolves([mockSiteEnrollmentWithRemove]);
+
+      await expect(tierClient.revokeSiteEnrollment()).to.be.rejectedWith('Database error');
+    });
+
+    it('should handle errors when checking valid entitlement', async () => {
+      mockDataAccess.Entitlement.findByOrganizationIdAndProductCode.rejects(new Error('Database error'));
+
+      await expect(tierClient.revokeSiteEnrollment()).to.be.rejectedWith('Database error');
+    });
+
+    it('should throw error with organization-only client (no site)', async () => {
+      const orgOnlyClient = new TierClient(
+        mockContext,
+        organizationInstance,
+        null,
+        productCode,
+      );
+
+      mockDataAccess.Entitlement.findByOrganizationIdAndProductCode.resolves(mockEntitlement);
+
+      await expect(orgOnlyClient.revokeSiteEnrollment()).to.be.rejectedWith('Site enrollment not found');
+    });
+  });
 });