github: honor redirect in readrepo

[pharext/pharext.org] / app / Github / API / Repos / ReadRepo.php

diff --git a/app/Github/API/Repos/ReadRepo.php b/app/Github/API/Repos/ReadRepo.php
index e432d2a2a8557a2eba98d10caf5b5ea6e64b783c..00b9d2ce6fdc4488e9528189221ff700362fce20 100644 (file)
--- a/app/Github/API/Repos/ReadRepo.php
+++ b/app/Github/API/Repos/ReadRepo.php
@@ -5,22 +5,43 @@ namespace app\Github\API\Repos;
 use app\Github\API\Call;
 use app\Github\Exception\RequestException;
 use http\Client\Request;
+use http\Client\Response;
 
 class ReadRepo extends Call
 {
-       function enqueue(callable $callback) {
+       function request() {
                $url = $this->url->mod(uri_template("./repos/{+repo}", $this->args));
+               return $this->requestUrl($url);
+       }
+
+       function requestUrl($url) {
                $request = new Request("GET", $url, [
                        "Authorization" => "token " . $this->api->getToken(),
                        "Accept" => $this->config->api->accept,
                ]);
-               $this->api->getClient()->enqueue($request, function($response) use($callback) {
-                       if ($response->getResponseCode() >= 400 || null === ($json = json_decode($response->getBody()))) {
-                               throw new RequestException($response);
-                       }
-                       $this->saveToCache($json);
-                       $callback($json);
-                       return true;
-               });
+               return $request;
+       }
+
+       function response(Response $response) {
+               if ($response->getResponseCode() >= 400 || null === ($json = json_decode($response->getBody()))) {
+                       throw new RequestException($response);
+               }
+               if ($response->getResponseCode() >= 300 && $response->getResponseCode() < 400) {
+                       $this->api->getClient()->enqueue(
+                               $this->requestUrl($json->url),
+                               function($response) {
+                                       try {
+                                               $this->deferred->resolve($this->response($response));
+                                       } catch (\Exception $e) {
+                                               $this->deferred->reject($e);
+                                       }
+                                       return true;
+                               }
+                       );
+                       return $this->deferred->promise();
+               }
+               $result = [$json];
+               $this->saveToCache($result);
+               return $result;
        }
 }