@codefresh-io/authenticated-entity - npm Package Compare versions

Comparing version 2.6.0 to 2.7.0

lib/Agent.js

@@ -29,3 +29,3 @@ const _ = require('lodash');
 
-        data.account = Entity.extractAccountData(data.account);
+        data.account = Entity.extractAccountData(data.account, undefined, true);
 
@@ -32,0 +32,0 @@ super({

lib/Engine.js

@@ -35,3 +35,3 @@ const _ = require('lodash');
 
-        data.account = Entity.extractAccountData(data.account);
+        data.account = Entity.extractAccountData(data.account, undefined, true);
 
@@ -38,0 +38,0 @@ super({

lib/Entity.js

@@ -44,3 +44,3 @@ const _ = require('lodash');
 
-    static extractAccountData(account, userId = '') {
+    static extractAccountData(account, userId = '', insertFeatures = false) {
         return {
@@ -58,3 +58,3 @@ name: account.name,
             ...(account.segment && { segment: account.segment }),
-            ...(account.features && { features: account.features }),
+            ...(insertFeatures && account.features && { features: account.features }),
             CFCRState: {
@@ -61,0 +61,0 @@ enabled: _.get(account, 'CFCRState.enabled', false)

lib/RuntimeEnvironment.js

@@ -29,3 +29,3 @@ const _ = require('lodash');
 
-        data.account = Entity.extractAccountData(data.account);
+        data.account = Entity.extractAccountData(data.account, undefined, true);
 
@@ -32,0 +32,0 @@ super({

lib/tests/Agent.unit.spec.js

@@ -19,2 +19,5 @@ 'use strict';
             _id: 'fake-account-id',
+            features: {
+                key: 'val'
+            }
         },
@@ -42,4 +45,11 @@ name: 'fake-agent-name'
     });
+
+    it('should add feature flags', () => {
+        const agent = new Agent(getValidConfig());
+        expect(agent.toJson().account.features).to.deep.equal({
+            key: 'val'
+        });
+    });
 }
 
 );

lib/tests/Engine.unit.spec.js

@@ -29,3 +29,6 @@ 'use strict';
             'supportPlan': undefined,
-            'teams': []
+            'teams': [],
+            features: {
+                key: 'val'
+            }
         },
@@ -90,3 +93,3 @@ workflowId: 'fake-workflow-id',
         const engine = new Engine(getValidConfig());
-        expect(engine.toString()).to.equal('{"type":"engine","account":{"name":"fake-account-name","id":"fake-account-id","_id":"fake-account-id","isAdmin":false,"teams":[],"CFCRState":{"enabled":false}},"workflowId":"fake-workflow-id","name":"fake-name"}');
+        expect(engine.toString()).to.equal('{"type":"engine","account":{"name":"fake-account-name","id":"fake-account-id","_id":"fake-account-id","isAdmin":false,"teams":[],"features":{"key":"val"},"CFCRState":{"enabled":false}},"workflowId":"fake-workflow-id","name":"fake-name"}');
     });
@@ -96,3 +99,3 @@
         const engine = new Engine(getValidConfig());
-        expect(engine.generateHashString()).to.equal('37216c024a956972767a3b6a4874dbaeec49658103e002220321d4fcba717b4a');
+        expect(engine.generateHashString()).to.equal('61f0436b7a3568778c8e7a11894806b1ea455b61fc5af2e8d5f4fcbc2f34d8f7');
     });
@@ -102,6 +105,13 @@
         const engine = new Engine(getValidConfig());
-        expect(engine.encodeToBase64String()).to.equal('eyJ0eXBlIjoiZW5naW5lIiwiYWNjb3VudCI6eyJuYW1lIjoiZmFrZS1hY2NvdW50LW5hbWUiLCJpZCI6ImZha2UtYWNjb3VudC1pZCIsIl9pZCI6ImZha2UtYWNjb3VudC1pZCIsImlzQWRtaW4iOmZhbHNlLCJ0ZWFtcyI6W10sIkNGQ1JTdGF0ZSI6eyJlbmFibGVkIjpmYWxzZX19LCJ3b3JrZmxvd0lkIjoiZmFrZS13b3JrZmxvdy1pZCIsIm5hbWUiOiJmYWtlLW5hbWUifQ==');
+        expect(engine.encodeToBase64String()).to.equal('eyJ0eXBlIjoiZW5naW5lIiwiYWNjb3VudCI6eyJuYW1lIjoiZmFrZS1hY2NvdW50LW5hbWUiLCJpZCI6ImZha2UtYWNjb3VudC1pZCIsIl9pZCI6ImZha2UtYWNjb3VudC1pZCIsImlzQWRtaW4iOmZhbHNlLCJ0ZWFtcyI6W10sImZlYXR1cmVzIjp7ImtleSI6InZhbCJ9LCJDRkNSU3RhdGUiOnsiZW5hYmxlZCI6ZmFsc2V9fSwid29ya2Zsb3dJZCI6ImZha2Utd29ya2Zsb3ctaWQiLCJuYW1lIjoiZmFrZS1uYW1lIn0=');
     });
 
+    it('should add feature flags', () => {
+        const agent = new Engine(getValidConfig());
+        expect(agent.toJson().account.features).to.deep.equal({
+            key: 'val'
+        });
+    });
+
 });
 

lib/tests/RuntimeEnvironment.unit.spec.js

@@ -29,3 +29,6 @@ 'use strict';
             'supportPlan': undefined,
-            'teams': []
+            'teams': [],
+            features: {
+                key: 'val'
+            }
         },
@@ -70,3 +73,3 @@ name: 'fake-re-name'
         const re = new RuntimeEnvironment(getValidConfig());
-        expect(re.toString()).to.equal('{"type":"runtime-environment","account":{"name":"fake-account-name","id":"fake-account-id","_id":"fake-account-id","isAdmin":false,"teams":[],"CFCRState":{"enabled":false}},"name":"fake-re-name"}');
+        expect(re.toString()).to.equal('{"type":"runtime-environment","account":{"name":"fake-account-name","id":"fake-account-id","_id":"fake-account-id","isAdmin":false,"teams":[],"features":{"key":"val"},"CFCRState":{"enabled":false}},"name":"fake-re-name"}');
     });
@@ -81,3 +84,3 @@
         const re = new RuntimeEnvironment(getValidConfig());
-        expect(re.generateHashString()).to.equal('a9a1a08ce0f4ca3e13e6ad2b9761bca8c21eb67a5dce0a534ad074c2e366629f');
+        expect(re.generateHashString()).to.equal('737289b33a120d6b486812476f6e3507237a918938e106a8d13ab0493cd4f886');
     });
@@ -87,6 +90,13 @@
         const re = new RuntimeEnvironment(getValidConfig());
-        expect(re.encodeToBase64String()).to.equal('eyJ0eXBlIjoicnVudGltZS1lbnZpcm9ubWVudCIsImFjY291bnQiOnsibmFtZSI6ImZha2UtYWNjb3VudC1uYW1lIiwiaWQiOiJmYWtlLWFjY291bnQtaWQiLCJfaWQiOiJmYWtlLWFjY291bnQtaWQiLCJpc0FkbWluIjpmYWxzZSwidGVhbXMiOltdLCJDRkNSU3RhdGUiOnsiZW5hYmxlZCI6ZmFsc2V9fSwibmFtZSI6ImZha2UtcmUtbmFtZSJ9');
+        expect(re.encodeToBase64String()).to.equal('eyJ0eXBlIjoicnVudGltZS1lbnZpcm9ubWVudCIsImFjY291bnQiOnsibmFtZSI6ImZha2UtYWNjb3VudC1uYW1lIiwiaWQiOiJmYWtlLWFjY291bnQtaWQiLCJfaWQiOiJmYWtlLWFjY291bnQtaWQiLCJpc0FkbWluIjpmYWxzZSwidGVhbXMiOltdLCJmZWF0dXJlcyI6eyJrZXkiOiJ2YWwifSwiQ0ZDUlN0YXRlIjp7ImVuYWJsZWQiOmZhbHNlfX0sIm5hbWUiOiJmYWtlLXJlLW5hbWUifQ==');
     });
 
+    it('should add feature flags', () => {
+        const agent = new RuntimeEnvironment(getValidConfig());
+        expect(agent.toJson().account.features).to.deep.equal({
+            key: 'val'
+        });
+    });
+
 });
 

lib/User.js

@@ -42,3 +42,2 @@ const _ = require('lodash');
                 .map((account) => {
-                    delete account.features;
                     return this.extractAccountData(account, userId);
@@ -45,0 +44,0 @@ })

package.json

 {
   "name": "@codefresh-io/authenticated-entity",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "",
@@ -5,0 +5,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

280111

increased by0.35%

Lines of code

1666

increased by1.65%

No dependency changes