Fix #21. Add ability to start with wrong credentials and not crash th…

…e workflow
godbout · Jan 7, 2019 · 1355788 · 1355788
1 parent ff99a12
commit 1355788
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/src/Harvest.php b/src/Harvest.php
@@ -73,8 +73,18 @@ public function generateTimer($description, $projectId, $taskId)
     public function getOnlineData()
     {
         $data = [];
-        $data['projects'] = $this->timerAction('get_projects', 'projects');
-        $data['tasks'] = $this->timerAction('get_tags', 'tasks');
+
+        $projects = $this->timerAction('get_projects', 'projects');
+
+        if ($projects !== false) {
+            $data['projects'] = $projects;
+        }
+
+        $tasks = $this->timerAction('get_tags', 'tasks');
+
+        if ($tasks !== false) {
+            $data['tasks'] = $tasks;
+        }
 
         return $data;
     }

diff --git a/src/Toggl.php b/src/Toggl.php
@@ -76,7 +76,15 @@ public function generateTimer($description, $projectId, $tagData)
      */
     public function getOnlineData()
     {
-        return $this->timerAction('get_online_data', 'me?with_related_data=true');
+        $data = [];
+
+        $togglData = $this->timerAction('get_online_data', 'me?with_related_data=true');
+
+        if ($togglData !== false) {
+            $data = $togglData;
+        }
+
+        return $data;
     }
 
     /**

diff --git a/src/WorkflowHandler.php b/src/WorkflowHandler.php
@@ -188,12 +188,12 @@ private function syncServiceOnlineDataToLocalCache($service)
     {
         $data = $this->$service->getOnlineData();
 
+        $this->saveServiceDataCache($service, $data);
+
         if (empty($data) === true) {
-            return $this->getNotificationForService($service, 'data', false);
+            return $this->getNotificationForService($service, 'cache', false);
         }
 
-        $this->saveServiceDataCache($service, $data);
-
-        return $this->getNotificationForService($service, 'data', true);
+        return $this->getNotificationForService($service, 'cached', true);
     }
 }