From 00f858c8c157f451a134ea6dbda5b1c07cb710d3 Mon Sep 17 00:00:00 2001 From: Son NK Date: Mon, 22 Jul 2019 19:17:57 +0200 Subject: [PATCH] user can choose custom email in authorize --- app/oauth/templates/oauth/authorize.html | 215 ++++++++++++++--------- app/oauth/views/authorize.py | 48 ++++- static/style.css | 11 ++ 3 files changed, 185 insertions(+), 89 deletions(-) diff --git a/app/oauth/templates/oauth/authorize.html b/app/oauth/templates/oauth/authorize.html index d132c744..a6b6a550 100644 --- a/app/oauth/templates/oauth/authorize.html +++ b/app/oauth/templates/oauth/authorize.html @@ -5,99 +5,154 @@ {% endblock %} {% block default_content %} -
-
-
- - {% if client_user %} -
- You have already authorized {{ client.name }}. -
+ +
+ + {% if client_user %} +
+ You have already authorized {{ client.name }}. +
-
+
-
- {{ client.name }} has access to the following information: -
-
- {% for scope in client.get_scopes() %} -
- {% if scope == Scope.AVATAR_URL and user_info[scope.value] %} - avatar: - {% elif scope == Scope.EMAIL %} - {{ scope.value }}: - - {{ user_info[scope.value] }} - - {% elif scope == Scope.NAME %} - {{ scope.value }}: {{ user_info[scope.value] }} - {% endif %} -
- {% endfor %} -
- {% else %} -
- {{ client.name }} will receive your following information: -
- -
- {% for scope in client.get_scopes() %} -
- {% if scope == Scope.AVATAR_URL and current_user.profile_picture_id %} - avatar: - {% elif scope == Scope.EMAIL %} - {{ scope.value }}: - A random alias or your original email - {% elif scope == Scope.NAME %} - {{ scope.value }}: {{ current_user.name }} - {% endif %} -
- {% endfor %} +
+ {{ client.name }} has access to the following information: +
+
+ {% for scope in client.get_scopes() %} +
+ {% if scope == Scope.AVATAR_URL and user_info[scope.value] %} + avatar: + {% elif scope == Scope.EMAIL %} + {{ scope.value }}: + + {{ user_info[scope.value] }} + + {% elif scope == Scope.NAME %} + {{ scope.value }}: {{ user_info[scope.value] }} + {% endif %} +
+ {% endfor %} +
+ {% else %} + {% if client.icon_id %} +
+
{% endif %} - {% if client_user %} -
-
- +
+ {{ client.name }} will receive the following info +
- - Cancel - -
+
+
+
- {% else %} -
-
- -
+
+ - - If checked, an email alias will be used.
- Otherwise, your personal email will be communicated to {{ client.name }}. - + {% if current_user.can_create_custom_email() %} +
OR
+
+ + +
+ .{{ email_suffix }}@simplelogin.co +
+
+ {% endif %}
+
-
-
- +
+
+ +
+
+ {{ current_user.name }} +
+
- + {% if current_user.profile_picture_id %} +
+
+ +
+
+
{% endif %} -
- -
+
+
+ {{ client.name }} will receive your following information: +
+ +
+ {% for scope in client.get_scopes() %} +
+ {% if scope == Scope.AVATAR_URL and current_user.profile_picture_id %} + avatar: + {% elif scope == Scope.EMAIL %} + {{ scope.value }}: + A random alias or your original email + {% elif scope == Scope.NAME %} + {{ scope.value }}: {{ current_user.name }} + {% endif %} +
+ {% endfor %} +
+ {% endif %} + + {% if client_user %} +
+
+ + + + Cancel + +
+
+ {% else %} +
+
+ +
+ + + If checked, an email alias will be used.
+ Otherwise, your personal email will be communicated to {{ client.name }}. + +
+ +
+
+ + + +
+
+ {% endif %} + +
+ {% endblock %} \ No newline at end of file diff --git a/app/oauth/views/authorize.py b/app/oauth/views/authorize.py index bf76784e..f02fad25 100644 --- a/app/oauth/views/authorize.py +++ b/app/oauth/views/authorize.py @@ -5,6 +5,7 @@ from urllib.parse import urlparse from flask import request, render_template, redirect from flask_login import current_user +from app.config import EMAIL_DOMAIN from app.extensions import db from app.jose_utils import make_id_token from app.log import LOG @@ -18,7 +19,7 @@ from app.models import ( ) from app.oauth.base import oauth_bp from app.oauth_models import get_response_types, ResponseType, Scope -from app.utils import random_string, encode_url +from app.utils import random_string, encode_url, convert_to_id @oauth_bp.route("/authorize", methods=["GET", "POST"]) @@ -63,6 +64,8 @@ def authorize(): # redirect from client website if request.method == "GET": if current_user.is_authenticated: + suggested_email, other_emails, email_suffix = None, [], None + # user has already allowed this client client_user: ClientUser = ClientUser.get_by( client_id=client.id, user_id=current_user.id @@ -71,6 +74,9 @@ def authorize(): if client_user: LOG.debug("user %s has already allowed client %s", current_user, client) user_info = client_user.get_user_info() + else: + suggested_email, other_emails = current_user.suggested_emails() + email_suffix = random_string(6) return render_template( "oauth/authorize.html", @@ -78,6 +84,10 @@ def authorize(): user_info=user_info, client_user=client_user, Scope=Scope, + suggested_email=suggested_email, + personal_email=current_user.email, + other_emails=other_emails, + email_suffix=email_suffix, ) else: # after user logs in, redirect user back to this page @@ -88,8 +98,6 @@ def authorize(): Scope=Scope, ) else: # user allows or denies - gen_new_email = request.form.get("gen-email") == "on" - if request.form.get("button") == "deny": LOG.debug("User %s denies Client %s", current_user, client) final_redirect_uri = f"{redirect_uri}?error=deny&state={state}" @@ -98,15 +106,40 @@ def authorize(): LOG.debug("User %s allows Client %s", current_user, client) client_user = ClientUser.get_by(client_id=client.id, user_id=current_user.id) - # user has already allowed this client + # user has already allowed this client, user cannot change information if client_user: LOG.d("user %s has already allowed client %s", current_user, client) - # User cannot choose to gen new email - gen_new_email = False else: + email_suffix = request.form.get("email-suffix") + custom_email_prefix = request.form.get("custom-email-prefix") + chosen_email = request.form.get("suggested-email") + + gen_email = None + if custom_email_prefix: + # check if user can generate custom email + if not current_user.can_create_custom_email(): + raise Exception(f"User {current_user} cannot create custom email") + + email = f"{convert_to_id(custom_email_prefix)}.{email_suffix}@{EMAIL_DOMAIN}" + LOG.d("create custom email alias %s for user %s", email, current_user) + + gen_email = GenEmail.create(email=email, user_id=current_user.id) + db.session.flush() + else: # user picks an email from suggestion + if chosen_email != current_user.email: + gen_email = GenEmail.get_by(email=chosen_email) + if not gen_email: + gen_email = GenEmail.create( + email=chosen_email, user_id=current_user.id + ) + db.session.flush() + client_user = ClientUser.create( client_id=client.id, user_id=current_user.id ) + if gen_email: + client_user.gen_email_id = gen_email.id + db.session.flush() LOG.d("create client-user for client %s, user %s", client, current_user) @@ -148,9 +181,6 @@ def authorize(): elif response_type == ResponseType.ID_TOKEN: redirect_args["id_token"] = make_id_token(client_user) - if gen_new_email: - client_user.gen_email_id = create_or_choose_gen_email(current_user).id - db.session.commit() # construct redirect_uri with redirect_args diff --git a/static/style.css b/static/style.css index fd8edc23..17eedd24 100644 --- a/static/style.css +++ b/static/style.css @@ -17,5 +17,16 @@ /* round the edges to a circle with border radius 1/2 container size */ border-radius: 10%; + margin-top: 10px; +} + +.small-client-icon { + /* make a square container */ + width: 40px; + height: 40px; + + /* round the edges to a circle with border radius 1/2 container size */ + border-radius: 10%; + margin-top: 10px; } \ No newline at end of file