GitOps Account - fixes feature flag param verification (#533)

Author: petruki

src/middleware/gitops.js

@@ -26,8 +26,8 @@ const CONTENT_TYPE_ARRAY = ['COMPONENT'];
 export async function featureFlag(req, res, next) {
     try {
         const domainId = req.path === '/gitops/v1/push' ? 
-            req.domain : req.body?.domain.id | req.params.domain;
-            
+            req.domain : req.body?.domain.id || req.params.domain;
+        
         await checkGitopsIntegration(domainId);
         next();
     } catch (e) {

tests/gitops-account.test.js

@@ -27,7 +27,7 @@ describe('GitOps Account - Feature Toggle', () => {
         process.env.SWITCHER_API_ENABLE = false;
     });
 
-    test('GITOPS_ACCOUNT_SUITE - Should return error when feature is disabled', async () => {
+    test('GITOPS_ACCOUNT_SUITE - Should return error when feature is disabled - body domainId', async () => {
         const req = await request(app)
             .post('/gitops/v1/account/subscribe')
             .set('Authorization', `Bearer ${adminMasterAccountToken}`)
@@ -50,6 +50,15 @@ describe('GitOps Account - Feature Toggle', () => {
 
         expect(req.body.error).toBe('GitOps Integration is not available.');
     });
+
+    test('GITOPS_ACCOUNT_SUITE - Should return error when feature is disabled - param domainId', async () => {
+        const req = await request(app)
+            .get(`/gitops/v1/account/${domainId}`)
+            .set('Authorization', `Bearer ${adminMasterAccountToken}`)
+            .expect(400);
+        
+        expect(req.body.error).toBe('GitOps Integration is not available.');
+    });
 });
 
 describe('GitOps Account - Subscribe', () => {