fix: always return an executionDescription from sendTaskSuccess

affects: statebox, tymly
wmfs · Jun 13, 2018 · 2009585 · 2009585
1 parent 8551eb6
commit 2009585
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/lib/plugin/components/services/statebox/index.js b/lib/plugin/components/services/statebox/index.js
@@ -130,11 +130,9 @@ class StateboxService {
     )
 
     // hmm, should we be returning the execution description here?
-    if (authOk) {
-      return this.statebox.sendTaskSuccess(executionName, output)
-    } else {
-      throw new Error(errExecDesc.errorMessage)
-    }
+    return (authOk)
+      ? this.statebox.sendTaskSuccess(executionName, output)
+      : errExecDesc
   } // sendTaskSuccess
 
   sendTaskHeartbeat (executionName, output, executionOptions, callback) {
@@ -151,11 +149,11 @@ class StateboxService {
     return promiseOrCallback(p, callback)
   } // waitUntilStoppedRunning
 
+  /*
   authorisationCheck (stateMachineName, executionOptions, action) {
     return [true] // STUB!
   }
-
-  /*
+  */
   async authorisationCheck (userId, stateMachineName, executionOptions, action) {
     const rbac = this.services.rbac
 
@@ -183,7 +181,7 @@ class StateboxService {
       }
     ]
   } // authorisationCheck
-  */
+
 } // class StateboxService
 
 function addResources (statebox, options) {

diff --git a/test/statebox-service-acl-tests.js b/test/statebox-service-acl-tests.js
@@ -46,7 +46,7 @@ const heartBeatTests = [
   }
 ]
 
-xdescribe('statebox service RBAC authorisation tests', function () {
+describe('statebox service RBAC authorisation tests', function () {
   this.timeout(process.env.TIMEOUT || 5000)
 
   let tymlyService
@@ -222,13 +222,14 @@ xdescribe('statebox service RBAC authorisation tests', function () {
               })
 
               it('sendTaskSuccess', async () => {
-                await statebox.sendTaskSuccess(
+                const execDesc = await statebox.sendTaskSuccess(
                   executionName,
                   {},
                   {
                     userId: allowed
                   }
                 )
+                expect(execDesc.status).to.eql('SUCCEEDED')
               })
             })
           } // for allowed ...
@@ -251,16 +252,16 @@ xdescribe('statebox service RBAC authorisation tests', function () {
                 executionName = execDesc.executionName
               })
 
-              it('sendTaskSuccess', (done) => {
-                statebox.sendTaskSuccess(
+              it('sendTaskSuccess', async () => {
+                const execDesc = await statebox.sendTaskSuccess(
                   executionName,
                   {},
                   {
                     userId: disallowed
                   }
                 )
-                  .then(() => done(new Error('Should have failed!')))
-                  .catch(() => done())
+
+                expect(execDesc.status).to.eql('FAILED')
               })
             })
           } // for allowed ...