From 3dcba7cc3fc06f1b9fd901544e214778ffbd33f7 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Wed, 8 Apr 2020 16:14:52 +0300
Subject: [PATCH] New fallback OAuth template

---
 app/controllers/web/home.php      |  8 ++++----
 app/views/home/auth/failure.phtml |  1 -
 app/views/home/auth/oauth2.phtml  | 13 +++++++++++++
 app/views/home/auth/success.phtml |  1 -
 4 files changed, 17 insertions(+), 6 deletions(-)
 delete mode 100644 app/views/home/auth/failure.phtml
 create mode 100644 app/views/home/auth/oauth2.phtml
 delete mode 100644 app/views/home/auth/success.phtml

diff --git a/app/controllers/web/home.php b/app/controllers/web/home.php
index a20f2e5c8..0871e8c25 100644
--- a/app/controllers/web/home.php
+++ b/app/controllers/web/home.php
@@ -109,12 +109,12 @@ $utopia->get('/auth/recovery/reset')
     });
 
 
-$utopia->get('/auth/success')
+$utopia->get('/auth/oauth2/success')
     ->desc('Registration page')
     ->label('permission', 'public')
     ->label('scope', 'home')
     ->action(function () use ($layout) {
-        $page = new View(__DIR__.'/../../views/home/auth/success.phtml');
+        $page = new View(__DIR__.'/../../views/home/auth/oauth2.phtml');
 
         $layout
             ->setParam('title', APP_NAME)
@@ -124,12 +124,12 @@ $utopia->get('/auth/success')
         ;
     });
 
-$utopia->get('/auth/failure')
+$utopia->get('/auth/oauth2/failure')
     ->desc('Registration page')
     ->label('permission', 'public')
     ->label('scope', 'home')
     ->action(function () use ($layout) {
-        $page = new View(__DIR__.'/../../views/home/auth/failure.phtml');
+        $page = new View(__DIR__.'/../../views/home/auth/oauth2.phtml');
 
         $layout
             ->setParam('title', APP_NAME)
diff --git a/app/views/home/auth/failure.phtml b/app/views/home/auth/failure.phtml
deleted file mode 100644
index 44fde152a..000000000
--- a/app/views/home/auth/failure.phtml
+++ /dev/null
@@ -1 +0,0 @@
-<script>window.location = 'appwrite-callback://'+window.document.cookie;</script>
\ No newline at end of file
diff --git a/app/views/home/auth/oauth2.phtml b/app/views/home/auth/oauth2.phtml
new file mode 100644
index 000000000..1ac00e7b5
--- /dev/null
+++ b/app/views/home/auth/oauth2.phtml
@@ -0,0 +1,13 @@
+<div class="zone large padding margin-top" id="message" style="display: none">
+    <h1 class="margin-bottom">Missing Redirect URL</h1>
+    <p>Your OAuth login flow is missing a redirect URL. Please check the <a href="https://<?php echo APP_DOMAIN; ?>/docs/account?platform=web&language=javascript#createOAuth2Session">OAuth docs</a> and send request for new session with a valid callback URL.</p>
+</div>
+
+<script>
+    setTimeout(function () {
+        document.getElementById('message').style.display = 'block';
+    }, 25);
+
+    window.location = 'appwrite-callback://'+window.location.search;
+</script>
+<hr />
\ No newline at end of file
diff --git a/app/views/home/auth/success.phtml b/app/views/home/auth/success.phtml
deleted file mode 100644
index 44fde152a..000000000
--- a/app/views/home/auth/success.phtml
+++ /dev/null
@@ -1 +0,0 @@
-<script>window.location = 'appwrite-callback://'+window.document.cookie;</script>
\ No newline at end of file