@bearei/server-common 0.0.163 → 0.0.165

package/dist/access/access.interceptor.js

@@ -29,7 +29,6 @@ let AccessInterceptor = class AccessInterceptor {
         request.headers['x-ei-domain-id'] = request.issuer;
         request.headers['x-ei-ip'] = request.headers['x-forwarded-for'] ?? request.headers['x-real-ip'];
         request.headers['x-ei-subject'] = request.subject;
-        request.headers['x-ei-subscription'] = Boolean(request.subscription);
         return next.handle();
     }
 };

package/dist/access/access.interceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"access.interceptor.js","sourceRoot":"","sources":["../../src/access/access.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAyF;AAEzF,oCAAkD;AAG3C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IACtB,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAe,CAAA;QAEhE,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;QAC5B,CAAC;QAED,MAAM,oBAAoB,GAAG;YACrB,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;YAC9B,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC;YACjC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;YAC1B,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;YAC/B,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC;SAC3C,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAEf,IAAI,oBAAoB,EAAE,CAAC;YACnB,IAAA,sBAAc,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,yBAAyB,EAAC,CAAC,CAAC,iBAAS,CAAC,WAAW,CAAC,CAAA;QACnG,CAAC;QAED,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAA;QACjD,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAA;QAClD,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAC/F,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,OAAO,CAAA;QACjD,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QAEpE,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;IAC5B,CAAC;CACR,CAAA;AA5BY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;GACA,iBAAiB,CA4B7B"}
+{"version":3,"file":"access.interceptor.js","sourceRoot":"","sources":["../../src/access/access.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAyF;AAEzF,oCAAkD;AAG3C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IACtB,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAe,CAAA;QAEhE,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;QAC5B,CAAC;QAED,MAAM,oBAAoB,GAAG;YACrB,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;YAC9B,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC;YACjC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;YAC1B,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;YAC/B,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC;SAC3C,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAEf,IAAI,oBAAoB,EAAE,CAAC;YACnB,IAAA,sBAAc,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,yBAAyB,EAAC,CAAC,CAAC,iBAAS,CAAC,WAAW,CAAC,CAAA;QACnG,CAAC;QAED,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAA;QACjD,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAA;QAClD,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAC/F,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,OAAO,CAAA;QAEjD,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;IAC5B,CAAC;CACR,CAAA;AA3BY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;GACA,iBAAiB,CA2B7B"}

package/dist/subscription-feature/index.d.ts

@@ -1,2 +1,2 @@
 export * from './subscription-feature.enum';
-export * from './subscription-feature.guard';
+export * from './subscription-feature.interceptor';

package/dist/subscription-feature/index.js

@@ -15,5 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./subscription-feature.enum"), exports);
-__exportStar(require("./subscription-feature.guard"), exports);
+__exportStar(require("./subscription-feature.interceptor"), exports);
 //# sourceMappingURL=index.js.map

package/dist/subscription-feature/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/subscription-feature/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA2C;AAC3C,+DAA4C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/subscription-feature/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA2C;AAC3C,qEAAkD"}

package/dist/subscription-feature/subscription-feature.enum.d.ts

@@ -1,5 +1,5 @@
 export declare enum SubscriptionFeature {
     BOOKMARK_BOOKMARK_SUBSCRIPTION = "bookmark:bookmark:subscription",
-    BOOKMARK_BOOKMARK_TAG_SUBSCRIPTION = "bookmark:bookmarkTag:subscription",
-    BOOKMARK_CARTON_SUBSCRIPTION = "bookmark:carton:subscription"
+    BOOKMARK_CARTON_SUBSCRIPTION = "bookmark:carton:subscription",
+    BOOKMARK_TAG_SUBSCRIPTION = "bookmark:tag:subscription"
 }

package/dist/subscription-feature/subscription-feature.enum.js

@@ -4,7 +4,7 @@ exports.SubscriptionFeature = void 0;
 var SubscriptionFeature;
 (function (SubscriptionFeature) {
     SubscriptionFeature["BOOKMARK_BOOKMARK_SUBSCRIPTION"] = "bookmark:bookmark:subscription";
-    SubscriptionFeature["BOOKMARK_BOOKMARK_TAG_SUBSCRIPTION"] = "bookmark:bookmarkTag:subscription";
     SubscriptionFeature["BOOKMARK_CARTON_SUBSCRIPTION"] = "bookmark:carton:subscription";
+    SubscriptionFeature["BOOKMARK_TAG_SUBSCRIPTION"] = "bookmark:tag:subscription";
 })(SubscriptionFeature || (exports.SubscriptionFeature = SubscriptionFeature = {}));
 //# sourceMappingURL=subscription-feature.enum.js.map

package/dist/subscription-feature/subscription-feature.enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscription-feature.enum.js","sourceRoot":"","sources":["../../src/subscription-feature/subscription-feature.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IACvB,wFAAiE,CAAA;IACjE,+FAAwE,CAAA;IACxE,oFAA6D,CAAA;AACrE,CAAC,EAJW,mBAAmB,mCAAnB,mBAAmB,QAI9B"}
+{"version":3,"file":"subscription-feature.enum.js","sourceRoot":"","sources":["../../src/subscription-feature/subscription-feature.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IACvB,wFAAiE,CAAA;IACjE,oFAA6D,CAAA;IAC7D,8EAAuD,CAAA;AAC/D,CAAC,EAJW,mBAAmB,mCAAnB,mBAAmB,QAI9B"}

package/dist/subscription-feature/{subscription-feature.guard.d.ts → subscription-feature.interceptor.d.ts}

@@ -1,9 +1,9 @@
-import { CanActivate, ExecutionContext } from '@nestjs/common';
+import { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { AuthenticationService } from '../authentication';
-export declare class SubscriptionFeatureGuard implements CanActivate {
+export declare class SubscriptionFeatureInterceptor implements NestInterceptor {
     private readonly authenticationService;
     private readonly reflector;
     constructor(authenticationService: AuthenticationService, reflector: Reflector);
-    canActivate(context: ExecutionContext): Promise<boolean>;
+    intercept(context: ExecutionContext, next: CallHandler): Promise<import("rxjs").Observable<any>>;
 }

package/dist/subscription-feature/{subscription-feature.guard.js → subscription-feature.interceptor.js}

@@ -9,41 +9,48 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SubscriptionFeatureGuard = void 0;
+exports.SubscriptionFeatureInterceptor = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const authentication_1 = require("../authentication");
 const decorators_1 = require("../decorators");
-let SubscriptionFeatureGuard = class SubscriptionFeatureGuard {
+let SubscriptionFeatureInterceptor = class SubscriptionFeatureInterceptor {
     authenticationService;
     reflector;
     constructor(authenticationService, reflector) {
         this.authenticationService = authenticationService;
         this.reflector = reflector;
     }
-    async canActivate(context) {
+    async intercept(context, next) {
         const requiredSubscriptionFeatures = this.reflector.getAllAndOverride(decorators_1.AUTHENTICATION_SUBSCRIPTION_FEATURE_KEY, [context.getClass(), context.getHandler()]);
         if (!requiredSubscriptionFeatures) {
-            return true;
+            return next.handle();
         }
         const request = context.switchToHttp().getRequest();
         const { headers, subject, issuer, internalAccess } = request;
         if (internalAccess) {
-            return true;
+            return next.handle();
         }
-        return this.authenticationService
+        await this.authenticationService
             .authenticationSubscriptionFeature(headers)({
             domainId: issuer,
             keys: requiredSubscriptionFeatures,
             userId: subject
         })
-            .then(() => (request.subscription = true));
+            .then(() => (request.headers['x-ei-subscription'] = true))
+            .catch(error => {
+            if (error.status !== 403 && error.code !== '403004') {
+                throw error;
+            }
+            request.headers['x-ei-subscription'] = false;
+        });
+        return next.handle();
     }
 };
-exports.SubscriptionFeatureGuard = SubscriptionFeatureGuard;
-exports.SubscriptionFeatureGuard = SubscriptionFeatureGuard = __decorate([
+exports.SubscriptionFeatureInterceptor = SubscriptionFeatureInterceptor;
+exports.SubscriptionFeatureInterceptor = SubscriptionFeatureInterceptor = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [authentication_1.AuthenticationService,
         core_1.Reflector])
-], SubscriptionFeatureGuard);
-//# sourceMappingURL=subscription-feature.guard.js.map
+], SubscriptionFeatureInterceptor);
+//# sourceMappingURL=subscription-feature.interceptor.js.map

package/dist/subscription-feature/subscription-feature.interceptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subscription-feature.interceptor.js","sourceRoot":"","sources":["../../src/subscription-feature/subscription-feature.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyF;AACzF,uCAAsC;AACtC,sDAAuD;AACvD,8CAAqE;AAK9D,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAEV;IACA;IAFzB,YACyB,qBAA4C,EAC5C,SAAoB;QADpB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,cAAS,GAAT,SAAS,CAAW;IAC1C,CAAC;IAEJ,KAAK,CAAC,SAAS,CAAC,OAAyB,EAAE,IAAiB;QACpD,MAAM,4BAA4B,GAA0B,IAAI,CAAC,SAAS,CAAC,iBAAiB,CACpF,oDAAuC,EACvC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CACjD,CAAA;QAED,IAAI,CAAC,4BAA4B,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;QAC5B,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAe,CAAA;QAChE,MAAM,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAC,GAAG,OAAO,CAAA;QAE1D,IAAI,cAAc,EAAE,CAAC;YACb,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;QAC5B,CAAC;QAED,MAAM,IAAI,CAAC,qBAAqB;aACvB,iCAAiC,CAAC,OAAO,CAAC,CAAC;YACpC,QAAQ,EAAE,MAAM;YAChB,IAAI,EAAE,4BAA4B;YAClC,MAAM,EAAE,OAAO;SACtB,CAAC;aACD,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC,CAAC;aACzD,KAAK,CAAC,KAAK,CAAC,EAAE;YACP,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC9C,MAAM,KAAK,CAAA;YACnB,CAAC;YAED,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,KAAK,CAAA;QACpD,CAAC,CAAC,CAAA;QAEV,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;IAC5B,CAAC;CACR,CAAA;AAxCY,wEAA8B;yCAA9B,8BAA8B;IAD1C,IAAA,mBAAU,GAAE;qCAG2C,sCAAqB;QACjC,gBAAS;GAHxC,8BAA8B,CAwC1C"}