From 6ed368cbebcae087aec1f31ee8d69ac6c47ead9f Mon Sep 17 00:00:00 2001
From: Forest Johnson <forest.n.johnson@gmail.com>
Date: Mon, 7 Feb 2022 11:04:31 +0000
Subject: [feature] add authorization to the already-existing authentication
 (#365)

* add ensureUserIsAuthorizedOrRedirect to /oauth/authorize

* adding authorization (email confirm, account approve, etc) to TokenCheck

* revert un-needed changes to signin.go

* oops what happened here

* error css

* add account.SuspendedAt check

* remove redundant checks from oauth util Authed function

* wip tests

* tests passing

* stop stripping useful information from ErrAlreadyExists

* that feeling of scraping the dryer LINT off the screen

* oops I didn't mean to get rid of this NewTestRouter function

* make tests work with recorder

* re-add ConfigureTemplatesWithGin to handle template path err

Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
---
 web/assets/base.css                       | 19 +++++++++++++++++++
 web/gotosocial-styling/templates/base.css | 18 ++++++++++++++++++
 web/template/authorize.tmpl               |  8 +++++++-
 web/template/error.tmpl                   |  8 ++++++++
 4 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 web/template/error.tmpl

(limited to 'web')

diff --git a/web/assets/base.css b/web/assets/base.css
index b28cf2533..e105707c2 100644
--- a/web/assets/base.css
+++ b/web/assets/base.css
@@ -165,6 +165,25 @@ section.login form button {
 			grid-column: 2;
 		}
 
+section.error {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+section.error span {
+  font-size: 2em;
+}
+section.error pre {
+  border: 1px solid #ff000080;
+  margin-left: 1em;
+  padding: 0 0.7em;
+  border-radius: 0.5em;
+  background-color: #ff000010;
+  font-size: 1.3em;
+  white-space: pre-wrap;
+}
+
+
 input, select, textarea {
 	border: 1px solid #fafaff;
 	color: #fafaff;
diff --git a/web/gotosocial-styling/templates/base.css b/web/gotosocial-styling/templates/base.css
index 8b2f14fbe..4ac639a38 100644
--- a/web/gotosocial-styling/templates/base.css
+++ b/web/gotosocial-styling/templates/base.css
@@ -165,6 +165,24 @@ section.login {
 	}
 }
 
+section.error {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+  span {
+    font-size: 2em;
+  }
+  pre {
+    border: 1px solid #ff000080;
+    margin-left: 1em;
+    padding: 0 0.7em;
+    border-radius: 0.5em;
+    background-color: #ff000010;
+    font-size: 1.3em;
+    white-space: pre-wrap;
+  }
+}
+
 input, select, textarea {
 	border: 1px solid $fg;
 	color: $fg;
diff --git a/web/template/authorize.tmpl b/web/template/authorize.tmpl
index b6eef9561..68a6a2f29 100644
--- a/web/template/authorize.tmpl
+++ b/web/template/authorize.tmpl
@@ -2,7 +2,13 @@
     <main>
         <form action="/oauth/authorize" method="POST">
             <h1>Hi {{.user}}!</h1>
-            <p>Application <b>{{.appname}}</b> {{if len .appwebsite | eq 0 | not}}({{.appwebsite}}) {{end}}would like to perform actions on your behalf, with scope <em>{{.scope}}</em>.</p>
+            <p>
+              Application <b>{{.appname}}</b> 
+              {{if len .appwebsite | eq 0 | not}}
+                ({{.appwebsite}}) 
+              {{end}}
+              would like to perform actions on your behalf, with scope <em>{{.scope}}</em>.
+            </p>
             <p>The application will redirect to {{.redirect}} to continue.</p>
             <p>
                 <button
diff --git a/web/template/error.tmpl b/web/template/error.tmpl
new file mode 100644
index 000000000..a8a72b062
--- /dev/null
+++ b/web/template/error.tmpl
@@ -0,0 +1,8 @@
+{{ template "header.tmpl" .}}
+    <main>
+        <section class="error">
+          <span>❌</span> <pre>{{.error}}</pre>
+        </section>
+        
+    </main>
+{{ template "footer.tmpl" .}}
\ No newline at end of file
-- 
cgit v1.3