isMatchingDomain method added

Author: tyfyakov21

macos/RNCookieManagerMacOs/RNCookieManagerMacOs.h

@@ -5,11 +5,7 @@
   * LICENSE file here: https://github.com/joeferraro/react-native-cookies/blob/master/LICENSE.md.
   */
 
-#if __has_include("RCTBridgeModule.h")
-#import "RCTBridgeModule.h"
-#else
 #import <React/RCTBridgeModule.h>
-#endif
 
 #import <WebKit/WebKit.h>
 

macos/RNCookieManagerMacOs/RNCookieManagerMacOs.m

@@ -6,13 +6,9 @@
   */
 
 #import "RNCookieManagerMacOS.h"
-#if __has_include("RCTConvert.h")
-#import "RCTConvert.h"
-#else
 #import <React/RCTConvert.h>
-#endif
 
-static NSString * const NOT_AVAILABLE_ERROR_MESSAGE = @"WebKit/WebKit-Components are only available with macOS 10.2 and higher!";
+static NSString * const NOT_AVAILABLE_ERROR_MESSAGE = @"WebKit/WebKit-Components are only available with macOS 10.13 and higher!";
 static NSString * const INVALID_URL_MISSING_HTTP = @"Invalid URL: It may be missing a protocol (ex. http:// or https://).";
 static NSString * const INVALID_DOMAINS = @"Cookie URL host %@ and domain %@ mismatched. The cookie won't set correctly.";
 
@@ -47,7 +43,8 @@ + (BOOL)requiresMainQueueSetup
     cookie:(NSDictionary *)props
     useWebKit:(BOOL)useWebKit
     resolver:(RCTPromiseResolveBlock)resolve
-    rejecter:(RCTPromiseRejectBlock)reject) {
+    rejecter:(RCTPromiseRejectBlock)reject)
+{
     NSHTTPCookie *cookie;
     @try {
         cookie = [self makeHTTPCookieObject:url props:props];
@@ -58,7 +55,7 @@ + (BOOL)requiresMainQueueSetup
     }
 
     if (useWebKit) {
-        if (@available(macOS 10.2, *)) {
+        if (@available(macOS 10.13, *)) {
             dispatch_async(dispatch_get_main_queue(), ^(){
                 WKHTTPCookieStore *cookieStore = [[WKWebsiteDataStore defaultDataStore] httpCookieStore];
                 [cookieStore setCookie:cookie completionHandler:^() {
@@ -113,7 +110,7 @@ + (BOOL)requiresMainQueueSetup
     rejecter:(RCTPromiseRejectBlock)reject)
 {
     if (useWebKit) {
-        if (@available(macOS 10.2, *)) {
+        if (@available(macOS 10.13, *)) {
             dispatch_async(dispatch_get_main_queue(), ^(){
                 NSString *topLevelDomain = url.host;
 
@@ -152,7 +149,7 @@ + (BOOL)requiresMainQueueSetup
     rejecter:(RCTPromiseRejectBlock)reject)
 {
     if (useWebKit) {
-        if (@available(macOS 10.2, *)) {
+        if (@available(macOS 10.13, *)) {
             dispatch_async(dispatch_get_main_queue(), ^(){
                 // https://stackoverflow.com/questions/46465070/how-to-delete-cookies-from-wkhttpcookiestore#answer-47928399
                 NSSet *websiteDataTypes = [NSSet setWithArray:@[WKWebsiteDataTypeCookies]];
@@ -186,7 +183,7 @@ + (BOOL)requiresMainQueueSetup
     NSMutableArray<NSHTTPCookie *> * foundCookiesList = [NSMutableArray new];
 
     if (useWebKit) {
-        if (@available(macOS 10.2, *)) {
+        if (@available(macOS 10.13, *)) {
             dispatch_async(dispatch_get_main_queue(), ^(){
                 NSString *topLevelDomain = url.host;
 
@@ -230,7 +227,7 @@ + (BOOL)requiresMainQueueSetup
     rejecter:(RCTPromiseRejectBlock)reject)
 {
     if (useWebKit) {
-        if (@available(macOS 10.2, *)) {
+        if (@available(macOS 10.13, *)) {
             dispatch_async(dispatch_get_main_queue(), ^(){
                 WKHTTPCookieStore *cookieStore = [[WKWebsiteDataStore defaultDataStore] httpCookieStore];
                 [cookieStore getAllCookies:^(NSArray<NSHTTPCookie *> *allCookies) {
@@ -340,4 +337,14 @@ -(NSDictionary *)createCookieData:(NSHTTPCookie *)cookie
     return cookieData;
 }
 
+-(BOOL)isMatchingDomain:(NSString *)originDomain
+      cookieDomain:(NSString *)cookieDomain
+{
+    if ([originDomain isEqualToString: cookieDomain]) {
+        return @YES;
+    }
+    NSString *parentDomain = [cookieDomain hasPrefix:@"."] ? cookieDomain : [@"." stringByAppendingString: cookieDomain];
+    return [originDomain hasSuffix:parentDomain];
+}
+
 @end