Make getEndpointUri instance method

To reuse the data gotten from discovery URL

Signed-off-by: Naoto Kobayashi <[email protected]>

Author: YoitoFes

Keycloak.php

@@ -29,31 +29,35 @@ class Keycloak extends AbstractOAuth2Base
      */
     const ENDPOINT_LOGOUT   = 'end_session_endpoint';
 
+    protected $discovery;
+
     /**
      * Return URI of discovered endpoint
      *
      * @return string
      */
-    public static function getEndpointUri(string $endpoint)
+    public function getEndpoint(string $endpoint)
     {
-        $plugin = plugin_load('helper', 'oauthkeycloak');
-        $json = file_get_contents($plugin->getConf('openidurl'));
-        if (!$json) return '';
-        $data = json_decode($json, true);
-        if (!isset($data[$endpoint])) return '';
-        return $data[$endpoint];
+        if (!isset($this->discovery)) {
+            $plugin = plugin_load('helper', 'oauthkeycloak');
+            $json = file_get_contents($plugin->getConf('openidurl'));
+            if (!$json) return '';
+            $this->discovery = json_decode($json, true);
+        }
+        if (!isset($this->discovery[$endpoint])) return '';
+        return $this->discovery[$endpoint];
     }
 
     /** @inheritdoc */
     public function getAuthorizationEndpoint()
     {
-        return new Uri(self::getEndpointUri(self::ENDPOINT_AUTH));
+        return new Uri($this->getEndpoint(self::ENDPOINT_AUTH));
     }
 
     /** @inheritdoc */
     public function getAccessTokenEndpoint()
     {
-        return new Uri(self::getEndpointUri(self::ENDPOINT_TOKEN));
+        return new Uri($this->getEndpoint(self::ENDPOINT_TOKEN));
     }
 
     /** @inheritdoc */
@@ -84,7 +88,7 @@ public function logout()
         ];
 
         $this->httpClient->retrieveResponse(
-            new Uri(self::getEndpointUri(self::ENDPOINT_LOGOUT)),
+            new Uri($this->getEndpoint(self::ENDPOINT_LOGOUT)),
             $parameters,
             $this->getExtraOAuthHeaders()
         );

action.php

@@ -28,10 +28,11 @@ public function logout()
     /** * @inheritDoc */
     public function getUser()
     {
+        /** @var Keycloak */
         $oauth = $this->getOAuthService();
         $data = array();
 
-        $url = Keycloak::getEndpointUri(Keycloak::ENDPOINT_USERINFO);
+        $url = $oauth->getEndpoint(Keycloak::ENDPOINT_USERINFO);
         $raw = $oauth->request($url);
 
         if (!$raw) throw new OAuthException('Failed to fetch data from userinfo endpoint');