Assign access_token

Author: valzargaming

src/SS14/Endpoints/OAuth2Endpoint.php

@@ -120,10 +120,10 @@ private function get(
             $OAA->removeToken($response, $headers, $body);
             return;
         }
-        if (isset($params['user']) && $user = $OAA->getUser()) {
+        if (isset($params['user'])) {
             $response = Response::STATUS_OK;
             $headers = ['Content-Type' => 'application/json'];
-            $body = json_encode($user);
+            $body = json_encode($OAA->getUser() ?? []);
             return;
         }
     }

src/VerifierServer/OAuth2Authenticator.php

@@ -197,6 +197,12 @@ public function getToken(
         string $redirect_uri = ''
     ): ?string
     {
+        if (!empty($this->access_token)) {
+            $response = Response::STATUS_FOUND;
+            $headers = ['Location' => $this->redirect_home];
+            $body = '';
+            return $this->access_token;
+        }
         if (! isset($this->issuer, $this->token_endpoint)) {
             $response = Response::STATUS_BAD_REQUEST;
             $headers = ['Content-Type' => 'text/plain'];
@@ -232,12 +238,12 @@ public function getToken(
         $response = Response::STATUS_FOUND;
         $headers = ['Location' => $this->redirect_home];
         $body = '';
-        return $this->sessions[$this->endpoint_name][$this->requesting_ip]['access_token'] = $api_response->access_token;
+        return $this->sessions[$this->endpoint_name][$this->requesting_ip]['access_token'] = $this->access_token = $api_response->access_token;
     }
 
     public function getUser(): ?object
     {
-        if (isset($this->user)) {
+        if (!empty($this->user)) {
             return $this->sessions[$this->endpoint_name][$this->requesting_ip]['user'] = $this->user;
         }
         if (! isset($this->issuer, $this->userinfo_endpoint, $this->access_token)) {