From a1c65d3921f869972588d8303e940b6301469d5c Mon Sep 17 00:00:00 2001
From: Son NK <son@imac-de-son.home>
Date: Mon, 22 Jul 2019 20:06:17 +0200
Subject: [PATCH] use EMAIL_DOMAIN instead of simplelogin.co

---
 app/oauth/templates/oauth/authorize.html | 35 +-----------------------
 app/oauth/views/authorize.py             |  1 +
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/app/oauth/templates/oauth/authorize.html b/app/oauth/templates/oauth/authorize.html
index a6b6a550..93cfda03 100644
--- a/app/oauth/templates/oauth/authorize.html
+++ b/app/oauth/templates/oauth/authorize.html
@@ -64,7 +64,7 @@
                 <input class="form-control" style="flex-grow: 2" name="custom-email-prefix">
                 <input type="hidden" name="email-suffix" value="{{ email_suffix }}">
                 <div class="ml-2">
-                  .{{ email_suffix }}@simplelogin.co
+                  .{{ email_suffix }}@{{ EMAIL_DOMAIN }}
                 </div>
               </div>
             {% endif %}
@@ -91,25 +91,7 @@
           </div>
         {% endif %}
 
-        <hr>
-        <div class="card-title">
-          <b>{{ client.name }}</b> will receive your following information:
-        </div>
 
-        <div>
-          {% for scope in client.get_scopes() %}
-            <div style="display: flex; align-items: center; margin: .5rem 0; line-height: 1.3rem">
-              {% if scope == Scope.AVATAR_URL and current_user.profile_picture_id %}
-                avatar: <img src="{{ current_user.profile_picture_url() }}" class="avatar" style="margin: 10px 0px">
-              {% elif scope == Scope.EMAIL %}
-                {{ scope.value }}:
-                A random alias or your original email
-              {% elif scope == Scope.NAME %}
-                {{ scope.value }}: <b>{{ current_user.name }}</b>
-              {% endif %}
-            </div>
-          {% endfor %}
-        </div>
       {% endif %}
 
       {% if client_user %}
@@ -125,21 +107,6 @@
           </div>
         </div>
       {% else %}
-        <div class="form-group" style="margin-top: 1rem">
-          <div class="custom-controls-stacked">
-            <label class="custom-control custom-checkbox">
-              <input type="checkbox" name="gen-email"
-                     class="custom-control-input" checked>
-              <span class="custom-control-label">Use email alias</span>
-            </label>
-          </div>
-
-          <small class="form-text text-muted">
-            If checked, an email alias will be used. <br>
-            Otherwise, your personal email will be communicated to <b>{{ client.name }}</b>.
-          </small>
-        </div>
-
         <div class="form-footer">
           <div class="btn-group btn-block" role="group" aria-label="Basic example">
             <button type="submit" name="button" value="allow"
diff --git a/app/oauth/views/authorize.py b/app/oauth/views/authorize.py
index 516d061e..c20af9c7 100644
--- a/app/oauth/views/authorize.py
+++ b/app/oauth/views/authorize.py
@@ -88,6 +88,7 @@ def authorize():
                 personal_email=current_user.email,
                 other_emails=other_emails,
                 email_suffix=email_suffix,
+                EMAIL_DOMAIN=EMAIL_DOMAIN,
             )
         else:
             # after user logs in, redirect user back to this page