Skip to content

Commit

Permalink
black: code reformat
Browse files Browse the repository at this point in the history
  • Loading branch information
@ergo
ergo committed Jun 17, 2018
1 parent 1563cfa commit a86b6b6
Show file tree
Hide file tree
Showing 53 changed files with 3,070 additions and 2,206 deletions.
58 changes: 30 additions & 28 deletions ziggurat_foundations/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,39 @@
from __future__ import unicode_literals
from ziggurat_foundations.utils import ModelProxy, noop # noqa

__version__ = {'major': 0, 'minor': 8, 'patch': 0}
__version__ = {"major": 0, "minor": 8, "patch": 0}


def import_model_service_mappings():
from ziggurat_foundations.models.services.user import UserService
from ziggurat_foundations.models.services.group import GroupService
from ziggurat_foundations.models.services.group_permission import \
from ziggurat_foundations.models.services.group_permission import (
GroupPermissionService
from ziggurat_foundations.models.services.user_permission import \
)
from ziggurat_foundations.models.services.user_permission import (
UserPermissionService
from ziggurat_foundations.models.services.user_resource_permission import \
)
from ziggurat_foundations.models.services.user_resource_permission import (
UserResourcePermissionService
from ziggurat_foundations.models.services.group_resource_permission import GroupResourcePermissionService # noqa
)
from ziggurat_foundations.models.services.group_resource_permission import (
GroupResourcePermissionService
) # noqa
from ziggurat_foundations.models.services.resource import ResourceService
from ziggurat_foundations.models.services.resource_tree import \
ResourceTreeService
from ziggurat_foundations.models.services.external_identity import \
from ziggurat_foundations.models.services.resource_tree import ResourceTreeService
from ziggurat_foundations.models.services.external_identity import (
ExternalIdentityService
)

return {
'User': [UserService],
'Group': [GroupService],
'GroupPermission': [GroupPermissionService],
'UserPermission': [UserPermissionService],
'UserResourcePermission': [
UserResourcePermissionService],
'GroupResourcePermission': [
GroupResourcePermissionService],
'Resource': [ResourceService, ResourceTreeService],
'ExternalIdentity': [ExternalIdentityService]
"User": [UserService],
"Group": [GroupService],
"GroupPermission": [GroupPermissionService],
"UserPermission": [UserPermissionService],
"UserResourcePermission": [UserResourcePermissionService],
"GroupResourcePermission": [GroupResourcePermissionService],
"Resource": [ResourceService, ResourceTreeService],
"ExternalIdentity": [ExternalIdentityService],
}


Expand All @@ -46,12 +49,10 @@ def make_passwordmanager(schemes=None):
:return: CryptContext()
"""
from passlib.context import CryptContext

if not schemes:
schemes = ["pbkdf2_sha256", "bcrypt"]
pwd_context = CryptContext(
schemes=schemes,
deprecated="auto"
)
pwd_context = CryptContext(schemes=schemes, deprecated="auto")
return pwd_context


Expand All @@ -75,12 +76,13 @@ def ziggurat_model_init(*args, **kwargs):
model_service_mapping = import_model_service_mappings()

for cls in args:
if cls.__name__ == 'User':
if kwargs.get('passwordmanager'):
cls.passwordmanager = kwargs['passwordmanager']
if cls.__name__ == "User":
if kwargs.get("passwordmanager"):
cls.passwordmanager = kwargs["passwordmanager"]
else:
cls.passwordmanager = make_passwordmanager(
kwargs.get('passwordmanager_schemes'))
kwargs.get("passwordmanager_schemes")
)

for cls2 in args:
setattr(models, cls2.__name__, cls2)
Expand All @@ -89,5 +91,5 @@ def ziggurat_model_init(*args, **kwargs):
# if model has a manager attached attached the class also to manager
services = model_service_mapping.get(cls.__name__, [])
for service in services:
setattr(service, 'model', cls)
setattr(service, 'models_proxy', models)
setattr(service, "model", cls)
setattr(service, "models_proxy", models)
10 changes: 6 additions & 4 deletions ziggurat_foundations/ext/pyramid/get_user.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,25 @@
from ziggurat_foundations.models.base import get_db_session
from ziggurat_foundations.models.services.user import UserService

CONFIG_KEY = 'ziggurat_foundations'
CONFIG_KEY = "ziggurat_foundations"
log = logging.getLogger(__name__)


def includeme(config):
settings = config.registry.settings

session_provider_callable_config = settings.get(
'%s.session_provider_callable' % CONFIG_KEY)
"%s.session_provider_callable" % CONFIG_KEY
)

if not session_provider_callable_config:

def session_provider_callable(request):
return get_db_session()

test_session_callable = None
else:
parts = session_provider_callable_config.split(':')
parts = session_provider_callable_config.split(":")
_tmp = importlib.import_module(parts[0])
session_provider_callable = getattr(_tmp, parts[1])
test_session_callable = "session exists"
Expand All @@ -42,4 +44,4 @@ def get_user(request):
return UserService.by_id(userid, db_session=db_session)

# add in request.user function
config.set_request_property(get_user, 'user', reify=True)
config.set_request_property(get_user, "user", reify=True)
69 changes: 40 additions & 29 deletions ziggurat_foundations/ext/pyramid/sign_in.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from ziggurat_foundations.models.base import get_db_session
from ziggurat_foundations.models.services.user import UserService

CONFIG_KEY = 'ziggurat_foundations'
CONFIG_KEY = "ziggurat_foundations"
log = logging.getLogger(__name__)


Expand Down Expand Up @@ -42,24 +42,28 @@ def __init__(self, headers):

def includeme(config):
settings = config.registry.settings
sign_in_path = settings.get('%s.sign_in.sign_in_pattern' % CONFIG_KEY,
'/sign_in')
sign_out_path = settings.get('%s.sign_in.sign_out_pattern' % CONFIG_KEY,
'/sign_out')
sign_in_path = settings.get("%s.sign_in.sign_in_pattern" % CONFIG_KEY, "/sign_in")
sign_out_path = settings.get(
"%s.sign_in.sign_out_pattern" % CONFIG_KEY, "/sign_out"
)
session_provider_callable_config = settings.get(
'%s.session_provider_callable' % CONFIG_KEY)
signin_came_from_key = settings.get('%s.sign_in.came_from_key' %
CONFIG_KEY, 'came_from')
signin_username_key = settings.get('%s.sign_in.username_key' %
CONFIG_KEY, 'login')
signin_password_key = settings.get('%s.sign_in.password_key' %
CONFIG_KEY, 'password')
"%s.session_provider_callable" % CONFIG_KEY
)
signin_came_from_key = settings.get(
"%s.sign_in.came_from_key" % CONFIG_KEY, "came_from"
)
signin_username_key = settings.get("%s.sign_in.username_key" % CONFIG_KEY, "login")
signin_password_key = settings.get(
"%s.sign_in.password_key" % CONFIG_KEY, "password"
)

if not session_provider_callable_config:

def session_provider_callable(request):
return get_db_session()

else:
parts = session_provider_callable_config.split(':')
parts = session_provider_callable_config.split(":")
_tmp = importlib.import_module(parts[0])
session_provider_callable = getattr(_tmp, parts[1])

Expand All @@ -68,40 +72,47 @@ def session_provider_callable(request):
session_getter=session_provider_callable,
signin_came_from_key=signin_came_from_key,
signin_username_key=signin_username_key,
signin_password_key=signin_password_key)

config.add_route('ziggurat.routes.sign_in', sign_in_path,
use_global_views=True,
factory=endpoint.sign_in)
config.add_route('ziggurat.routes.sign_out', sign_out_path,
use_global_views=True,
factory=endpoint.sign_out)
signin_password_key=signin_password_key,
)

config.add_route(
"ziggurat.routes.sign_in",
sign_in_path,
use_global_views=True,
factory=endpoint.sign_in,
)
config.add_route(
"ziggurat.routes.sign_out",
sign_out_path,
use_global_views=True,
factory=endpoint.sign_out,
)


class ZigguratSignInProvider(object):

def __init__(self, *args, **kwargs):
for k, v in kwargs.items():
setattr(self, k, v)

def sign_in(self, request):
came_from = request.params.get(self.signin_came_from_key, '/')
came_from = request.params.get(self.signin_came_from_key, "/")
db_session = self.session_getter(request)

user = UserService.by_user_name(
request.params.get(self.signin_username_key),
db_session=db_session)
request.params.get(self.signin_username_key), db_session=db_session
)
if user is None:
# if no result, test to see if email exists
user = UserService.by_email(
request.params.get(self.signin_username_key),
db_session=db_session)
request.params.get(self.signin_username_key), db_session=db_session
)
if user:
password = request.params.get(self.signin_password_key)
if UserService.check_password(user, password):
headers = pyramid.security.remember(request, user.id)
return ZigguratSignInSuccess(headers=headers,
came_from=came_from, user=user)
return ZigguratSignInSuccess(
headers=headers, came_from=came_from, user=user
)
headers = pyramid.security.forget(request)
return ZigguratSignInBadAuth(headers=headers, came_from=came_from)

Expand Down
30 changes: 17 additions & 13 deletions ziggurat_foundations/migrations/env.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@
# from myapp import mymodel
# target_metadata = mymodel.Base.metadata

target_metadata = MetaData(naming_convention={
"ix": 'ix_%(column_0_label)s',
"uq": "uq_%(table_name)s_%(column_0_name)s",
"ck": "ck_%(table_name)s_%(constraint_name)s",
"fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
"pk": "pk_%(table_name)s"
})
target_metadata = MetaData(
naming_convention={
"ix": "ix_%(column_0_label)s",
"uq": "uq_%(table_name)s_%(column_0_name)s",
"ck": "ck_%(table_name)s_%(constraint_name)s",
"fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
"pk": "pk_%(table_name)s",
}
)


def get_url():
Expand All @@ -37,6 +39,7 @@ def get_url():

return url


# target_metadata = None

# other values from the config, defined by the needs of env.py,
Expand All @@ -58,10 +61,11 @@ def run_migrations_offline():
"""
url = get_url()
context.configure(url=url,
version_table='alembic_ziggurat_foundations_version',
transaction_per_migration=True,
)
context.configure(
url=url,
version_table="alembic_ziggurat_foundations_version",
transaction_per_migration=True,
)

with context.begin_transaction():
context.run_migrations()
Expand All @@ -80,8 +84,8 @@ def run_migrations_online():
context.configure(
connection=connection,
target_metadata=target_metadata,
version_table='alembic_ziggurat_foundations_version',
transaction_per_migration=True
version_table="alembic_ziggurat_foundations_version",
transaction_per_migration=True,
)

try:
Expand Down
12 changes: 8 additions & 4 deletions ziggurat_foundations/migrations/versions/13391c68750_add_security_code_date.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,17 @@
from alembic import op

# revision identifiers, used by Alembic.
revision = '13391c68750'
down_revision = '438c27ec1c9'
revision = "13391c68750"
down_revision = "438c27ec1c9"


def upgrade():
op.add_column('users', sa.Column('security_code_date', sa.DateTime(),
server_default='2000-01-01 01:01'))
op.add_column(
"users",
sa.Column(
"security_code_date", sa.DateTime(), server_default="2000-01-01 01:01"
),
)


def downgrade():
Expand Down

0 comments on commit a86b6b6

Please sign in to comment.