Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return the connection string instead of the connection URL #22

Merged
merged 1 commit into from
May 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
id="cordova-plugin-em-settings"
version="1.2.2">
version="1.2.3">

<name>ConnectionSettings</name>
<description>Simple package that stores all the connection settings that need to be configured</description>
Expand Down
2 changes: 1 addition & 1 deletion src/ios/BEMConnectionSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
-(NSDictionary*)getSettings;
-(NSDictionary*)getDefaultConfig;
-(void)setSettings:(NSDictionary*)newConfig;
-(NSURL*) getConnectUrl;
-(NSString*) getConnectString;
-(NSString*) authMethod;
-(NSString*) authValueForKey:(NSString*) key;
@end
4 changes: 2 additions & 2 deletions src/ios/BEMConnectionSettings.m
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ - (NSDictionary*)getDefaultConfig
// from the plugin initialize methods before the javascript has the opportunity to set the config
// Note that we cannot throw from the constructor instead because then we cannot create the shared instance
// and even the javascript cannot set the config
- (NSURL*)getConnectUrl
- (NSString*)getConnectString
{
if (connSettingDict == NULL) {
NSException* notFoundEx = [[NSException alloc] initWithName:@"SettingsNotFound"
Expand All @@ -94,7 +94,7 @@ - (NSURL*)getConnectUrl
@throw notFoundEx;
}

return [NSURL URLWithString:[connSettingDict objectForKey: @"connectUrl"]];
return [connSettingDict objectForKey: @"connectUrl"];
}

- (NSDictionary*) nativeAuth
Expand Down