fix: verifyToken should give back latest member information

Author: wilr

src/Controllers/ApiController.php

@@ -284,15 +284,33 @@ public function getJwt()
             return $this->httpError(401);
         }
 
+        $token = JWT::decode(
+            $bearer,
+            new Key(
+                Config::inst()->get(JWTUtils::class, 'secret'),
+                'HS256'
+            )
+        );
+
         $jwt = JWTUtils::inst()->renew($bearer);
 
         if (!$jwt) {
             return $this->httpError(401);
         }
 
+        // Set the current user
+        $memberId = $token->memberId;
+        $member = Member::get()->byID($memberId);
+
+        if ($member) {
+            Injector::inst()->get(IdentityStore::class)->logIn($member);
+            Security::setCurrentUser($member);
+        }
+
         return $jwt;
     }
 
+
     public function getAuthorizationHeader(): string
     {
         $header = '';

src/Controllers/AuthController.php

@@ -4,6 +4,8 @@
 
 use Level51\JWTUtils\JWTUtils;
 use Level51\JWTUtils\JWTUtilsException;
+use SilverStripe\Security\Member;
+use SilverStripe\Security\Security;
 
 class AuthController extends ApiController
 {
@@ -12,31 +14,45 @@ class AuthController extends ApiController
         'verify',
     ];
 
-    private static $test = '123';
-
     /**
      * The token is acquired by using basic auth. Once the user has entered the
      * username / password and completed this first step then we give them back
      * a token which contains their information
      */
     public function token() {
         try {
-            $payload = JWTUtils::inst()->byBasicAuth($this->request);
+            $payload = JWTUtils::inst()->byBasicAuth($this->request, true);
+
+            if (isset($payload['member']['id'])) {
+                $member = Member::get()->byID($payload['member']['id']);
+
+                if ($member) {
+                    $payload['member'] = array_merge($payload['member'], $member->toApi());
+                }
+
+                return $this->returnArray($payload);
+            }
 
             return $this->returnArray($payload);
         } catch (JWTUtilsException $e) {
             return $this->httpError(403, $e->getMessage());
         }
     }
 
+
     /**
      * Verifies a token is valid
      */
     public function verify()
     {
         if ($jwt = $this->getJwt()) {
+            $member = Security::getCurrentUser();
+
             return $this->returnArray(
-                ['token' => $jwt]
+                [
+                    'token' => $jwt,
+                    'member' => $member->toApi(),
+                ]
             );
         }
     }