feat: allow logout with clearSession to logout with invalid session token

Author: dblythy

src/ParseUser.js

@@ -1134,18 +1134,26 @@ const DefaultController = {
 
   logOut(options: RequestOptions): Promise<ParseUser> {
     const RESTController = CoreManager.getRESTController();
+    const promiseCatch = e => {
+      if (e.code === ParseError.INVALID_SESSION_TOKEN && options.clearSession) {
+        return;
+      }
+      throw e;
+    };
     if (options.sessionToken) {
-      return RESTController.request('POST', 'logout', {}, options);
+      return RESTController.request('POST', 'logout', {}, options).catch(promiseCatch);
     }
     return DefaultController.currentUserAsync().then(currentUser => {
       const path = Storage.generatePath(CURRENT_USER_KEY);
       let promise = Storage.removeItemAsync(path);
       if (currentUser !== null) {
         const currentSession = currentUser.getSessionToken();
         if (currentSession && isRevocableSession(currentSession)) {
-          promise = promise.then(() => {
-            return RESTController.request('POST', 'logout', {}, { sessionToken: currentSession });
-          });
+          promise = promise
+            .then(() => {
+              return RESTController.request('POST', 'logout', {}, { sessionToken: currentSession });
+            })
+            .catch(promiseCatch);
         }
         currentUser._logOutWithAll();
         currentUser._finishFetch({ sessionToken: undefined });

src/__tests__/ParseUser-test.js

@@ -940,6 +940,40 @@ describe('ParseUser', () => {
       });
   });
 
+  it('can logout user with clear session', async () => {
+    ParseUser.disableUnsafeCurrentUser();
+    ParseUser._clearCache();
+    Storage._clear();
+    const RESTController = {
+      request() {
+        const error = new ParseError(ParseError.INVALID_SESSION_TOKEN, 'Invalid session token.');
+        return Promise.reject(error);
+      },
+      ajax() {},
+    };
+    jest.spyOn(RESTController, 'request');
+    CoreManager.setRESTController(RESTController);
+
+    await ParseUser.logOut({ clearSession: true });
+  });
+
+  it('can logout user with clear session and session token', async () => {
+    ParseUser.disableUnsafeCurrentUser();
+    ParseUser._clearCache();
+    Storage._clear();
+    const RESTController = {
+      request() {
+        const error = new ParseError(ParseError.INVALID_SESSION_TOKEN, 'Invalid session token.');
+        return Promise.reject(error);
+      },
+      ajax() {},
+    };
+    jest.spyOn(RESTController, 'request');
+    CoreManager.setRESTController(RESTController);
+
+    await ParseUser.logOut({ sessionToken: '1234', clearSession: true });
+  });
+
   it('can retreive a user with sessionToken (me)', async () => {
     ParseUser.disableUnsafeCurrentUser();
     ParseUser._clearCache();