Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

1 files changed, 14 insertions, 5 deletions

diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js

index 0cc85db28e..c52c94c310 100644
--- a/webclient/components/matrix/matrix-service.js
+++ b/webclient/components/matrix/matrix-service.js
@@ -318,12 +318,21 @@ angular.module('matrixService', [])
             };
             return doRequest("GET", path, params);
         },
-        
-        // 
-        testLogin: function() {
-            
+
+        // Indicates if user authentications details are stored in cache
+        isUserLoggedIn: function() {
+            var config = this.config();
+
+            // User is considered logged in if his cache is not empty and contains
+            // an access token
+            if (config && config.access_token) {
+                return true;
+            }
+            else {
+                return false;
+            }
         },
-        
+
         /****** Permanent storage of user information ******/
         
         // Returns the current config