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

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

diff --git a/app/Controller/Github/Signin.php b/app/Controller/Github/Signin.php
index 05f3e3c0f84320cf7e14632effe2f4c85e9bb53e..5f8b6a7709944527d477e9a75b0077796db97875 100644 (file)
--- a/app/Controller/Github/Signin.php
+++ b/app/Controller/Github/Signin.php
@@ -3,14 +3,51 @@
 namespace app\Controller\Github;
 
 use app\Controller\Github;
+use app\Github\API;
+use app\Model\Accounts;
+use app\Session;
+use app\Web;
 
 class Signin 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) {
-               $callback = $this->app->getBaseUrl()->mod("./github/callback");
+               if (($cookie = $this->app->getRequest()->getCookie("account"))) {
+                       $accounts = $this->accounts->find(["account=" => $cookie]);
+                       if (count($accounts)) {
+                               $account = $accounts->current();
+                               $tokens = $account->allOf("tokens")->filter(function($token) {
+                                       return $token->authority == "github";
+                               });
+                               if (count($tokens)) {
+                                       $token = $tokens->current();
+                                       $this->login($account, $token,
+                                               $account->allOf("owners")->filter(function($owner) {
+                                                       return $owner->authority == "github";
+                                               })->current()
+                                       );
+                                       if (($returnto = $this->app->getRequest()->getQuery("returnto"))) {
+                                               $this->app->redirect($returnto);
+                                       } else {
+                                               $this->app->redirect($this->app->getBaseUrl()->mod(":./github"));
+                                       }
+                                       return;
+                               }
+                       }
+               }
+               $callback = $this->app->getBaseUrl()->mod(":./github/callback");
                $location = $this->github->getAuthUrl($callback);
                $this->app->redirect($location);
-               if ($returnto = $this->app->getRequest()->getQuery("returnto")) {
+               if (($returnto = $this->app->getRequest()->getQuery("returnto"))) {
                        $this->session->returnto = $returnto;
                }
        }