Skip to content

Commit a2d0167

Browse files
committed
Better ssl checking
1 parent b8fe2a3 commit a2d0167

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

android/src/main/java/nl/kega/reactnativerabbitmq/RabbitMqConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void initialize(ReadableMap config) {
7171
this.factory.setRequestedHeartbeat(10);
7272

7373
try {
74-
if (this.config.getInt("port") == 5671) {
74+
if (this.config.getBoolean("ssl")) {
7575
this.factory.useSslProtocol();
7676
}
7777
} catch(Exception e) {

ios/RCTReactNativeRabbitMq/RabbitMqConnection.m

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,17 @@ @implementation RabbitMqConnection
2929
{
3030

3131
RabbitMqDelegateLogger *delegate = [[RabbitMqDelegateLogger alloc] initWithBridge:self.bridge];
32-
33-
if(self.config[@"port"] == 5671) {
34-
NSString *uri = [NSString stringWithFormat:@"amqps://%@:%@@%@:%@/%@", self.config[@"username"], self.config[@"password"], self.config[@"host"], self.config[@"port"], self.config[@"virtualhost"]];
35-
} else {
36-
NSString *uri = [NSString stringWithFormat:@"amqp://%@:%@@%@:%@/%@", self.config[@"username"], self.config[@"password"], self.config[@"host"], self.config[@"port"], self.config[@"virtualhost"]];
32+
33+
NSString *protocol = @"amqp";
34+
35+
Boolean ssl = self.config[@"ssl"];
36+
if (ssl) {
37+
protocol = @"amqps";
3738
}
3839

40+
NSString *uri = [NSString stringWithFormat:@"%@://%@:%@@%@:%@/%@", protocol, self.config[@"username"], self.config[@"password"], self.config[@"host"], self.config[@"port"], self.config[@"virtualhost"]];
41+
42+
3943
self.connection = [[RMQConnection alloc] initWithUri:uri
4044
channelMax:@65535
4145
frameMax:@(RMQFrameMax)

0 commit comments

Comments
 (0)