fixed integration with API

WWW/classes/TokenAuth.php

@@ -8,8 +8,7 @@ class TokenAuth extends AbstractBearer
 {
     public $tableName = "users";
     private $pdo;
-    private $apiURL = "https://da-api.drywallaptitude.co.uk/users/";
-    private $userId = 1;
+    private $apiURL = "https://da-api.drywallaptitude.co.uk/auth/verify";
 
     function __construct(\PDO $pdo)
     {
@@ -18,28 +17,23 @@ class TokenAuth extends AbstractBearer
 
     }
 
-    function createCalendar()
-    {
-
-    }
-
     function validateBearerToken($token)
     {
         try {
-//            $this->userId = $_GET['userId'];
             $user = $this->makeAPICall($token);
             if ($user == null) {
                 return null;
             }
             $stmt = $this->pdo->prepare('SELECT username FROM ' . $this->tableName . ' WHERE username = ?');
             $stmt->execute([$user->email]);
-            if ($data = $stmt->fetchColumn()) {
-                return "principals/" . $data;
+            if ($username = $stmt->fetchColumn()) {
+                return "principals/" . $username;
             }
+
+            return null;
         } catch (\Exception $e) {
             return null;
         }
-
     }
 
     function makeAPICall($token)
@@ -51,7 +45,7 @@ class TokenAuth extends AbstractBearer
                 'Authorization: Bearer ' . $token,
             );
             // set url
-            curl_setopt($ch, CURLOPT_URL, $this->apiURL . $this->userId);
+            curl_setopt($ch, CURLOPT_URL, $this->apiURL);
             curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
             //return the transfer as a string
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -60,8 +54,8 @@ class TokenAuth extends AbstractBearer
             $userData = json_decode($output);
             // close curl resource to free up system resources
             curl_close($ch);
-            if ($userData->id) {
-                return $userData;
+            if ($userData->user) {
+                return $userData->user;
             } else {
                 return null;
             }