From dc4d9e59e6550607874f0daf9f30fccdf4b8757a Mon Sep 17 00:00:00 2001
From: Vito <vito.albano@alfresco.com>
Date: Thu, 5 Jul 2018 23:22:16 +0100
Subject: [PATCH] [ADF-3255] fixed remember me behaviour (#3564)

---
 lib/core/services/authentication.service.ts | 5 ++++-
 lib/core/services/cookie.service.ts         | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/core/services/authentication.service.ts b/lib/core/services/authentication.service.ts
index 34cfdfe881..4bf9ff5be1 100644
--- a/lib/core/services/authentication.service.ts
+++ b/lib/core/services/authentication.service.ts
@@ -50,7 +50,10 @@ export class AuthenticationService {
      * @returns True if logged in, false otherwise
      */
     isLoggedIn(): boolean {
-        return !!this.alfrescoApi.getInstance().isLoggedIn();
+            if (!this.isOauth() && this.cookie.isEnabled() && !this.isRememberMeSet()) {
+                return false;
+            }
+            return this.alfrescoApi.getInstance().isLoggedIn();
     }
 
     isOauth(): boolean {
diff --git a/lib/core/services/cookie.service.ts b/lib/core/services/cookie.service.ts
index 474f0da98d..dff0ebe114 100644
--- a/lib/core/services/cookie.service.ts
+++ b/lib/core/services/cookie.service.ts
@@ -31,7 +31,7 @@ export class CookieService {
         }
 
         document.cookie = 'test-cookie';
-        return document.cookie.indexOf('test-cookie') > 0;
+        return document.cookie.indexOf('test-cookie') >= 0;
     }
 
     /**