X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=app%2FController%2FGithub%2FCallback.php;h=bd8c0e5abe6dc7f281aa894174f42bee95c194f0;hb=5664731d8825ce074a5232190f2f8ec61d921782;hp=5b62faa3251cb9e234c34205119c95879b065f2c;hpb=4c462ab66e6c65c15df7bd5fe6d2673884c639a0;p=pharext%2Fpharext.org

diff --git a/app/Controller/Github/Callback.php b/app/Controller/Github/Callback.php
index 5b62faa..bd8c0e5 100644
--- a/app/Controller/Github/Callback.php
+++ b/app/Controller/Github/Callback.php
@@ -3,35 +3,73 @@
 namespace app\Controller\Github;
 
 use app\Controller\Github;
+use app\Github\API;
+use app\Model\Accounts;
+use app\Session;
+use app\Web;
+use http\Cookie;
 
 class Callback extends Github
 {
+	/**
+	 * @var Accounts
+	 */
+	private $accounts;
+	
+	function __construct(Web $app, API $github, Session $session, Accounts $accounts) {
+		parent::__construct($app, $github, $session);
+		$this->accounts = $accounts;
+	}
+	
 	function __invoke(array $args = null) {
 		if ($this->app->getRequest()->getQuery("error")) {
 			$this->app->getView()->addData([
 				"error" => $this->app->getRequest()->getQuery("error_description")
 			]);
 		} else {
-			try {
-				$this->github->fetchToken(
-					$this->app->getRequest()->getQuery("code"),
-					$this->app->getRequest()->getQuery("state"),
-					function($json) {
-						$this->github->setToken($json->access_token);
-						$this->github->fetchUser(function($user) {
-							$this->session->github = $user;
-						});
-				})->send();
-				if (isset($this->session->returnto)) {
-					$this->app->redirect($this->session->returnto);
-				} else {
-					$this->app->redirect(
-						$this->app->getBaseUrl()->mod("./github"));
-				}
-			} catch (\app\Github\Exception $exception) {
-				$this->app->getView()->addData(compact("exception"));
+			$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->display("github/callback");
 	}
+	
+	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];
+	}
 }