Skip to content

Commit

Permalink
Checkin.
Browse files Browse the repository at this point in the history
No-Issue

Signed-off-by: James Tanner <[email protected]>
  • Loading branch information
jctanner committed Sep 7, 2023
1 parent 2cbb456 commit 99c366b
Show file tree
Hide file tree
Showing 10 changed files with 852 additions and 261 deletions.
7 changes: 6 additions & 1 deletion galaxy_ng/app/api/v1/viewsets/namespaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from rest_framework.pagination import PageNumberPagination

from galaxy_ng.app.access_control.access_policy import LegacyAccessPolicy
from galaxy_ng.app.utils.rbac import get_v3_namespace_owners

from galaxy_ng.app.models.auth import User
from galaxy_ng.app.api.v1.models import (
Expand Down Expand Up @@ -100,7 +101,11 @@ class LegacyNamespaceOwnersViewSet(viewsets.GenericViewSet, mixins.ListModelMixi
authentication_classes = GALAXY_AUTHENTICATION_CLASSES

def get_queryset(self):
return get_object_or_404(LegacyNamespace, pk=self.kwargs["pk"]).owners.all()
#return get_object_or_404(LegacyNamespace, pk=self.kwargs["pk"]).owners.all()
ns = get_object_or_404(LegacyNamespace, pk=self.kwargs["pk"])
if ns.namespace:
return get_v3_namespace_owners(ns.namespace)
return []

@extend_schema(
parameters=[LegacyNamespaceOwnerSerializer(many=True)],
Expand Down
21 changes: 14 additions & 7 deletions galaxy_ng/app/dynaconf_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,17 +226,24 @@ def configure_socialauth(settings: Dynaconf) -> Dict[str, Any]:
# are associated to existing users instead of creating
# a whole new randomized username.
data['SOCIAL_AUTH_PIPELINE'] = [
'social_core.pipeline.social_auth.social_details',
'social_core.pipeline.social_auth.social_uid',
'social_core.pipeline.social_auth.auth_allowed',
'social_core.pipeline.social_auth.social_user',
#'social_core.pipeline.social_auth.social_details',
'galaxy_ng.social.pipeline.social_auth.social_details',
#'social_core.pipeline.social_auth.social_uid',
'galaxy_ng.social.pipeline.social_auth.social_uid',
#'social_core.pipeline.social_auth.auth_allowed',
'galaxy_ng.social.pipeline.social_auth.auth_allowed',
#'social_core.pipeline.social_auth.social_user',
'galaxy_ng.social.pipeline.social_auth.social_user',
# 'social_core.pipeline.user.get_username',
'galaxy_ng.social.pipeline.user.get_username',
# 'social_core.pipeline.user.create_user',
'galaxy_ng.social.pipeline.user.create_user',
'social_core.pipeline.social_auth.associate_user',
'social_core.pipeline.social_auth.load_extra_data',
'social_core.pipeline.user.user_details'
#'social_core.pipeline.social_auth.associate_user',
'galaxy_ng.social.pipeline.social_auth.associate_user',
#'social_core.pipeline.social_auth.load_extra_data',
'galaxy_ng.social.pipeline.social_auth.load_extra_data',
#'social_core.pipeline.user.user_details'
'galaxy_ng.social.pipeline.user.user_details'
]

return data
Expand Down
231 changes: 0 additions & 231 deletions galaxy_ng/social/__init__.py

This file was deleted.

1 change: 1 addition & 0 deletions galaxy_ng/social/__init__.py
Loading

0 comments on commit 99c366b

Please sign in to comment.