simplify error

diff --git a/app/Controller/Github/Callback.php b/app/Controller/Github/Callback.php
index bd8c0e5abe6dc7f281aa894174f42bee95c194f0..2347d0e67069ca946dbea6c924af10e59b312f06 100644 (file)
--- a/app/Controller/Github/Callback.php
+++ b/app/Controller/Github/Callback.php
@@ -23,9 +23,7 @@ class Callback extends Github
        
        function __invoke(array $args = null) {
                if ($this->app->getRequest()->getQuery("error")) {
-                       $this->app->getView()->addData([
-                               "error" => $this->app->getRequest()->getQuery("error_description")
-                       ]);
+                       $this->app->getView()->addData($this->app->getRequest()->getQuery()->toArray());
                } else {
                        $this->validateUser();
                        

diff --git a/app/views/github/callback.phtml b/app/views/github/callback.phtml
index fae0bae05f94319ade0b5458e0ae16579e956bbd..dde4896309163b1685f0dbd3af908f59a8286dba 100644 (file)
--- a/app/views/github/callback.phtml
+++ b/app/views/github/callback.phtml
@@ -1,2 +1,8 @@
 <?php $this->layout("layout") ?>
 
+<?php if (isset($error)) : ?>
+<div class="alert alert-warning">
+       <p><?= $this->e($error_description) ?></p>
+       <p>Github error: <a href="<?= $this->e($error_uri)?>"><?= $this->e($error) ?></a></p>
+</div>
+<?php endif; ?>