controllers: fix base url to omit scheme for when we connect through a https gateway

[pharext/pharext.org] / app / Controller / Github / Callback.php

diff --git a/app/Controller/Github/Callback.php b/app/Controller/Github/Callback.php
index 646d782f20d52c59676efdbd23a72a39ddd3c5ba..bd8c0e5abe6dc7f281aa894174f42bee95c194f0 100644 (file)
--- a/app/Controller/Github/Callback.php
+++ b/app/Controller/Github/Callback.php
@@ -7,6 +7,7 @@ use app\Github\API;
 use app\Model\Accounts;
 use app\Session;
 use app\Web;
+use http\Cookie;
 
 class Callback extends Github
 {
@@ -26,39 +27,49 @@ class Callback extends Github
                                "error" => $this->app->getRequest()->getQuery("error_description")
                        ]);
                } else {
-                       $this->github->fetchToken(
-                               $this->app->getRequest()->getQuery("code"),
-                               $this->app->getRequest()->getQuery("state"),
-                               function($token) {
-                                       $this->github->setToken($token->access_token);
-                                       $this->github->readAuthUser($this->createUserCallback($token));
-                       })->send();
+                       $this->validateUser();
+                       
                        if (isset($this->session->returnto)) {
                                $returnto = $this->session->returnto;
                                unset($this->session->returnto);
                                $this->app->redirect($returnto);
                        } else {
                                $this->app->redirect(
-                                       $this->app->getBaseUrl()->mod("./github"));
+                                       $this->app->getBaseUrl()->mod(":./github"));
                        }
                }
                $this->app->display("github/callback");
        }
        
-       function createUserCallback($token) {
-               return function($user) use($token) {
-                       $tx = $this->accounts->getConnection()->startTransaction();
-                       
-                       if (!($account = $this->accounts->byOAuth("github", $token->access_token, $user->login))) {
-                               $account = $this->accounts->createOAuthAccount("github", $token->access_token, $user->login);
-                       }
-                       $account->updateToken("github", $token->access_token, $token);
-                       $owner = $account->updateOwner("github", $user->login, $user);
-                       
-                       $tx->commit();
-                       
-                       $this->session->account = $account->account->get();
-                       $this->session->github = (object) $owner->export();
-               };
+       private function validateUser() {
+               $this->github->fetchToken(
+                       $this->app->getRequest()->getQuery("code"),
+                       $this->app->getRequest()->getQuery("state")
+               )->then(function($result) use (&$oauth) {
+                       list($oauth) = $result;
+                       $this->github->setToken($oauth->access_token);
+                       return $this->github->readAuthUser();
+               })->done(function($result) use(&$oauth) {
+                       list($user) = $result;
+                       $this->login(...$this->persistUser($oauth, $user));
+               });
+
+               $this->github->drain();
+       }
+       
+       private function persistUser($oauth, $user) {
+               $tx = $this->accounts->getConnection()->startTransaction();
+
+               if (($cookie = $this->app->getRequest()->getCookie("account"))) {
+                       $account = $this->accounts->find(["account=" => $cookie])->current();
+               } elseif (!($account = $this->accounts->byOAuth("github", $oauth->access_token, $user->login))) {
+                       $account = $this->accounts->createOAuthAccount("github", $oauth->access_token, $user->login);
+               }
+               $token = $account->updateToken("github", $oauth->access_token, $oauth);
+               $owner = $account->updateOwner("github", $user->login, $user);
+
+               $tx->commit();
+
+               return [$account, $token, $owner];
        }
 }