Merge branch 'master' of https://github.com/react-native-cookies/cookies

 into macos-support

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

README.md

@@ -17,15 +17,18 @@ This module was ported from [joeferraro/react-native-cookies](https://github.com
 
 ## Maintainers
 
-- [Jason Safaiyeh](https://github.com/safaiyeh) ([Twitter @safaiyeh](https://twitter.com/safaiyeh)) from [Sumo Logic](https://www.sumologic.com)
+- [Jason Safaiyeh](https://github.com/safaiyeh) ([Twitter @safaiyeh](https://twitter.com/safaiyeh)) from [🪄 Magic Eden](https://magiceden.io)
 
 ## Platforms Supported
 
-✅ iOS  
-✅ Android  
-❌ Expo is working on their own cookie support (https://github.com/expo/expo/issues/6756)
+- ✅ iOS
+- ✅ Android
+- ❌ Currently lacking support for Windows, macOS, and web. Support for these platforms will be created when there is a need for them. Starts with a posted issue.
 
-Currently lacking support for Windows, macOS, and web. Support for these platforms will be created when there is a need for them. Starts with a posted issue.
+## Expo
+
+- ✅ You can use this library with [Development Builds](https://docs.expo.dev/development/introduction/). No config plugin is required.
+- ❌ This library can't be used in the "Expo Go" app because it [requires custom native code](https://docs.expo.dev/workflow/customizing/).
 
 ## Installation
 
@@ -117,6 +120,16 @@ CookieManager.flush()
   .then((success) => {
     console.log('CookieManager.flush =>', success);
   });
+
+// Remove session cookies (ANDROID ONLY)
+// Session cookies are cookies with no expires set. Android typically does not
+// remove these, it is up to the developer to decide when to remove them.
+// The return value is true if any session cookies were removed.
+// iOS handles removal of session cookies automatically on app open.
+CookieManager.removeSessionCookies()
+  .then((sessionCookiesRemoved) => {
+    console.log('CookieManager.removeSessionCookies =>', sessionCookiesRemoved);
+  });
 ```
 
 ### WebKit-Support (iOS only)

android/build.gradle

@@ -1,4 +1,4 @@
-import groovy.json.JsonSlurper
+
 
 // android/build.gradle
 
@@ -22,7 +22,6 @@ def safeExtGet(prop, fallback) {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
 
 buildscript {
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
@@ -41,7 +40,6 @@ buildscript {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
 
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
@@ -76,69 +74,3 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
 }
-
-def configureReactNativePom(def pom) {
-    def packageJson = new JsonSlurper().parseText(file('../package.json').text)
-
-    pom.project {
-        name packageJson.title
-        artifactId packageJson.name
-        version = packageJson.version
-        group = "com.reactlibrary"
-        description packageJson.description
-        url packageJson.repository.baseUrl
-
-        licenses {
-            license {
-                name packageJson.license
-                url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename
-                distribution 'repo'
-            }
-        }
-    }
-}
-
-afterEvaluate { project ->
-    // some Gradle build hooks ref:
-    // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
-    task androidJavadoc(type: Javadoc) {
-        source = android.sourceSets.main.java.srcDirs
-        classpath += files(android.bootClasspath)
-        classpath += files(project.getConfigurations().getByName('compile').asList())
-        include '**/*.java'
-    }
-
-    task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-        classifier = 'javadoc'
-        from androidJavadoc.destinationDir
-    }
-
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
-    }
-
-    android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        def javaCompileTask = variant.javaCompileProvider.get()
-
-        task "jar${name}"(type: Jar, dependsOn: javaCompileTask) {
-            from javaCompileTask.destinationDir
-        }
-    }
-
-    artifacts {
-        archives androidSourcesJar
-        archives androidJavadocJar
-    }
-
-    task installArchives(type: Upload) {
-        configuration = configurations.archives
-        repositories.mavenDeployer {
-            // Deploy to react-native-event-bridge/maven, ready to publish to npm
-            repository url: "file://${projectDir}/../android/maven"
-            configureReactNativePom pom
-        }
-    }
-}

android/src/main/java/com/reactnativecommunity/cookies/CookieManagerModule.java

@@ -102,6 +102,20 @@ public void flush(Promise promise) {
         }
     }
 
+    @ReactMethod
+    public void removeSessionCookies(final Promise promise) {
+        try {
+            getCookieManager().removeSessionCookies(new ValueCallback<Boolean>() {
+                @Override
+                public void onReceiveValue(Boolean data) {
+                    promise.resolve(data);
+                }
+            });
+        } catch (Exception e) {
+            promise.reject(e);
+        }
+    }
+
     @ReactMethod
     public void getFromResponse(String url, Promise promise) throws URISyntaxException, IOException {
         promise.resolve(url);

index.d.ts

@@ -23,9 +23,11 @@ declare module '@react-native-cookies/cookies' {
 
     clearAll(useWebKit?: boolean): Promise<boolean>;
 
+    // Android only
     flush(): Promise<void>;
+    removeSessionCookies(): Promise<boolean>;
 
-    //iOS only
+    // iOS only
     getAll(useWebKit?: boolean): Promise<Cookies>;
     clearByName(
       url: string,

index.js

@@ -53,6 +53,11 @@ module.exports = {
       await CookieManager.flush();
     }
   },
+  removeSessionCookies: async () => {
+    if (Platform.OS === 'android') {
+      return await CookieManager.removeSessionCookies();
+    }
+  },
 };
 
 for (var i = 0; i < functions.length; i++) {

ios/RNCookieManagerIOS/RNCookieManagerIOS.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>
 

ios/RNCookieManagerIOS/RNCookieManagerIOS.m

@@ -6,11 +6,7 @@
   */
 
 #import "RNCookieManagerIOS.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 iOS11 and higher!";
 static NSString * const INVALID_URL_MISSING_HTTP = @"Invalid URL: It may be missing a protocol (ex. http:// or https://).";
@@ -199,7 +195,7 @@ + (BOOL)requiresMainQueueSetup
                 WKHTTPCookieStore *cookieStore = [[WKWebsiteDataStore defaultDataStore] httpCookieStore];
                 [cookieStore getAllCookies:^(NSArray<NSHTTPCookie *> *allCookies) {
                     for (NSHTTPCookie *cookie in allCookies) {
-                        if ([name isEqualToString:cookie.name]) {
+                        if ([name isEqualToString:cookie.name] && [self isMatchingDomain:topLevelDomain cookieDomain:cookie.domain]) {
                              [foundCookiesList addObject:cookie];
                              foundCookies = @YES;
                         }
@@ -216,7 +212,7 @@ + (BOOL)requiresMainQueueSetup
     } else {
            NSHTTPCookieStorage *cookieStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
            for (NSHTTPCookie *c in cookieStorage.cookies) {
-               if ([[c name] isEqualToString:name]) {
+               if ([[c name] isEqualToString:name] && [self isMatchingDomain:url.host cookieDomain:c.domain]) {
                    [cookieStorage deleteCookie:c];
                    foundCookies = @YES;
                }
@@ -341,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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-cookies/cookies",
-  "version": "6.0.10",
+  "version": "6.2.1",
   "description": "Cookie Manager for React Native",
   "repository": {
     "type": "git",