Skip to content

Commit e83e71b

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # flask_authz/casbin_enforcer.py # flask_authz/utils/auth_decoder.py
2 parents 6023f0d + cab0596 commit e83e71b

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

flask_authz/casbin_enforcer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class CasbinEnforcer:
1616

1717
e = None
1818

19-
def __init__(self, app=None, adapter=None, watcher=None):
19+
def __init__(self, app, adapter, watcher=None):
2020
"""
2121
Args:
2222
app (object): Flask App object to get Casbin Model

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ flask>=0.12.2,~=1.1.2
44
itsdangerous==1.1.0
55
jinja2==2.11.2
66
markupsafe==1.1.1
7+
pyjwt==2.0.1
78
simpleeval==0.9.10
89
werkzeug==1.0.1
910
PyJWT==2.0.1

0 commit comments

Comments
 (0)