Merge pull request #73 from woehrl01/ack_register

0003540: Do not send sync_disabled during registration attempt
JumpMind · Oct 29, 2018 · 94e4d5e · 94e4d5e
2 parents 43bcd8a + 171b209
commit 94e4d5e
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java
@@ -933,7 +933,11 @@ public AuthenticationStatus getAuthenticationStatus(String nodeId, String securi
         if (node == null) {
             retVal = AuthenticationStatus.REGISTRATION_REQUIRED;
         } else if (!syncEnabled(node)) {
-            retVal = AuthenticationStatus.SYNC_DISABLED;
+            if(registrationOpen(node)){
+                retVal = AuthenticationStatus.REGISTRATION_REQUIRED;
+            }else{
+                retVal = AuthenticationStatus.SYNC_DISABLED;
+            }
         } else if (!isNodeAuthorized(nodeId, securityToken)) {
             retVal = AuthenticationStatus.FORBIDDEN;
         }
@@ -946,6 +950,14 @@ protected boolean syncEnabled(Node node) {
             syncEnabled = node.isSyncEnabled();
         }
         return syncEnabled;
-    }    
+    }
+
+    protected boolean registrationOpen(Node node){
+        NodeSecurity security = findNodeSecurity(node.getNodeId());
+        if(security != null){
+            return security.isRegistrationEnabled();
+        }
+        return false;
+    } 
 
 }