Merge pull request #13 from Jeroendevr/master

Update to newer dash version

Author: gaw89

.gitignore

@@ -1,3 +1,5 @@
 *egg-info
 *pyc
 dist
+build/
+.DS_Store

README.md

@@ -5,7 +5,9 @@
 
 Dash-Admin is intended to be plug and play!  Providing user authentication should be as simple as:
 
+```
 auth = FlaskLoginAuth(dash_app)
+```
 
 ### Documentation
 

dash_flask_login/flask_login_auth.py

@@ -149,7 +149,7 @@ def __protect_views(self):
         """
         for app in self.apps_list:
             for view_func in self.server.view_functions:
-                if view_func.startswith(app.url_base_pathname):
+                if view_func.startswith(app.config.url_base_pathname):
                     self.server.view_functions[view_func] = login_required(self.server.view_functions[view_func])
 
     def serve_default_views(self):

dash_flask_login/version.py

@@ -1 +1 @@
-__version__ = '0.0.5'
+__version__ = '0.0.6'

pyproject.toml

@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"

requirements.txt

@@ -0,0 +1,2 @@
+dash>=2.0.0
+flask-login>=0.5.0

setup.cfg

@@ -1,2 +1,24 @@
-[bdist_wheel]
-universal=1
+[metadata]
+    name=dash_flask_login
+    version=__version__ # noqa: F821
+    author=Jeroen de Vries
+    author_email=jeroendevries@runbox.eu
+    description=Integration of Dash with Flask-Login
+    long_description= file: README.md
+    url = https://github.com/Jeroendevr/dash-flask-login
+    classifiers =
+        Intended Audience :: Developers
+        Topic :: Utilities
+        Natural Language :: English
+        Operating System :: OS Independent
+        License :: OSI Approved :: MIT License
+        Programming Language :: Python :: 3
+
+[options]
+    package_dir = 
+        = dash_flask_login
+    packages = find:
+    python_requires = >=3.9
+    
+[options.packages.find]
+    where = dash_flask_login

setup.py

@@ -6,10 +6,7 @@
 from dash.dependencies import Input, Output, State
 from dash import Dash
 from dash_flask_login import FlaskLoginAuth
-import sqlite3
-import hashlib
 from flask_login import UserMixin
-import pprint
 
 class FlaskLoginAuthTest(unittest.TestCase):
     # Test FlaskLoginAuth functionality
@@ -22,17 +19,17 @@ def setUp(self):
             SECRET_KEY = os.urandom(12),
         )
 
-        self.app = Dash(name='app1', url_base_pathname='/app1', server=server)
+        self.app = Dash(name='app1', url_base_pathname='/app1/', server=server)
         self.app.layout = html.Div('Hello World!')
 
-        self.add_auth_app = Dash(name='add_auth_app', url_base_pathname='/add-auth-app', server=server)
+        self.add_auth_app = Dash(name='add_auth_app', url_base_pathname='/add-auth-app/', server=server)
         self.add_auth_app.layout = html.Div('Hello World!')
 
-        self.multi_app_no_auth = Dash(name='multi_app_no_auth', url_base_pathname='/app-no-auth', server=server)
+        self.multi_app_no_auth = Dash(name='multi_app_no_auth', url_base_pathname='/app-no-auth/', server=server)
         self.multi_app_no_auth.layout = html.Div('Hello World!')
 
         # Will raise an error because it doesn't have the same server
-        self.crash_app = Dash(name='crash', url_base_pathname='/crash-app')
+        self.crash_app = Dash(name='crash', url_base_pathname='/crash-app/')
         self.crash_app.layout = html.Div('Goodby Cruel World!')
 
         self.server = server.test_client()
@@ -56,23 +53,23 @@ def login_logout(self, username, password):
         response = self.server.get('/logout',)
         self.assertEqual(response.status_code, 302, 'Not logged in yet, server should redirect.')
 
-        response = self.server.get('/app1',)
+        response = self.server.get('/app1/',)
         self.assertEqual(response.status_code, 302, 'Not logged in yet, server should redirect.')
 
         self.login_user(username, password)
 
-        response = self.server.get('/app1',)
+        response = self.server.get('/app1/',)
         self.assertEqual(response.status_code, 200, 'Logged in, should be 200 Okay')
 
         response = self.server.get('/logout',)
         self.assertEqual(response.status_code, 200, 'Logged in, should be 200 Okay')
 
         # Check that logout has worked
-        response = self.server.get('/app1',)
+        response = self.server.get('/app1/',)
         self.assertEqual(response.status_code, 302, 'If logged out successfully, server should redirect.')
 
     def test_app_no_auth(self):
-        response = self.server.get('/app1', follow_redirects=True)
+        response = self.server.get('/app1/', follow_redirects=True)
         self.assertEqual(response.status_code, 200)
         self.assertTrue('<title>Dash</title>' in response.data)
 
@@ -157,7 +154,7 @@ def test_multi_app_no_auth_second_app(self):
 
         auth = FlaskLoginAuth(self.app, use_default_views=True)
 
-        response = self.server.get('/app-no-auth')
+        response = self.server.get('/app-no-auth/')
         self.assertEqual(response.status_code, 200)
 
     def test_multi_app_second_app_with_auth(self):
@@ -166,17 +163,17 @@ def test_multi_app_second_app_with_auth(self):
         auth.add_app(self.add_auth_app)
 
         # Not logged in yet
-        response = self.server.get('/add-auth-app')
+        response = self.server.get('/add-auth-app/')
         self.assertEqual(response.status_code, 302)
 
         # Does not require login
-        response = self.server.get('/app-no-auth')
+        response = self.server.get('/app-no-auth/')
         self.assertEqual(response.status_code, 200)
 
         self.login_user('admin','admin')
 
         # Logged in
-        response = self.server.get('/add-auth-app')
+        response = self.server.get('/add-auth-app/')
         self.assertEqual(response.status_code, 200)