Applied feedbacks from @pasin

Author: hideki

src/main/java/com/couchbase/lite/replicator/Replication.java

@@ -1,16 +1,16 @@
-/**
- * Copyright (c) 2016 Couchbase, Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
+//
+// Copyright (c) 2016 Couchbase, Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+// except in compliance with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software distributed under the
+// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+// either express or implied. See the License for the specific language governing permissions
+// and limitations under the License.
+//
 package com.couchbase.lite.replicator;
 
 import com.couchbase.lite.AsyncTask;
@@ -696,9 +696,9 @@ public void setFilterParams(Map<String, Object> filterParams) {
         replicationInternal.setFilterParams(filterParams);
     }
 
-    /** The server user name that the authenticator has logged in as, if known. Observable. */
+    /** The server user name that the authenticator has logged in as, if known. */
     @InterfaceAudience.Public
-    public String getUsername(){
+    public String getUsername() {
         return replicationInternal.getUsername();
     }
 
@@ -751,15 +751,15 @@ public void deleteCookie(String name) {
      * replication's CBLAuthenticator. Also removes session cookies from the cookie store.
      */
     @InterfaceAudience.Public
-    public boolean removeStoredCredentials(){
+    public boolean removeStoredCredentials() {
         if (getAuthenticator() != null) {
             if (!(getAuthenticator() instanceof Authorizer) ||
                     !((Authorizer) getAuthenticator()).removeStoredCredentials())
                 return false;
-        }else {
+        } else {
             // CBL Java does not use credential. No thing to do
         }
-        replicationInternal.resetCookieStore();
+        replicationInternal.deleteCookie(remote);
         return true;
     }
 

src/main/java/com/couchbase/lite/replicator/ReplicationInternal.java

@@ -105,7 +105,7 @@ protected enum ChangeListenerNotifyStyle {
     protected String lastSequence;
     protected Authenticator authenticator;
     protected boolean authenticating = false;
-    protected String username;
+    private String username;
     protected String filterName;
     protected Map<String, Object> filterParams;
     protected List<String> documentIDs;
@@ -1799,7 +1799,11 @@ public void deleteCookie(String name) {
         this.clientFactory.deleteCookie(name);
     }
 
-    /* package */ void resetCookieStore(){
+    /* package */ void deleteCookie(URL url) {
+        this.clientFactory.deleteCookie(url);
+    }
+
+    /* package */ void resetCookieStore() {
         this.clientFactory.resetCookieStore();
     }
 

src/main/java/com/couchbase/lite/support/CouchbaseLiteHttpClientFactory.java

@@ -15,6 +15,7 @@
 
 import com.couchbase.lite.internal.InterfaceAudience;
 
+import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
@@ -29,6 +30,7 @@
 
 import okhttp3.Cookie;
 import okhttp3.CookieJar;
+import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 
 public class CouchbaseLiteHttpClientFactory implements HttpClientFactory {
@@ -40,11 +42,11 @@ public class CouchbaseLiteHttpClientFactory implements HttpClientFactory {
 
     // deprecated
     public static int DEFAULT_SO_TIMEOUT_SECONDS = 40; // 40 sec (previously it was 5 min)
-                                                       // heartbeat value 30sec + 10 sec
+    // heartbeat value 30sec + 10 sec
 
     // OkHttp Default Timeout is 10 sec for all timeout settings
     public static int DEFAULT_CONNECTION_TIMEOUT_SECONDS = 10;
-    public static int DEFAULT_READ_TIMEOUT  = DEFAULT_SO_TIMEOUT_SECONDS;
+    public static int DEFAULT_READ_TIMEOUT = DEFAULT_SO_TIMEOUT_SECONDS;
     public static int DEFAULT_WRITE_TIMEOUT = 10;
 
     /**
@@ -128,9 +130,38 @@ synchronized public void deleteCookie(String name) {
         cookieJar.saveFromResponse(null, retainedCookies);
     }
 
+    static private boolean isMatch(Cookie cookie, URL url) {
+        return cookie.matches(HttpUrl.get(url));
+    }
+
+    @Override
+    @InterfaceAudience.Private
+    synchronized public void deleteCookie(URL url) {
+        // since CookieStore does not have a way to delete an individual cookie, do workaround:
+        // 1. get all cookies
+        // 2. filter list to strip out the one we want to delete
+        // 3. clear cookie store
+        // 4. re-add all cookies except the one we want to delete
+        if (cookieJar == null)
+            return;
+
+        List<Cookie> cookies = cookieJar.loadForRequest(null);
+        List<Cookie> retainedCookies = new ArrayList<Cookie>();
+        for (Cookie cookie : cookies) {
+            // matching rely on OkHttp's matching logic
+            // https://square.github.io/okhttp/3.x/okhttp/okhttp3/Cookie.html#matches-okhttp3.HttpUrl-
+            if (!cookie.matches(HttpUrl.get(url)))
+                retainedCookies.add(cookie);
+        }
+        cookieJar.clear();
+
+        // TODO: HttpUrl parameter should be revisited.
+        cookieJar.saveFromResponse(null, retainedCookies);
+    }
+
     @Override
     @InterfaceAudience.Private
-    synchronized public void resetCookieStore(){
+    synchronized public void resetCookieStore() {
         if (cookieJar == null)
             return;
         cookieJar.clear();

src/main/java/com/couchbase/lite/support/HttpClientFactory.java

@@ -1,18 +1,19 @@
-/**
- * Copyright (c) 2016 Couchbase, Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
+//
+// Copyright (c) 2016 Couchbase, Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+// except in compliance with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software distributed under the
+// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+// either express or implied. See the License for the specific language governing permissions
+// and limitations under the License.
+//
 package com.couchbase.lite.support;
 
+import java.net.URL;
 import java.util.List;
 
 import okhttp3.Cookie;
@@ -26,6 +27,8 @@ public interface HttpClientFactory {
 
     void deleteCookie(String name);
 
+    void deleteCookie(URL url);
+
     void resetCookieStore();
 
     CookieJar getCookieStore();

src/main/java/com/couchbase/lite/support/PersistentCookieJar.java

@@ -1,24 +1,24 @@
-/**
- * Copyright (c) 2011 James Smith <james@loopj.com>
- * Copyright (c) 2016 Couchbase, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
+//
+// Copyright (c) 2016 Couchbase, Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+// except in compliance with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software distributed under the
+// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+// either express or implied. See the License for the specific language governing permissions
+// and limitations under the License.
+//
 package com.couchbase.lite.support;
 
 import com.couchbase.lite.CouchbaseLiteException;
 import com.couchbase.lite.Database;
 import com.couchbase.lite.util.Log;
 
 import java.lang.ref.WeakReference;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -136,9 +136,21 @@ public void saveFromResponse(HttpUrl httpUrl, List<okhttp3.Cookie> list) {
         }
     }
 
+    /**
+     * @return return all cookies if httpUrl is null, otherwise return matched cookies.
+     */
     @Override
     public List<okhttp3.Cookie> loadForRequest(HttpUrl httpUrl) {
-        return new ArrayList(cookies.values());
+        List<Cookie> list = new ArrayList<Cookie>();
+        if (httpUrl == null) {
+            list.addAll(cookies.values());
+        } else {
+            for (Cookie cookie : cookies.values()) {
+                if (cookie.matches(httpUrl))
+                    list.add(cookie);
+            }
+        }
+        return list;
     }
 
     ////////////////////////////////////////////////////////////