diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index bb5572af..d0b3713d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -59,6 +59,7 @@ body: label: Your Pushwoosh iOS SDK version description: Your iOS SDK version which was integrated to the app. You may find it on the [releases page](https://github.com/Pushwoosh/pushwoosh-ios-sdk/releases) options: + - 6.6.1 - 6.6.0 - 6.5.18 - 6.5.17 diff --git a/Documentation/PWMessage.md b/Documentation/PWMessage.md index b1e01beb..955ee328 100644 --- a/Documentation/PWMessage.md +++ b/Documentation/PWMessage.md @@ -5,7 +5,7 @@ Message from Pushwoosh. - + @@ -34,8 +34,8 @@ Message from Pushwoosh. ---------- -#### @property NSString \*_Nullable -Title of the push message.
Subtitle of the push message.
Body of the push message.
Remote URL or deeplink from the push message.
Original payload of the message. +#### @property NSString \*_Nullable +Title of the push message.
Subtitle of the push message.
Body of the push message.
Remote URL or deeplink from the push message.
Returns actionIdentifier of the button pressed
Original payload of the message. ---------- diff --git a/Framework/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h b/Framework/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h index 7fe2eebe..04cc78f0 100644 --- a/Framework/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h +++ b/Framework/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h @@ -18,7 +18,7 @@ #endif -#define PUSHWOOSH_VERSION @"6.6.0" +#define PUSHWOOSH_VERSION @"6.6.1" @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy; @@ -163,6 +163,11 @@ Tells the delegate that the user has pressed on the push notification banner. */ @property (nonatomic, readonly) NSDictionary * _Nullable payload; +/** + Returns actionIdentifier of the button pressed + */ +@property (nonatomic, readonly) NSString * _Nullable actionIdentifier; + /** Returns YES if this message is recieved from Pushwoosh. */ diff --git a/Framework/Pushwoosh.framework/Versions/A/Pushwoosh b/Framework/Pushwoosh.framework/Versions/A/Pushwoosh index d074a338..333e7e42 100644 Binary files a/Framework/Pushwoosh.framework/Versions/A/Pushwoosh and b/Framework/Pushwoosh.framework/Versions/A/Pushwoosh differ diff --git a/Framework/PushwooshGeozones.framework/Versions/A/PushwooshGeozones b/Framework/PushwooshGeozones.framework/Versions/A/PushwooshGeozones index 15c5f80c..30cde797 100644 Binary files a/Framework/PushwooshGeozones.framework/Versions/A/PushwooshGeozones and b/Framework/PushwooshGeozones.framework/Versions/A/PushwooshGeozones differ diff --git a/XCFramework/Pushwoosh.xcframework/Info.plist b/XCFramework/Pushwoosh.xcframework/Info.plist index 24282c01..c2a69460 100644 --- a/XCFramework/Pushwoosh.xcframework/Info.plist +++ b/XCFramework/Pushwoosh.xcframework/Info.plist @@ -5,23 +5,24 @@ AvailableLibraries + BinaryPath + Pushwoosh.framework/Pushwoosh LibraryIdentifier - ios-arm64_x86_64-maccatalyst + ios-arm64 LibraryPath Pushwoosh.framework SupportedArchitectures arm64 - x86_64 SupportedPlatform ios - SupportedPlatformVariant - maccatalyst + BinaryPath + Pushwoosh.framework/Versions/A/Pushwoosh LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64_x86_64-maccatalyst LibraryPath Pushwoosh.framework SupportedArchitectures @@ -32,19 +33,24 @@ SupportedPlatform ios SupportedPlatformVariant - simulator + maccatalyst + BinaryPath + Pushwoosh.framework/Pushwoosh LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath Pushwoosh.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator CFBundlePackageType diff --git a/XCFramework/Pushwoosh.xcframework/ios-arm64/Pushwoosh.framework/Headers/Pushwoosh.h b/XCFramework/Pushwoosh.xcframework/ios-arm64/Pushwoosh.framework/Headers/Pushwoosh.h index 7fe2eebe..04cc78f0 100644 --- a/XCFramework/Pushwoosh.xcframework/ios-arm64/Pushwoosh.framework/Headers/Pushwoosh.h +++ b/XCFramework/Pushwoosh.xcframework/ios-arm64/Pushwoosh.framework/Headers/Pushwoosh.h @@ -18,7 +18,7 @@ #endif -#define PUSHWOOSH_VERSION @"6.6.0" +#define PUSHWOOSH_VERSION @"6.6.1" @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy; @@ -163,6 +163,11 @@ Tells the delegate that the user has pressed on the push notification banner. */ @property (nonatomic, readonly) NSDictionary * _Nullable payload; +/** + Returns actionIdentifier of the button pressed + */ +@property (nonatomic, readonly) NSString * _Nullable actionIdentifier; + /** Returns YES if this message is recieved from Pushwoosh. */ diff --git a/XCFramework/Pushwoosh.xcframework/ios-arm64/Pushwoosh.framework/Info.plist b/XCFramework/Pushwoosh.xcframework/ios-arm64/Pushwoosh.framework/Info.plist index b860a5fb..62a8afd2 100644 Binary files a/XCFramework/Pushwoosh.xcframework/ios-arm64/Pushwoosh.framework/Info.plist and b/XCFramework/Pushwoosh.xcframework/ios-arm64/Pushwoosh.framework/Info.plist differ diff --git a/XCFramework/Pushwoosh.xcframework/ios-arm64/Pushwoosh.framework/Pushwoosh b/XCFramework/Pushwoosh.xcframework/ios-arm64/Pushwoosh.framework/Pushwoosh index 292c160c..4e968aa1 100755 Binary files a/XCFramework/Pushwoosh.xcframework/ios-arm64/Pushwoosh.framework/Pushwoosh and b/XCFramework/Pushwoosh.xcframework/ios-arm64/Pushwoosh.framework/Pushwoosh differ diff --git a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h index 7fe2eebe..04cc78f0 100644 --- a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h +++ b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Headers/Pushwoosh.h @@ -18,7 +18,7 @@ #endif -#define PUSHWOOSH_VERSION @"6.6.0" +#define PUSHWOOSH_VERSION @"6.6.1" @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy; @@ -163,6 +163,11 @@ Tells the delegate that the user has pressed on the push notification banner. */ @property (nonatomic, readonly) NSDictionary * _Nullable payload; +/** + Returns actionIdentifier of the button pressed + */ +@property (nonatomic, readonly) NSString * _Nullable actionIdentifier; + /** Returns YES if this message is recieved from Pushwoosh. */ diff --git a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Pushwoosh b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Pushwoosh index 9e4a7528..29b91e37 100755 Binary files a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Pushwoosh and b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Pushwoosh differ diff --git a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Resources/Info.plist b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Resources/Info.plist index 38c5941b..678ae36b 100644 --- a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Resources/Info.plist +++ b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-maccatalyst/Pushwoosh.framework/Versions/A/Resources/Info.plist @@ -27,19 +27,19 @@ DTCompilercom.apple.compilers.llvm.clang.1_0DTPlatformBuild - 20E238 + 21F77DTPlatformNamemacosxDTPlatformVersion - 13.3 + 14.5DTSDKBuild - 22E245 + 23F73DTSDKName - macosx13.3 + macosx14.5DTXcode - 1431 + 1540DTXcodeBuild - 14E300c + 15F31dLSMinimumSystemVersion10.15NSHumanReadableCopyright diff --git a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/Headers/Pushwoosh.h b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/Headers/Pushwoosh.h index 7fe2eebe..04cc78f0 100644 --- a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/Headers/Pushwoosh.h +++ b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/Headers/Pushwoosh.h @@ -18,7 +18,7 @@ #endif -#define PUSHWOOSH_VERSION @"6.6.0" +#define PUSHWOOSH_VERSION @"6.6.1" @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy; @@ -163,6 +163,11 @@ Tells the delegate that the user has pressed on the push notification banner. */ @property (nonatomic, readonly) NSDictionary * _Nullable payload; +/** + Returns actionIdentifier of the button pressed + */ +@property (nonatomic, readonly) NSString * _Nullable actionIdentifier; + /** Returns YES if this message is recieved from Pushwoosh. */ diff --git a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/Info.plist b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/Info.plist index 7ac8be66..431ce03e 100644 Binary files a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/Info.plist and b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/Info.plist differ diff --git a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/Pushwoosh b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/Pushwoosh index bc74992c..ae4441d7 100755 Binary files a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/Pushwoosh and b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/Pushwoosh differ diff --git a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/_CodeSignature/CodeResources b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/_CodeSignature/CodeResources index e2836caf..178347d0 100644 --- a/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/_CodeSignature/CodeResources +++ b/XCFramework/Pushwoosh.xcframework/ios-arm64_x86_64-simulator/Pushwoosh.framework/_CodeSignature/CodeResources @@ -50,11 +50,11 @@ Headers/Pushwoosh.h - /ayVDnWKie4Mq1uH++iGFMqetb8= + /51HhiNdIZNuURT/2HynRYQWJ9w= Info.plist - e7HqRyXrXq2tm66m1acsEvSdPhk= + IH5hSx32BvorgVq6z9Pb62Sodq4= Modules/module.modulemap @@ -148,7 +148,7 @@ hash2 - Y5I65Yoz8de1LR9h3QxXs3S1Ns3Jun3w/AjV+sR0d34= + 9N+qg8fIPmL/51yJ6xLDO+OSb4XlfVt4H9h3oZ42d2U= Modules/module.modulemap diff --git a/XCFramework/PushwooshGeozones.xcframework/Info.plist b/XCFramework/PushwooshGeozones.xcframework/Info.plist index dabf66ec..60e70cc6 100644 --- a/XCFramework/PushwooshGeozones.xcframework/Info.plist +++ b/XCFramework/PushwooshGeozones.xcframework/Info.plist @@ -5,8 +5,10 @@ AvailableLibraries + BinaryPath + PushwooshGeozones.framework/PushwooshGeozones LibraryIdentifier - ios-arm64_x86_64-maccatalyst + ios-arm64_x86_64-simulator LibraryPath PushwooshGeozones.framework SupportedArchitectures @@ -17,9 +19,11 @@ SupportedPlatform ios SupportedPlatformVariant - maccatalyst + simulator + BinaryPath + PushwooshGeozones.framework/PushwooshGeozones LibraryIdentifier ios-arm64 LibraryPath @@ -32,8 +36,10 @@ ios + BinaryPath + PushwooshGeozones.framework/Versions/A/PushwooshGeozones LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64_x86_64-maccatalyst LibraryPath PushwooshGeozones.framework SupportedArchitectures @@ -44,7 +50,7 @@ SupportedPlatform ios SupportedPlatformVariant - simulator + maccatalyst CFBundlePackageType diff --git a/XCFramework/PushwooshGeozones.xcframework/ios-arm64/PushwooshGeozones.framework/Info.plist b/XCFramework/PushwooshGeozones.xcframework/ios-arm64/PushwooshGeozones.framework/Info.plist index 9262234b..48dc259f 100644 Binary files a/XCFramework/PushwooshGeozones.xcframework/ios-arm64/PushwooshGeozones.framework/Info.plist and b/XCFramework/PushwooshGeozones.xcframework/ios-arm64/PushwooshGeozones.framework/Info.plist differ diff --git a/XCFramework/PushwooshGeozones.xcframework/ios-arm64/PushwooshGeozones.framework/Modules/module.modulemap b/XCFramework/PushwooshGeozones.xcframework/ios-arm64/PushwooshGeozones.framework/Modules/module.modulemap index b971d78e..5904e8a3 100644 --- a/XCFramework/PushwooshGeozones.xcframework/ios-arm64/PushwooshGeozones.framework/Modules/module.modulemap +++ b/XCFramework/PushwooshGeozones.xcframework/ios-arm64/PushwooshGeozones.framework/Modules/module.modulemap @@ -1,6 +1,6 @@ framework module PushwooshGeozones { umbrella header "PushwooshGeozones.h" - export * + module * { export * } } diff --git a/XCFramework/PushwooshGeozones.xcframework/ios-arm64/PushwooshGeozones.framework/PushwooshGeozones b/XCFramework/PushwooshGeozones.xcframework/ios-arm64/PushwooshGeozones.framework/PushwooshGeozones index 2ad9a046..80a56333 100755 Binary files a/XCFramework/PushwooshGeozones.xcframework/ios-arm64/PushwooshGeozones.framework/PushwooshGeozones and b/XCFramework/PushwooshGeozones.xcframework/ios-arm64/PushwooshGeozones.framework/PushwooshGeozones differ diff --git a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-maccatalyst/PushwooshGeozones.framework/Versions/A/Modules/module.modulemap b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-maccatalyst/PushwooshGeozones.framework/Versions/A/Modules/module.modulemap index b971d78e..5904e8a3 100644 --- a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-maccatalyst/PushwooshGeozones.framework/Versions/A/Modules/module.modulemap +++ b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-maccatalyst/PushwooshGeozones.framework/Versions/A/Modules/module.modulemap @@ -1,6 +1,6 @@ framework module PushwooshGeozones { umbrella header "PushwooshGeozones.h" - export * + module * { export * } } diff --git a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-maccatalyst/PushwooshGeozones.framework/Versions/A/PushwooshGeozones b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-maccatalyst/PushwooshGeozones.framework/Versions/A/PushwooshGeozones index ced4c381..04b53040 100755 Binary files a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-maccatalyst/PushwooshGeozones.framework/Versions/A/PushwooshGeozones and b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-maccatalyst/PushwooshGeozones.framework/Versions/A/PushwooshGeozones differ diff --git a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-maccatalyst/PushwooshGeozones.framework/Versions/A/Resources/Info.plist b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-maccatalyst/PushwooshGeozones.framework/Versions/A/Resources/Info.plist index 069df494..9fbac9c5 100644 --- a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-maccatalyst/PushwooshGeozones.framework/Versions/A/Resources/Info.plist +++ b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-maccatalyst/PushwooshGeozones.framework/Versions/A/Resources/Info.plist @@ -27,19 +27,19 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 20E238 + 21F77 DTPlatformName macosx DTPlatformVersion - 13.3 + 14.5 DTSDKBuild - 22E245 + 23F73 DTSDKName - macosx13.3 + macosx14.5 DTXcode - 1431 + 1540 DTXcodeBuild - 14E300c + 15F31d LSMinimumSystemVersion 10.15 UIDeviceFamily diff --git a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/Info.plist b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/Info.plist index 1aa3c97e..e4b3a462 100644 Binary files a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/Info.plist and b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/Info.plist differ diff --git a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/Modules/module.modulemap b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/Modules/module.modulemap index b971d78e..5904e8a3 100644 --- a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/Modules/module.modulemap +++ b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/Modules/module.modulemap @@ -1,6 +1,6 @@ framework module PushwooshGeozones { umbrella header "PushwooshGeozones.h" - export * + module * { export * } } diff --git a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/PushwooshGeozones b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/PushwooshGeozones index 1d27498f..c9d5307b 100755 Binary files a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/PushwooshGeozones and b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/PushwooshGeozones differ diff --git a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/_CodeSignature/CodeResources b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/_CodeSignature/CodeResources index fe922d4a..8e6dc96b 100644 --- a/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/_CodeSignature/CodeResources +++ b/XCFramework/PushwooshGeozones.xcframework/ios-arm64_x86_64-simulator/PushwooshGeozones.framework/_CodeSignature/CodeResources @@ -14,11 +14,11 @@ Info.plist - hTbVaQvUWxjLTDHCEo6jlngb240= + MdeizxL9oSRbskugVm5cEbYjPpk= Modules/module.modulemap - /ACPUYDIR/BULrYc3zbw0Xasik0= + WGgnjYaMD7RVgM5Z0j+uYbZGBeg= PrivacyInfo.xcprivacy @@ -45,7 +45,7 @@ hash2 - h/JEPr+rNjZNHNMq8/b4KM0WE0p97WhuB2cRWF46FEw= + fXYRoysMB/+jZDoR/xYfO8t7PEz2g1i+njiO7YtLu90= PrivacyInfo.xcprivacy diff --git a/iOS_SDK/Pushwoosh/Pushwoosh.podspec b/iOS_SDK/Pushwoosh/Pushwoosh.podspec index 079b2570..e519296e 100644 --- a/iOS_SDK/Pushwoosh/Pushwoosh.podspec +++ b/iOS_SDK/Pushwoosh/Pushwoosh.podspec @@ -5,7 +5,7 @@ Pod::Spec.new do |s| s.name = "Pushwoosh" - s.version = "6.6.0" + s.version = "6.6.1" s.summary = "Push notifications library by Pushwoosh." s.platform = :ios diff --git a/iOS_SDK/Pushwoosh/Pushwoosh/Configuration/PWConfig.h b/iOS_SDK/Pushwoosh/Pushwoosh/Configuration/PWConfig.h index 75a67766..80bd138c 100644 --- a/iOS_SDK/Pushwoosh/Pushwoosh/Configuration/PWConfig.h +++ b/iOS_SDK/Pushwoosh/Pushwoosh/Configuration/PWConfig.h @@ -15,6 +15,14 @@ */ @property (nonatomic, copy, readonly) NSString *appId; +/** + key: PW_API_TOKEN + type: string + value: Sets the Pushwoosh API auth token + */ + +@property (nonatomic, copy, readonly) NSString *apiToken; + /** key: Pushwoosh_APPID_Dev type: string diff --git a/iOS_SDK/Pushwoosh/Pushwoosh/Configuration/PWConfig.m b/iOS_SDK/Pushwoosh/Pushwoosh/Configuration/PWConfig.m index fe073bb4..74519390 100644 --- a/iOS_SDK/Pushwoosh/Pushwoosh/Configuration/PWConfig.m +++ b/iOS_SDK/Pushwoosh/Pushwoosh/Configuration/PWConfig.m @@ -4,6 +4,7 @@ @interface PWConfig () @property (nonatomic, copy, readwrite) NSString *appId; +@property (nonatomic, copy, readwrite) NSString *apiToken; @property (nonatomic, copy, readwrite) NSString *appIdDev; @property (nonatomic, copy, readwrite) NSString *appName; @property (nonatomic, copy, readwrite) NSString *appGroupsName; @@ -37,6 +38,8 @@ - (instancetype)initWithBundle:(NSBundle *)bundle { _bundle = bundle; self.appId = [bundle objectForInfoDictionaryKey:@"Pushwoosh_APPID"]; + + self.apiToken = [bundle objectForInfoDictionaryKey:@"PW_API_TOKEN"]; self.appIdDev = [bundle objectForInfoDictionaryKey:@"Pushwoosh_APPID_Dev"]; diff --git a/iOS_SDK/Pushwoosh/Pushwoosh/Network/PWRequestManager/PWRequestManager.m b/iOS_SDK/Pushwoosh/Pushwoosh/Network/PWRequestManager/PWRequestManager.m index c19ed467..8ebf193a 100644 --- a/iOS_SDK/Pushwoosh/Pushwoosh/Network/PWRequestManager/PWRequestManager.m +++ b/iOS_SDK/Pushwoosh/Pushwoosh/Network/PWRequestManager/PWRequestManager.m @@ -274,11 +274,16 @@ - (NSMutableURLRequest *)prepareRequest:(NSString *)requestUrl jsonRequestData:( NSMutableURLRequest *urlRequest = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:requestUrl]]; [urlRequest setHTTPMethod:@"POST"]; [urlRequest addValue:@"application/json; charset=utf-8" forHTTPHeaderField:@"Content-Type"]; + [urlRequest addValue:[NSString stringWithFormat:@"Token %@", [self getApiToken]] forHTTPHeaderField:@"Authorization"]; [urlRequest setHTTPBody:[jsonRequestData dataUsingEncoding:NSUTF8StringEncoding]]; return urlRequest; } +- (NSString *)getApiToken { + return [[PWConfig config] apiToken]; +} + - (void)processResponse:(NSHTTPURLResponse *)httpResponse responseData:(NSData *)responseData request:(PWRequest *)request url:(NSString *)requestUrl requestData:(NSString *)requestData error:(NSError **)outError { NSError *error = *outError; diff --git a/iOS_SDK/Pushwoosh/Pushwoosh/Notifications/Handling/PWUserNotificationCenterDelegate.m b/iOS_SDK/Pushwoosh/Pushwoosh/Notifications/Handling/PWUserNotificationCenterDelegate.m index 8b568fac..29bf8b76 100644 --- a/iOS_SDK/Pushwoosh/Pushwoosh/Notifications/Handling/PWUserNotificationCenterDelegate.m +++ b/iOS_SDK/Pushwoosh/Pushwoosh/Notifications/Handling/PWUserNotificationCenterDelegate.m @@ -63,7 +63,9 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNoti [[PushNotificationManager pushManager].delegate onActionIdentifierReceived:response.actionIdentifier withNotification:[self pushPayloadFromContent:response.notification.request.content]]; } NSDictionary *userInfo = [self pushPayloadFromContent:response.notification.request.content]; - [_notificationManager handlePushAccepted:userInfo onStart:_notificationManager.isAppInBackground]; + NSMutableDictionary *userInfoWithActionIdentifier = [NSMutableDictionary dictionaryWithDictionary:userInfo]; + [userInfoWithActionIdentifier addEntriesFromDictionary:@{@"actionIdentifier": response.actionIdentifier}]; + [_notificationManager handlePushAccepted:userInfoWithActionIdentifier onStart:_notificationManager.isAppInBackground]; } }; diff --git a/iOS_SDK/Pushwoosh/Pushwoosh/Public/Pushwoosh.h b/iOS_SDK/Pushwoosh/Pushwoosh/Public/Pushwoosh.h index 7fe2eebe..04cc78f0 100644 --- a/iOS_SDK/Pushwoosh/Pushwoosh/Public/Pushwoosh.h +++ b/iOS_SDK/Pushwoosh/Pushwoosh/Public/Pushwoosh.h @@ -18,7 +18,7 @@ #endif -#define PUSHWOOSH_VERSION @"6.6.0" +#define PUSHWOOSH_VERSION @"6.6.1" @class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy; @@ -163,6 +163,11 @@ Tells the delegate that the user has pressed on the push notification banner. */ @property (nonatomic, readonly) NSDictionary * _Nullable payload; +/** + Returns actionIdentifier of the button pressed + */ +@property (nonatomic, readonly) NSString * _Nullable actionIdentifier; + /** Returns YES if this message is recieved from Pushwoosh. */ diff --git a/iOS_SDK/Pushwoosh/Pushwoosh/Public/Pushwoosh.m b/iOS_SDK/Pushwoosh/Pushwoosh/Public/Pushwoosh.m index a60bb9de..02c55805 100644 --- a/iOS_SDK/Pushwoosh/Pushwoosh/Public/Pushwoosh.m +++ b/iOS_SDK/Pushwoosh/Pushwoosh/Public/Pushwoosh.m @@ -408,6 +408,7 @@ - (instancetype)initWithPayload:(NSDictionary *)payload foreground:(BOOL)foregro } _payload = payload; + _actionIdentifier = [payload pw_stringForKey:@"actionIdentifier"]; _contentAvailable = apsDict[@"content-available"] != nil; _foregroundMessage = foreground; _inboxMessage = apsDict[@"pw_inbox"] != nil; diff --git a/iOS_SDK/Pushwoosh/PushwooshTests/PWRequestManagerTest.m b/iOS_SDK/Pushwoosh/PushwooshTests/PWRequestManagerTest.m index d0e1e14c..c488625f 100644 --- a/iOS_SDK/Pushwoosh/PushwooshTests/PWRequestManagerTest.m +++ b/iOS_SDK/Pushwoosh/PushwooshTests/PWRequestManagerTest.m @@ -9,6 +9,7 @@ #import "PWGetConfigRequest.h" #import "PWRequestsCacheManager.h" #import "PWCachedRequest.h" +#import "PWConfig.h" #import #import @@ -19,6 +20,7 @@ @interface PWRequestManager (Test) @property (nonatomic, strong) NSURLSession *session; +- (NSMutableURLRequest *)prepareRequest:(NSString *)requestUrl jsonRequestData:(NSString *)jsonRequestData; - (void)sendRequestInternal:(PWRequest *)request completion:(void (^)(NSError *error))completion; - (void)processResponse:(NSHTTPURLResponse *)httpResponse responseData:(NSData *)responseData request:(PWRequest *)request url:(NSString *)requestUrl requestData:(NSString *)requestData error:(NSError **)outError; - (BOOL)needToRetry:(NSInteger)statusCode; @@ -335,6 +337,20 @@ - (void)testIncreaseRetryCount { OCMVerify([mockPWRequestManager increaseRequestCounter:OCMOCK_ANY]); } +- (void)testHeaderAuthExist { + NSString *apiToken = @"somEpusHwooSHtOkenMocK"; + NSString *correctFormat = [NSString stringWithFormat:@"Token %@", apiToken]; + id mockNSMutableURLRequest = OCMClassMock([NSMutableURLRequest class]); + OCMStub([mockNSMutableURLRequest alloc]).andReturn(mockNSMutableURLRequest); + OCMStub([mockNSMutableURLRequest initWithURL:OCMOCK_ANY]).andReturn(mockNSMutableURLRequest); + id mockPWConfig = OCMPartialMock([PWConfig config]); + OCMStub([mockPWConfig apiToken]).andReturn(apiToken); + + [_requestManager prepareRequest:@"" jsonRequestData:@""]; + + OCMVerify([mockNSMutableURLRequest addValue:correctFormat forHTTPHeaderField:@"Authorization"]); +} + - (void)testCheckCurrectCulculateDelay { double remainTime = 5.f; PWCachedRequest *cachedRequest = [[PWCachedRequest alloc] init]; diff --git a/iOS_SDK/Pushwoosh/PushwooshXCFramework.podspec b/iOS_SDK/Pushwoosh/PushwooshXCFramework.podspec index 499fce1c..5de63d90 100644 --- a/iOS_SDK/Pushwoosh/PushwooshXCFramework.podspec +++ b/iOS_SDK/Pushwoosh/PushwooshXCFramework.podspec @@ -5,7 +5,7 @@ Pod::Spec.new do |s| s.name = "PushwooshXCFramework" - s.version = "6.6.0" + s.version = "6.6.1" s.summary = "Push notifications library by Pushwoosh." s.platform = :ios
@property NSString *_Nullable@property NSString *_Nullable
@property NSUInteger badge