From 7d0c1bb737f3683cd770ebd757d938f39a9b55ef Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sun, 18 Feb 2018 20:24:41 -0500
Subject: Created test vehicle module oauth2test

---
 view/tpl/oauth2test.tpl | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 view/tpl/oauth2test.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/oauth2test.tpl b/view/tpl/oauth2test.tpl
new file mode 100644
index 000000000..d4887063c
--- /dev/null
+++ b/view/tpl/oauth2test.tpl
@@ -0,0 +1,13 @@
+<h1>OAuth 2.0 Test Vehicle</h1>
+
+{{foreach $endpoints as $ept}}
+<div class="oath2test-form-box">
+<form action="{{$baseurl}}/{{$ept.0}}" method="post">
+	<h3>{{$ept.3}}</h3>
+	<p>{{$baseurl}}/{{$ept.0}}/?{{foreach $ept.1 as $field}}{{$field.0}}={{$field.1}}&<input type="hidden" name="{{$field.0}}" value="{{$field.1}}" />	{{/foreach}}
+	</p>
+	<button type="submit" name="{{$ept.2}}_submit" value="submit" class="btn btn-med" title="">Submit</button>
+	
+</form>
+	</div>
+{{/foreach}}
\ No newline at end of file
-- 
cgit v1.2.3


From 89a825cd038df7da609d64ef0254ba58caaede31 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Tue, 20 Feb 2018 21:11:38 -0500
Subject: OAuth2TestVehicle module can create and delete oauth2 database
 tables.

---
 view/tpl/oauth2test.tpl        | 13 -------------
 view/tpl/oauth2testvehicle.tpl | 13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 view/tpl/oauth2test.tpl
 create mode 100644 view/tpl/oauth2testvehicle.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/oauth2test.tpl b/view/tpl/oauth2test.tpl
deleted file mode 100644
index d4887063c..000000000
--- a/view/tpl/oauth2test.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<h1>OAuth 2.0 Test Vehicle</h1>
-
-{{foreach $endpoints as $ept}}
-<div class="oath2test-form-box">
-<form action="{{$baseurl}}/{{$ept.0}}" method="post">
-	<h3>{{$ept.3}}</h3>
-	<p>{{$baseurl}}/{{$ept.0}}/?{{foreach $ept.1 as $field}}{{$field.0}}={{$field.1}}&<input type="hidden" name="{{$field.0}}" value="{{$field.1}}" />	{{/foreach}}
-	</p>
-	<button type="submit" name="{{$ept.2}}_submit" value="submit" class="btn btn-med" title="">Submit</button>
-	
-</form>
-	</div>
-{{/foreach}}
\ No newline at end of file
diff --git a/view/tpl/oauth2testvehicle.tpl b/view/tpl/oauth2testvehicle.tpl
new file mode 100644
index 000000000..d4887063c
--- /dev/null
+++ b/view/tpl/oauth2testvehicle.tpl
@@ -0,0 +1,13 @@
+<h1>OAuth 2.0 Test Vehicle</h1>
+
+{{foreach $endpoints as $ept}}
+<div class="oath2test-form-box">
+<form action="{{$baseurl}}/{{$ept.0}}" method="post">
+	<h3>{{$ept.3}}</h3>
+	<p>{{$baseurl}}/{{$ept.0}}/?{{foreach $ept.1 as $field}}{{$field.0}}={{$field.1}}&<input type="hidden" name="{{$field.0}}" value="{{$field.1}}" />	{{/foreach}}
+	</p>
+	<button type="submit" name="{{$ept.2}}_submit" value="submit" class="btn btn-med" title="">Submit</button>
+	
+</form>
+	</div>
+{{/foreach}}
\ No newline at end of file
-- 
cgit v1.2.3


From 43fca182e3915734587abf389d819546ebade3a4 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Thu, 22 Feb 2018 15:10:05 -0500
Subject: The authorization step with client registration and authorization
 code retrieval working. Might not conform perfectly to OAuth2 spec, but it is
 a start.

---
 view/tpl/oauth2testvehicle.tpl |  4 ++--
 view/tpl/oauth_authorize.tpl   | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/oauth2testvehicle.tpl b/view/tpl/oauth2testvehicle.tpl
index d4887063c..aebc71bb2 100644
--- a/view/tpl/oauth2testvehicle.tpl
+++ b/view/tpl/oauth2testvehicle.tpl
@@ -2,9 +2,9 @@
 
 {{foreach $endpoints as $ept}}
 <div class="oath2test-form-box">
-<form action="{{$baseurl}}/{{$ept.0}}" method="post">
+<form action="{{$baseurl}}/{{$ept.0}}" method="{{$ept.4}}">
 	<h3>{{$ept.3}}</h3>
-	<p>{{$baseurl}}/{{$ept.0}}/?{{foreach $ept.1 as $field}}{{$field.0}}={{$field.1}}&<input type="hidden" name="{{$field.0}}" value="{{$field.1}}" />	{{/foreach}}
+	<p>{{$baseurl}}/{{$ept.0}}/?{{foreach $ept.1 as $field}}{{$field.0}}={{$field.1}}&<input type="hidden" name="{{$field.0}}" value="{{$field.1}}" />{{/foreach}}
 	</p>
 	<button type="submit" name="{{$ept.2}}_submit" value="submit" class="btn btn-med" title="">Submit</button>
 	
diff --git a/view/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl
index 2b7afa80e..f5da11cdc 100755
--- a/view/tpl/oauth_authorize.tpl
+++ b/view/tpl/oauth_authorize.tpl
@@ -3,8 +3,14 @@
 <div class='oauthapp'>
 	<img src='{{$app.icon}}'>
 	<h4>{{$app.name}}</h4>
-</div>
-<h3>{{$authorize}}</h3>
-<form method="POST">
-<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="{{$yes}}" /></div>
-</form>
+	<h3>{{$authorize}}</h3>
+	<form method="POST">
+	<div class="settings-submit-wrapper">
+		<input type="hidden" name="client_id" value="{{$client_id}}" />
+		<input type="hidden" name="redirect_uri" value="{{$redirect_uri}}" />
+		<input type="hidden" name="state" value="{{$state}}" />
+		<button class="btn btn-lg btn-danger" name="authorize" value="deny" type="submit">{{$no}}</button>
+		<button class="btn btn-lg btn-success" name="authorize" value="allow" type="submit">{{$yes}}</button>
+	</div>
+	</form>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3


From 64ee42fc3d00765bc5c60e451b86230ea38ffdfb Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 24 Feb 2018 06:48:30 -0500
Subject: Add channel ID to user_id in clients table. Added TODO comments about
 dynamic client registration protocol.

---
 view/tpl/oauth2testvehicle.tpl | 2 +-
 view/tpl/oauth_authorize.tpl   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/oauth2testvehicle.tpl b/view/tpl/oauth2testvehicle.tpl
index aebc71bb2..18bbfb1ff 100644
--- a/view/tpl/oauth2testvehicle.tpl
+++ b/view/tpl/oauth2testvehicle.tpl
@@ -2,7 +2,7 @@
 
 {{foreach $endpoints as $ept}}
 <div class="oath2test-form-box">
-<form action="{{$baseurl}}/{{$ept.0}}" method="{{$ept.4}}">
+<form action="{{$baseurl}}/{{$ept.0}}/" method="{{$ept.4}}">
 	<h3>{{$ept.3}}</h3>
 	<p>{{$baseurl}}/{{$ept.0}}/?{{foreach $ept.1 as $field}}{{$field.0}}={{$field.1}}&<input type="hidden" name="{{$field.0}}" value="{{$field.1}}" />{{/foreach}}
 	</p>
diff --git a/view/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl
index f5da11cdc..72701ce52 100755
--- a/view/tpl/oauth_authorize.tpl
+++ b/view/tpl/oauth_authorize.tpl
@@ -2,8 +2,8 @@
 
 <div class='oauthapp'>
 	<img src='{{$app.icon}}'>
-	<h4>{{$app.name}}</h4>
-	<h3>{{$authorize}}</h3>
+	<h3>{{$app.name}}</h3>
+	<p class="descriptive-paragraph">{{$authorize}}</p>
 	<form method="POST">
 	<div class="settings-submit-wrapper">
 		<input type="hidden" name="client_id" value="{{$client_id}}" />
-- 
cgit v1.2.3


From 45e0fc6802b360710becf7ddaf6aed6a9de1d876 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Mon, 26 Feb 2018 18:16:43 -0500
Subject: Successful OAuth2 sequence demonstrated with the test vehicle,
 including an authenticated API call using an access_token.

---
 view/tpl/oauth2testvehicle.tpl | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/oauth2testvehicle.tpl b/view/tpl/oauth2testvehicle.tpl
index 18bbfb1ff..ce46b58c0 100644
--- a/view/tpl/oauth2testvehicle.tpl
+++ b/view/tpl/oauth2testvehicle.tpl
@@ -4,10 +4,18 @@
 <div class="oath2test-form-box">
 <form action="{{$baseurl}}/{{$ept.0}}/" method="{{$ept.4}}">
 	<h3>{{$ept.3}}</h3>
-	<p>{{$baseurl}}/{{$ept.0}}/?{{foreach $ept.1 as $field}}{{$field.0}}={{$field.1}}&<input type="hidden" name="{{$field.0}}" value="{{$field.1}}" />{{/foreach}}
-	</p>
+	{{$baseurl}}/{{$ept.0}}/?{{foreach $ept.1 as $field}}{{$field.0}}={{$field.1}}&<input type="hidden" name="{{$field.0}}" value="{{$field.1}}" />{{/foreach}}
+	<br>
 	<button type="submit" name="{{$ept.2}}_submit" value="submit" class="btn btn-med" title="">Submit</button>
-	
+	<span style="display: {{if $ept.5}}inline{{else}}none{{/if}}; font-size: 2em;">&nbsp;<i class="fa fa-check"></i></span>
 </form>
 	</div>
-{{/foreach}}
\ No newline at end of file
+{{/foreach}}
+<div>
+	<h3>API response</h3>
+	<pre style="display: inline-block; overflow-x: auto; white-space: nowrap; width: 100%;">
+	<code>
+	{{$api_response}}
+	</code>
+	</pre>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3