From e7f90f6b7f5b6fac5ccc1157f769a4c320d9137c Mon Sep 17 00:00:00 2001
From: Aaron Parecki <aaron@parecki.com>
Date: Sun, 28 Jan 2018 09:23:32 -0800
Subject: [PATCH] don't fall back to default auth for micropub login

---
 compass/app/Http/Controllers/Controller.php | 9 ++++-----
 compass/resources/views/settings.blade.php  | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/compass/app/Http/Controllers/Controller.php b/compass/app/Http/Controllers/Controller.php
index 1a1e2a5..81e5fad 100644
--- a/compass/app/Http/Controllers/Controller.php
+++ b/compass/app/Http/Controllers/Controller.php
@@ -211,6 +211,10 @@ class Controller extends BaseController
 
         $authorizationEndpoint = \IndieAuth\Client::discoverAuthorizationEndpoint($me);
 
+        if(!$authorizationEndpoint) {
+          return view('auth/error', ['error' => 'No Authorization Endpoint Specified']);
+        }
+
         // Isolate session variables to this variable only
         session([$dbName => [
             'auth_state' => $state,
@@ -218,11 +222,6 @@ class Controller extends BaseController
             'authorization_endpoint' => $authorizationEndpoint
         ]]);
 
-        // If the user specified only an authorization endpoint, use that
-        if(!$authorizationEndpoint) {
-            // Otherwise, fall back to indieauth.com
-            $authorizationEndpoint = env('DEFAULT_AUTH_ENDPOINT');
-        }
         $authorizationURL = \IndieAuth\Client::buildAuthorizationURL($authorizationEndpoint, $me, $this->_databaseRedirectURI($dbName), env('BASE_URL'), $state, 'create');
 
         return redirect($authorizationURL);
diff --git a/compass/resources/views/settings.blade.php b/compass/resources/views/settings.blade.php
index 63c4e3b..539c4c5 100644
--- a/compass/resources/views/settings.blade.php
+++ b/compass/resources/views/settings.blade.php
@@ -92,7 +92,7 @@
     <form action="/settings/{{ $database->name }}/auth/start" method="post" class="ui form">
       <div class="field">
         <label for="micropub_endpoint">web sign-in</label>
-        <input name="me" type="url" placeholder="http://example.com/" class="pure-input-1" value="">
+        <input name="me" type="url" placeholder="https://example.com/" class="pure-input-1" value="">
       </div>
 
       <button type="submit" class="ui button primary">Connect</button>