Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Made AuthMembership, Group, permission customizable through Auth #466

Merged
merged 4 commits into from
Aug 20, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion emmett/tools/auth/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from .apis import Auth
from .models import AuthUser
from .models import AuthUser, AuthMembership, AuthGroup, AuthPermission
4 changes: 2 additions & 2 deletions emmett/tools/auth/apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@


class Auth:
def __init__(self, app, db, user_model=None):
def __init__(self, app, db, user_model=None, membership_model=None, group_model=None, permission_model=None):
SvenKeimpema marked this conversation as resolved.
Show resolved Hide resolved
self.ext = app.use_extension(AuthExtension)
self.ext.bind_auth(self)
self.ext.use_database(db, user_model)
self.ext.use_database(db, user_model, membership_model, group_model, permission_model)
self.ext.init_forms()
self.pipe = AuthPipe(self)

Expand Down
18 changes: 12 additions & 6 deletions emmett/tools/auth/ext.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,19 @@ def _inject_pipe(self):
if self.config.inject_pipe:
self.app.pipeline.append(self.auth.pipe)

def use_database(self, db, user_model=None):
def _set_model_config(self, config_name, model):
if model:
if issubclass(model, AuthModel) or issubclass(model, TimestampedModel):
self.config.models[config_name] = model
else:
raise RuntimeError(f'{user_model.__name__} is an invalid user model')
SvenKeimpema marked this conversation as resolved.
Show resolved Hide resolved

def use_database(self, db, user_model=None, membership_model=None, group_model=None, permission_model=None):
self.db = db
if user_model:
if not issubclass(user_model, AuthModel):
raise RuntimeError(
'%s is an invalid user model' % user_model.__name__)
self.config.models['user'] = user_model
self._set_model_config("user", user_model)
self._set_model_config("membership", membership_model)
self._set_model_config("group", group_model)
self._set_model_config("permission", permission_model)
self.define_models()

def __set_models_labels(self):
Expand Down