Better ssl checking

kegaretail · May 2, 2019 · a2d0167 · a2d0167
1 parent b8fe2a3
commit a2d0167
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/android/src/main/java/nl/kega/reactnativerabbitmq/RabbitMqConnection.java b/android/src/main/java/nl/kega/reactnativerabbitmq/RabbitMqConnection.java
@@ -71,7 +71,7 @@ public void initialize(ReadableMap config) {
         this.factory.setRequestedHeartbeat(10);
 
         try {
-            if (this.config.getInt("port") == 5671) {
+            if (this.config.getBoolean("ssl")) {
                 this.factory.useSslProtocol();
             }
         } catch(Exception e) {

diff --git a/ios/RCTReactNativeRabbitMq/RabbitMqConnection.m b/ios/RCTReactNativeRabbitMq/RabbitMqConnection.m
@@ -29,13 +29,17 @@ @implementation RabbitMqConnection
 {
 
     RabbitMqDelegateLogger *delegate = [[RabbitMqDelegateLogger alloc] initWithBridge:self.bridge];
-
-    if(self.config[@"port"] == 5671) {
-        NSString *uri = [NSString stringWithFormat:@"amqps://%@:%@@%@:%@/%@", self.config[@"username"], self.config[@"password"], self.config[@"host"], self.config[@"port"], self.config[@"virtualhost"]];
-    } else {
-        NSString *uri = [NSString stringWithFormat:@"amqp://%@:%@@%@:%@/%@", self.config[@"username"], self.config[@"password"], self.config[@"host"], self.config[@"port"], self.config[@"virtualhost"]];        
+
+    NSString *protocol = @"amqp";
+
+    Boolean ssl = self.config[@"ssl"];
+    if (ssl) {
+        protocol = @"amqps";
     }
 
+    NSString *uri = [NSString stringWithFormat:@"%@://%@:%@@%@:%@/%@", protocol, self.config[@"username"], self.config[@"password"], self.config[@"host"], self.config[@"port"], self.config[@"virtualhost"]];        
+
+
     self.connection = [[RMQConnection alloc] initWithUri:uri 
                                               channelMax:@65535 
                                                 frameMax:@(RMQFrameMax)