LibreGaming
/
contentdb
14
0
Fork 0
Code Issues 13 Pull Requests Projects Releases Wiki Activity

Add redirection to set password after login if not set

This commit is contained in:
rubenwardy 2018-06-04 18:49:42 +01:00
parent 0aeefa2387
commit 8b2018852e
No known key found for this signature in database
GPG Key ID: A1E29D52FF81513C
5 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/scss/components.scss
View File

@ -315,6 +315,11 @@ select:not([multiple]) {
border: 1px solid #c96; border: 1px solid #c96;
} }
.alert-primary {
background: #339;
border: 1px solid #66a;
}
.alert-success { .alert-success {
background: #161; background: #161;
border: 1px solid #393; border: 1px solid #393;

25
app/templates/flask_user/login.html
View File

@ -11,10 +11,6 @@ Sign in
<h2>{%trans%}Sign in{%endtrans%}</h2> <h2>{%trans%}Sign in{%endtrans%}</h2>
<form action="" method="POST" class="form box-body" role="form"> <form action="" method="POST" class="form box-body" role="form">
<h3>Sign in with Github</h3>
<p><a class="button" href="{{ url_for('github_signin_page') }}">GitHub</a></p>
<h3>Sign in with username/password</h3> <h3>Sign in with username/password</h3>
{{ form.hidden_tag() }} {{ form.hidden_tag() }}
@ -38,17 +34,13 @@ Sign in
{# Password field #} {# Password field #}
{% set field = form.password %} {% set field = form.password %}
<div class="form-group {% if field.errors %}has-error{% endif %}"> <div class="form-group {% if field.errors %}has-error{% endif %}">
{# Label on left, "Forgot your Password?" on right #}
<div class="row"> <div class="row">
<div class="col-xs-6"> <label for="{{ field.id }}" class="control-label">{{ field.label.text }}
<label for="{{ field.id }}" class="control-label">{{ field.label.text }}</label> {% if user_manager.enable_forgot_password %}
</div>
<div class="col-xs-6 text-right">
{% if user_manager.enable_forgot_password %}
<a href="{{ url_for('user.forgot_password') }}" tabindex='195'> <a href="{{ url_for('user.forgot_password') }}" tabindex='195'>
{%trans%}Forgot your Password?{%endtrans%}</a> [{%trans%}Forgot My Password{%endtrans%}]</a>
{% endif %} {% endif %}
</div> </label>
</div> </div>
{{ field(class_='form-control', tabindex=120) }} {{ field(class_='form-control', tabindex=120) }}
{% if field.errors %} {% if field.errors %}
@ -64,7 +56,12 @@ Sign in
{% endif %} {% endif %}
{# Submit button #} {# Submit button #}
{{ render_submit_field(form.submit, tabindex=180) }} <p>
{{ render_submit_field(form.submit, tabindex=180) }}
</p>
<h3>Sign in with Github</h3>
<p><a class="button" href="{{ url_for('github_signin_page') }}">GitHub</a></p>
</form> </form>
</div> </div>

38
app/templates/users/set_password.html
View File

@ -5,30 +5,36 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% if optional %}
<div class="box box_grey alert alert-primary">
It is recommended that you set a password for your account.
<a class="alert_right button" href="{{ url_for('home_page') }}">Skip</a>
</div>
{% endif %}
<h1>Set Password</h1> <h1>Set Password</h1>
{% from "macros/forms.html" import render_field, render_submit_field %} {% from "macros/forms.html" import render_field, render_submit_field %}
<form action="" method="POST" class="form" role="form"> <form action="" method="POST" class="form" role="form">
<div class="row"> {{ form.hidden_tag() }}
<div class="col-sm-6 col-md-5 col-lg-4">
{{ form.hidden_tag() }}
{% if not current_user.email %} {% if not current_user.email %}
{{ render_field(form.email, tabindex=230) }} {{ render_field(form.email, tabindex=230) }}
<p> <p>
Your email is needed to recover your account if you forget your Your email is needed to recover your account if you forget your
password, and to optionally send notifications. password, and to optionally send notifications.
Your email will never be shared to a third-party. Your email will never be shared to a third-party.
</p> </p>
{% endif %} {% endif %}
{{ render_field(form.password, tabindex=230) }} {{ render_field(form.password, tabindex=230) }}
{{ render_field(form.password2, tabindex=240) }} {{ render_field(form.password2, tabindex=240) }}
{{ render_submit_field(form.submit, tabindex=280) }} {{ render_submit_field(form.submit, tabindex=280) }}
</div>
</div>
</form> </form>
{% endblock %} {% endblock %}

5
app/views/githublogin.py
View File

@ -64,7 +64,10 @@ def github_authorized(oauth_token):
flash("Unable to find an account for that Github user", "error") flash("Unable to find an account for that Github user", "error")
return redirect(url_for("user_claim_page")) return redirect(url_for("user_claim_page"))
elif loginUser(userByGithub): elif loginUser(userByGithub):
return redirect(next_url or url_for("home_page")) if current_user.password is None:
return redirect(next_url or url_for("set_password_page", optional=True))
else:
return redirect(next_url or url_for("home_page"))
else: else:
flash("Authorization failed [err=gh-login-failed]", "danger") flash("Authorization failed [err=gh-login-failed]", "danger")
return redirect(url_for("user.login")) return redirect(url_for("user.login"))

2
app/views/users.py
View File

@ -162,7 +162,7 @@ def set_password_page():
else: else:
flash("Passwords do not match", "error") flash("Passwords do not match", "error")
return render_template("users/set_password.html", form=form) return render_template("users/set_password.html", form=form, optional=request.args.get("optional"))
@app.route("/user/claim/", methods=["GET", "POST"]) @app.route("/user/claim/", methods=["GET", "POST"])