From 23b128bcbd8de586c8f80fe87db4e19eca9fe674 Mon Sep 17 00:00:00 2001 From: Bruno Rocha Date: Thu, 7 Nov 2013 04:57:54 -0200 Subject: [PATCH 1/4] Allow overwritten on render_template to use Flask-Themes based app --- flask_security/core.py | 6 +++++- flask_security/views.py | 46 ++++++++++++++++++++--------------------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/flask_security/core.py b/flask_security/core.py index dfb49ac..0a7e129 100644 --- a/flask_security/core.py +++ b/flask_security/core.py @@ -9,7 +9,7 @@ :license: MIT, see LICENSE for more details. """ -from flask import current_app +from flask import current_app, render_template from flask.ext.login import AnonymousUserMixin, UserMixin as BaseUserMixin, \ LoginManager, current_user from flask.ext.principal import Principal, RoleNeed, UserNeed, Identity, \ @@ -382,9 +382,13 @@ class Security(object): app.register_blueprint(create_blueprint(state, __name__)) app.context_processor(_context_processor) + state.render_template = self.render_template app.extensions['security'] = state return state + def render_template(self, *args, **kwargs): + return render_template(*args, **kwargs) + def __getattr__(self, name): return getattr(self._state, name, None) diff --git a/flask_security/views.py b/flask_security/views.py index b1b70df..9be2b79 100644 --- a/flask_security/views.py +++ b/flask_security/views.py @@ -9,7 +9,7 @@ :license: MIT, see LICENSE for more details. """ -from flask import current_app, redirect, request, render_template, jsonify, \ +from flask import current_app, redirect, request, jsonify, \ after_this_request, Blueprint from flask_login import current_user from werkzeug.datastructures import MultiDict @@ -83,9 +83,9 @@ def login(): if request.json: return _render_json(form, True) - return render_template(config_value('LOGIN_USER_TEMPLATE'), - login_user_form=form, - **_ctx('login')) + return _security.render_template(config_value('LOGIN_USER_TEMPLATE'), + login_user_form=form, + **_ctx('login')) @login_required @@ -127,9 +127,9 @@ def register(): if request.json: return _render_json(form) - return render_template(config_value('REGISTER_USER_TEMPLATE'), - register_user_form=form, - **_ctx('register')) + return _security.render_template(config_value('REGISTER_USER_TEMPLATE'), + register_user_form=form, + **_ctx('register')) def send_login(): @@ -150,9 +150,9 @@ def send_login(): if request.json: return _render_json(form) - return render_template(config_value('SEND_LOGIN_TEMPLATE'), - send_login_form=form, - **_ctx('send_login')) + return _security.render_template(config_value('SEND_LOGIN_TEMPLATE'), + send_login_form=form, + **_ctx('send_login')) @anonymous_user_required @@ -195,9 +195,9 @@ def send_confirmation(): if request.json: return _render_json(form) - return render_template(config_value('SEND_CONFIRMATION_TEMPLATE'), - send_confirmation_form=form, - **_ctx('send_confirmation')) + return _security.render_template(config_value('SEND_CONFIRMATION_TEMPLATE'), + send_confirmation_form=form, + **_ctx('send_confirmation')) def confirm_email(token): @@ -246,9 +246,9 @@ def forgot_password(): if request.json: return _render_json(form) - return render_template(config_value('FORGOT_PASSWORD_TEMPLATE'), - forgot_password_form=form, - **_ctx('forgot_password')) + return _security.render_template(config_value('FORGOT_PASSWORD_TEMPLATE'), + forgot_password_form=form, + **_ctx('forgot_password')) @anonymous_user_required @@ -275,10 +275,10 @@ def reset_password(token): return redirect(get_url(_security.post_reset_view) or get_url(_security.post_login_view)) - return render_template(config_value('RESET_PASSWORD_TEMPLATE'), - reset_password_form=form, - reset_password_token=token, - **_ctx('reset_password')) + return _security.render_template(config_value('RESET_PASSWORD_TEMPLATE'), + reset_password_form=form, + reset_password_token=token, + **_ctx('reset_password')) @login_required @@ -303,9 +303,9 @@ def change_password(): if request.json: return _render_json(form) - return render_template('security/change_password.html', - change_password_form=form, - **_ctx('change_password')) + return _security.render_template('security/change_password.html', + change_password_form=form, + **_ctx('change_password')) def create_blueprint(state, import_name): From aa80198047f7c784ba38584140fc2a531d371e72 Mon Sep 17 00:00:00 2001 From: Bruno Rocha Date: Sat, 16 Nov 2013 21:58:27 -0200 Subject: [PATCH 2/4] Try to fix a problem with version installed --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 805af3f..e74bc16 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ from setuptools import setup setup( name='Flask-Security', - version='1.6.9', + version='1.6.10 url='https://github.com/mattupstate/flask-security', license='MIT', author='Matt Wright', From 6494275c8c7b984d6920146bc19cf96bcd668e8c Mon Sep 17 00:00:00 2001 From: Bruno Rocha Date: Sat, 16 Nov 2013 22:01:49 -0200 Subject: [PATCH 3/4] typo --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e74bc16..30ad00c 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ from setuptools import setup setup( name='Flask-Security', - version='1.6.10 + version='1.6.10', url='https://github.com/mattupstate/flask-security', license='MIT', author='Matt Wright', From 910d80d5112766cf17b3bded895550906badf5f4 Mon Sep 17 00:00:00 2001 From: Bruno Rocha Date: Mon, 23 Dec 2013 13:46:14 -0200 Subject: [PATCH 4/4] Fix version to be able to merge --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 30ad00c..805af3f 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ from setuptools import setup setup( name='Flask-Security', - version='1.6.10', + version='1.6.9', url='https://github.com/mattupstate/flask-security', license='MIT', author='Matt Wright',