redirect_uri

Author: valzargaming

src/Discord/Endpoints/OAuth2Endpoint.php

@@ -98,8 +98,7 @@ private function get(
                 $this->web_address,
                 $this->http_port,
                 $this->client_id,
-                $this->client_secret,
-                $scope = 'identify guilds connections',
+                $this->client_secret
             );
         /** @var OAuth2Authenticator $OAA */
 

src/Discord/OAuth2Authenticator.php

@@ -32,7 +32,17 @@ public function __construct(
         protected string $endpoint_name = 'dwa',
         protected string $scope = 'identify guilds connections'
     ) {
-        parent::__construct($request, $sessions, $resolved_ip, $web_address, $http_port, $client_id, $client_secret, $endpoint_name, $scope);
+        parent::__construct(
+            $request,
+            $sessions,
+            $resolved_ip,
+            $web_address,
+            $http_port,
+            $client_id,
+            $client_secret,
+            $endpoint_name,
+            $scope
+        );
     }
 
     /**

src/SS14/OAuth2Authenticator.php

@@ -18,4 +18,28 @@ class OAuth2Authenticator extends __OAuth2Authenticator
     protected string $token_endpoint                = '/connect/token';
     protected string $userinfo_endpoint             = '/connect/userinfo';
     protected string $revocation_endpoint           = '/connect/revocation';
+
+    public function __construct(
+        $request,
+        protected array &$sessions,
+        string $resolved_ip,
+        string $web_address,
+        int $http_port,
+        protected string $client_id,
+        protected string $client_secret,
+        protected string $endpoint_name = 'ss14wa',
+        protected string $scope = 'openid profile email'
+    ) {
+        parent::__construct(
+            $request,
+            $sessions,
+            $resolved_ip,
+            $web_address,
+            $http_port,
+            $client_id,
+            $client_secret,
+            $endpoint_name,
+            $scope
+        );
+    }
 }

src/VerifierServer/OAuth2Authenticator.php

@@ -41,11 +41,11 @@ class OAuth2Authenticator
      * Initializes the OAuth2 authentication process by setting up session data, 
      * request parameters, allowed URIs, and other necessary configurations.
      *
+     * @param ServerRequestInterface $request
      * @param array &$sessions
      * @param string $resolved_ip
      * @param string $web_address
      * @param int $http_port
-     * @param ServerRequestInterface $request
      * @param string $client_id
      * @param string $client_secret
      * @param string $endpoint_name
@@ -61,8 +61,8 @@ public function __construct(
         int $http_port,
         protected string $client_id,
         protected string $client_secret,
-        protected string $endpoint_name = 'ss14wa',
-        protected string $scope = 'openid profile email'
+        protected string $endpoint_name,
+        protected string $scope
     ) {
         if (! $request instanceof ServerRequestInterface) {
             throw new \RuntimeException('String requests are not supported.');
@@ -134,8 +134,9 @@ public function login(
 
         if (!in_array($redirect_uri = $redirect_uri ?? $this->default_redirect, $this->allowed_uri)) {
             $response = Response::STATUS_FOUND;
-            $headers = ['Location' => $this->allowed_uri[0] . '?login'];
+            $headers = ['Location' => "{$this->endpoint_name}/{$this->allowed_uri[0]}?login"];
             $body = '';
+            var_dump($headers);
             return;
         }