Merge pull request #1139 from pawl/fix_1116

add support for new version of flask-login and flask-security

Merge pull request #1139 from pawl/fix_1116
add support for new version of flask-login and flask-security
7f4f7a89 · Serge S. Koval · b36009e6 · aef56afc · 7f4f7a89 · 7f4f7a89
Commit 7f4f7a89 authored Dec 13, 2015 by Serge S. Koval
14 changed files
--- a/examples/auth-flask-login/app.py
+++ b/examples/auth-flask-login/app.py
@@ -95,7 +95,7 @@ def init_login():
 class MyModelView(sqla.ModelView):
    def is_accessible(self):
-        return login.current_user.is_authenticated()
+        return login.current_user.is_authenticated
 # Create customized index view class that handles login & registration
@@ -103,7 +103,7 @@ class MyAdminIndexView(admin.AdminIndexView):
    @expose('/')
    def index(self):
-        if not login.current_user.is_authenticated():
+        if not login.current_user.is_authenticated:
            return redirect(url_for('.login_view'))
        return super(MyAdminIndexView, self).index()
@@ -115,7 +115,7 @@ class MyAdminIndexView(admin.AdminIndexView):
            user = form.get_user()
            login.login_user(user)
-        if login.current_user.is_authenticated():
+        if login.current_user.is_authenticated:
            return redirect(url_for('.index'))
        link = '<p>Don\'t have an account? <a href="' + url_for('.register_view') + '">Click here to register.</a></p>'
        self._template_args['form'] = form

--- a/examples/auth-flask-login/requirements.txt
+++ b/examples/auth-flask-login/requirements.txt
 Flask
 Flask-Admin
 Flask-SQLAlchemy
-Flask-Login==0.2.11
+Flask-Login>=0.3.0
--- a/examples/auth-flask-login/templates/admin/index.html
+++ b/examples/auth-flask-login/templates/admin/index.html
@@ -4,7 +4,7 @@
 <div class="row-fluid">
    <div>
-        {% if current_user.is_authenticated() %}
+        {% if current_user.is_authenticated %}
        <h1>Flask-Admin example</h1>
        <p class="lead">
            Authentication

--- a/examples/auth-flask-login/templates/my_master.html
+++ b/examples/auth-flask-login/templates/my_master.html
 {% extends 'admin/base.html' %}
 {% block access_control %}
-{% if current_user.is_authenticated() %}
+{% if current_user.is_authenticated %}
 <div class="btn-group pull-right">
    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
        <i class="icon-user"></i> {{ current_user.login }} <span class="caret"></span>

--- a/examples/auth-mongoengine/app.py
+++ b/examples/auth-mongoengine/app.py
@@ -87,13 +87,13 @@ def init_login():
 # Create customized model view class
 class MyModelView(ModelView):
    def is_accessible(self):
-        return login.current_user.is_authenticated()
+        return login.current_user.is_authenticated
 # Create customized index view class
 class MyAdminIndexView(admin.AdminIndexView):
    def is_accessible(self):
-        return login.current_user.is_authenticated()
+        return login.current_user.is_authenticated
 # Flask views

--- a/examples/auth-mongoengine/requirements.txt
+++ b/examples/auth-mongoengine/requirements.txt
 Flask
 Flask-Admin
 flask-mongoengine
-Flask-Login==0.2.11
+Flask-Login>=0.3.0
--- a/examples/auth-mongoengine/templates/index.html
+++ b/examples/auth-mongoengine/templates/index.html
 <html>
    <body>
        <div>
-            {% if user and user.is_authenticated() %}
+            {% if user and user.is_authenticated %}
                Hello {{ user.login }}! <a href="{{ url_for('logout_view') }}">Logout</a>
            {% else %}
                Welcome anonymous user!

--- a/examples/auth/app.py
+++ b/examples/auth/app.py
@@ -56,7 +56,7 @@ security = Security(app, user_datastore)
 class MyModelView(sqla.ModelView):
    def is_accessible(self):
-        if not current_user.is_active() or not current_user.is_authenticated():
+        if not current_user.is_active or not current_user.is_authenticated:
            return False
        if current_user.has_role('superuser'):
@@ -69,7 +69,7 @@ class MyModelView(sqla.ModelView):
        Override builtin _handle_view in order to redirect users when a view is not accessible.
        """
        if not self.is_accessible():
-            if current_user.is_authenticated():
+            if current_user.is_authenticated:
                # permission denied
                abort(403)
            else:

--- a/examples/auth/requirements.txt
+++ b/examples/auth/requirements.txt
 Flask
 Flask-Admin
 Flask-SQLAlchemy
-Flask-Security==1.7.4
+Flask-Security>=1.7.5
-Flask-Login==0.2.11
--- a/examples/auth/templates/admin/index.html
+++ b/examples/auth/templates/admin/index.html
@@ -11,7 +11,7 @@
            <p>
                This example shows how you can use <a href="https://pythonhosted.org/Flask-Security/index.html" target="_blank">Flask-Security</a> for authentication.
            </p>
-            {% if not current_user.is_authenticated() %}
+            {% if not current_user.is_authenticated %}
            <p>You can register as a regular user, or log in as a superuser with the following credentials:
            <ul>
                <li>email: <b>admin</b></li>

--- a/examples/auth/templates/my_master.html
+++ b/examples/auth/templates/my_master.html
 {% extends 'admin/base.html' %}
 {% block access_control %}
-{% if current_user.is_authenticated() %}
+{% if current_user.is_authenticated %}
 <div class="navbar-text btn-group pull-right">
    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
        <i class="glyphicon glyphicon-user"></i>

--- a/examples/menu-external-links/app.py
+++ b/examples/menu-external-links/app.py
@@ -19,12 +19,12 @@ class User(UserMixin):
 # Create menu links classes with reloaded accessible
 class AuthenticatedMenuLink(MenuLink):
    def is_accessible(self):
-        return current_user.is_authenticated()
+        return current_user.is_authenticated
 class NotAuthenticatedMenuLink(MenuLink):
    def is_accessible(self):
-        return not current_user.is_authenticated()
+        return not current_user.is_authenticated
 # Create custom admin view for authenticated users
@@ -34,7 +34,7 @@ class MyAdminView(BaseView):
        return self.render('authenticated-admin.html')
    def is_accessible(self):
-        return current_user.is_authenticated()
+        return current_user.is_authenticated
 # Create flask app

--- a/examples/menu-external-links/requirements.txt
+++ b/examples/menu-external-links/requirements.txt
 Flask
 Flask-Admin
-Flask-Login==0.2.11
+Flask-Login>=0.3.0
--- a/examples/mongoengine/requirements.txt
+++ b/examples/mongoengine/requirements.txt
 Flask
 Flask-Admin
 Flask-MongoEngine
-Flask-Login==0.2.11
+Flask-Login>=0.3.0