No payload is not an authentic player (#430)

* No payload should not be authentic player * unless no payload necessary
boardgameio · Jul 16, 2019 · fd70ed5 · fd70ed5
1 parent 621cc80
commit fd70ed5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/src/master/master.js b/src/master/master.js
@@ -68,10 +68,6 @@ export const isActionFromAuthenticPlayer = ({
     return true;
   }
 
-  if (!action.payload) {
-    return true;
-  }
-
   const hasCredentials = Object.keys(gameMetadata.players).some(key => {
     return !!(
       gameMetadata.players[key] && gameMetadata.players[key].credentials
@@ -81,6 +77,10 @@ export const isActionFromAuthenticPlayer = ({
     return true;
   }
 
+  if (!action.payload) {
+    return false;
+  }
+
   if (!action.payload.credentials) {
     return false;
   }

diff --git a/src/master/master.test.js b/src/master/master.test.js
@@ -439,22 +439,6 @@ describe('isActionFromAuthenticPlayer', () => {
     });
   });
 
-  describe('when action contains no payload', () => {
-    beforeEach(() => {
-      action = {};
-    });
-
-    test('the action is authentic', async () => {
-      const result = isActionFromAuthenticPlayer({
-        action,
-        gameMetadata,
-        playerID,
-      });
-
-      expect(result).toBeTruthy();
-    });
-  });
-
   describe('when game has no credentials', () => {
     beforeEach(() => {
       gameMetadata = {
@@ -476,6 +460,22 @@ describe('isActionFromAuthenticPlayer', () => {
   });
 
   describe('when game has credentials', () => {
+    describe('when action contains no payload', () => {
+      beforeEach(() => {
+        action = {};
+      });
+
+      test('the action is not authentic', async () => {
+        const result = isActionFromAuthenticPlayer({
+          action,
+          gameMetadata,
+          playerID,
+        });
+
+        expect(result).toBeFalsy();
+      });
+    });
+
     describe('when action contains no credentials', () => {
       beforeEach(() => {
         action = {