From 10b2e41b14c44ba4b868971805ae63bd30e05d18 Mon Sep 17 00:00:00 2001 From: Chris Seymour Date: Tue, 6 Jan 2015 13:54:57 +0000 Subject: [PATCH] #10 pass next parameter to LDAP_LOGIN_VIEW as request.path --- flask_simpleldap/__init__.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/flask_simpleldap/__init__.py b/flask_simpleldap/__init__.py index 74fdad5..08e0963 100644 --- a/flask_simpleldap/__init__.py +++ b/flask_simpleldap/__init__.py @@ -1,13 +1,11 @@ # -*- coding: utf-8 -*- __all__ = ['LDAP'] -from functools import wraps import re - import ldap -from ldap import filter -from flask import abort, current_app, g, make_response, redirect, url_for, \ - request +import ldap.filter +from functools import wraps +from flask import abort, current_app, g, make_response, redirect, url_for, request try: from flask import _app_ctx_stack as stack @@ -252,7 +250,7 @@ class LDAP(object): @wraps(func) def wrapped(*args, **kwargs): if g.user is None: - return redirect(url_for(current_app.config['LDAP_LOGIN_VIEW'])) + return redirect(url_for(current_app.config['LDAP_LOGIN_VIEW'], next=request.path)) return func(*args, **kwargs) return wrapped @@ -277,7 +275,7 @@ class LDAP(object): def wrapped(*args, **kwargs): if g.user is None: return redirect( - url_for(current_app.config['LDAP_LOGIN_VIEW'])) + url_for(current_app.config['LDAP_LOGIN_VIEW'], next=request.path)) match = [group for group in groups if group in g.ldap_groups] if not match: -- GitLab