feat: add mycarehub oauth provider (#207)

.github/workflows/multitenant-staging.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - develop-v2
-      - deploy-multitenant-k8s
 
 env:
   DJANGO_SETTINGS_MODULE: "config.settings.production"

config/settings/base.py

@@ -83,7 +83,6 @@
     "mjml",
     "oauth2_provider",
     "django.contrib.admin",
-    "graphene_django",
     "wagtail.contrib.forms",
     "wagtail.contrib.redirects",
     "wagtail.embeds",
@@ -115,6 +114,7 @@
     "mycarehub.home.apps.HomeConfig",
     "mycarehub.content.apps.ContentConfig",
     "mycarehub.clients.apps.ClientsConfig",
+    "mycarehub.mchprovider",
 ]
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
 
@@ -129,8 +129,9 @@
     "allauth.account.auth_backends.AuthenticationBackend",
 ]
 AUTH_USER_MODEL = "users.User"
-LOGIN_REDIRECT_URL = "users:redirect"
-LOGIN_URL = "account_login"
+
+LOGIN_REDIRECT_URL = "wagtailadmin_home"
+LOGIN_URL = "wagtailadmin_login"
 
 # PASSWORDS
 # ------------------------------------------------------------------------------
@@ -281,20 +282,38 @@
 
 # django-allauth
 # ------------------------------------------------------------------------------
-ACCOUNT_ALLOW_REGISTRATION = env.bool("DJANGO_ACCOUNT_ALLOW_REGISTRATION", True)
+ACCOUNT_ALLOW_REGISTRATION = True
 ACCOUNT_AUTHENTICATION_METHOD = "username"
-ACCOUNT_EMAIL_REQUIRED = True
-ACCOUNT_EMAIL_VERIFICATION = "mandatory"
+ACCOUNT_EMAIL_REQUIRED = False
+ACCOUNT_EMAIL_VERIFICATION = "none"
 ACCOUNT_ADAPTER = "mycarehub.users.adapters.AccountAdapter"
-SOCIALACCOUNT_ADAPTER = "mycarehub.users.adapters.SocialAccountAdapter"
 ACCOUNT_LOGOUT_ON_PASSWORD_CHANGE = True
 ACCOUNT_SESSION_REMEMBER = None  # ask the user 'Remember me'
 ACCOUNT_SIGNUP_EMAIL_ENTER_TWICE = True
 ACCOUNT_SIGNUP_PASSWORD_ENTER_TWICE = True
 ACCOUNT_UNIQUE_EMAIL = True
 ACCOUNT_USERNAME_MIN_LENGTH = 5
+ACCOUNT_DEFAULT_HTTP_PROTOCOL = env.str("DJANGO_ACCOUNT_DEFAULT_HTTP_PROTOCOL", default="https")
+
+SOCIALACCOUNT_ADAPTER = "mycarehub.users.adapters.SocialAccountAdapter"
 SOCIALACCOUNT_AUTO_SIGNUP = True
-ACCOUNT_DEFAULT_HTTP_PROTOCOL = "https"
+SOCIALACCOUNT_EMAIL_VERIFICATION = ACCOUNT_EMAIL_VERIFICATION
+SOCIALACCOUNT_EMAIL_REQUIRED = ACCOUNT_EMAIL_REQUIRED
+SOCIALACCOUNT_LOGIN_ON_GET = False
+SOCIALACCOUNT_PROVIDERS = {
+    "mycarehub": {
+        "APP": {
+            "client_id": env.str("MYCAREHUB_CLIENT_ID", default=""),
+            "secret": env.str("MYCAREHUB_CLIENT_SECRET", default=""),
+        },
+        "VERIFIED_EMAIL": True,
+        "ACCESS_TOKEN_URL": env.str("MYCAREHUB_ACCESS_TOKEN_URL", default=""),
+        "AUTHORIZE_URL": env.str("MYCAREHUB_AUTHORIZE_URL", default=""),
+        "INTROSPECT_URL": env.str("MYCAREHUB_INTROSPECT_URL", default=""),
+    }
+}
+SOCIALACCOUNT_QUERY_EMAIL = False
+SOCIALACCOUNT_STORE_TOKENS = True
 
 # django-compressor
 # ------------------------------------------------------------------------------
@@ -449,7 +468,6 @@
     ],
 )
 
-GRAPHENE = {"SCHEMA": "mycarehub.schema.schema.schema"}
 API_VERSION = "0.0.1"
 
 # debug_toolbar

config/urls.py

@@ -5,7 +5,6 @@
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.urls import include, path, re_path
 from django.views import defaults as default_views
-from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import RedirectView, TemplateView
 from rest_framework.authtoken.views import obtain_auth_token
 from rest_framework.schemas import get_schema_view
@@ -26,8 +25,6 @@
     media_index,
 )
 
-from .graphql_auth import DRFAuthenticatedGraphQLView
-
 urlpatterns = [
     path("sysadmin/", HomeView.as_view(), name="home"),
     re_path(
@@ -43,11 +40,6 @@
     path("users/", include("mycarehub.users.urls", namespace="users")),
     path("accounts/", include("allauth.urls")),
     path("common/", include("mycarehub.common.urls", namespace="common")),
-    path(
-        "graphql",
-        csrf_exempt(DRFAuthenticatedGraphQLView.as_view(graphiql=True)),
-        name="graphql",
-    ),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 if settings.DEBUG:
     # Static file serving when using Gunicorn + Uvicorn for local web socket development

mycarehub/common/tests/test_api.py

@@ -18,9 +18,6 @@
 
 from mycarehub.common.constants import WHITELIST_COUNTIES
 from mycarehub.common.models import Facility, Organisation, Program, UserFacilityAllotment
-from mycarehub.common.serializers import FacilitySerializer
-
-from .test_utils import patch_baker
 
 DIR_PATH = path.join(path.dirname(path.abspath(__file__)))
 MEDIA_PATH = path.join(DIR_PATH, "media")
@@ -87,13 +84,6 @@ def setUp(self):
 
         assert self.client.login(username=username, password="pass123") is True
 
-        self.patch_organisation = partial(
-            patch_baker, values={"organisation": self.global_organisation}
-        )
-        self.org_patcher = self.patch_organisation()
-        self.org_patcher.start()
-        self.addCleanup(self.org_patcher.stop)
-
         headers = self.extra_headers()
         self.client.get = partial(self.client.get, **headers)
         self.client.patch = partial(self.client.patch, **headers)
@@ -375,7 +365,7 @@ def test_delete(self):
         )
         self.assertEqual(
             response.status_code,
-            302,
+            200,
         )
 
 
@@ -542,50 +532,10 @@ def test_delete(self):
         )
         self.assertEqual(
             response.status_code,
-            302,
+            200,
         )
 
 
-class DRFSerializerExcelIOMixinTest(LoggedInMixin, APITestCase):
-    """Test suite for excel io mixin API."""
-
-    def setUp(self) -> None:
-        super().setUp()
-
-        versions = baker.make(Facility, 10, organisation=self.global_organisation)
-        self.data = FacilitySerializer(versions, many=True).data
-
-    def test_dump_data(self) -> None:
-        """Test `dump_data` action."""
-
-        url = reverse("api:facility-dump-data")
-        data = {"dump_fields": ["name", "mfl_code", "county"]}
-        response = self.client.get(url, data=data)
-
-        assert response.status_code == status.HTTP_200_OK
-        assert response["content-disposition"] == "attachment; filename=facilities.xlsx"
-        assert response["content-type"] == "application/xlsx; charset=utf-8"
-
-    def test_get_available_fields(self) -> None:
-        """Test the `get_available_fields` action."""
-
-        url = reverse("api:facility-get-available-fields")
-        response = self.client.get(url)
-
-        assert response.status_code == status.HTTP_200_OK, response.json()
-        assert len(response.data) == 1
-        assert response.data[0]["id"] == "*"
-
-    def test_get_filter_form(self) -> None:
-        """Test the `get_filter_form` action."""
-
-        url = reverse("api:facility-get-filter-form")
-        response = self.client.get(url)
-
-        assert response.status_code == status.HTTP_200_OK
-        assert response["content-type"] == "text/html; charset=utf-8"
-
-
 def test_organisation_registration(user_with_all_permissions, client):
     client.force_login(user_with_all_permissions)
     url = reverse("api:organisations-general")

mycarehub/common/tests/test_models.py

@@ -273,7 +273,7 @@ def test_timezone(self):
         # It is already timezone aware
         assert timezone.is_aware(instance.created)
         created_naive_datetime = datetime.datetime.now()
-        instance.create = created_naive_datetime  # This should not even update
+        instance.created = created_naive_datetime  # This should not even update
         instance.save()
         assert timezone.is_aware(instance.created)
 

mycarehub/common/tests/test_utils.py

@@ -1,8 +1,4 @@
 """Define utilities used in test."""
-from functools import partial
-from unittest.mock import patch
-
-from model_bakery import baker
 
 
 def compare_dict(dict1, dict2):
@@ -25,30 +21,6 @@ def compare_dict(dict1, dict2):
     return True
 
 
-def mock_baker(values):
-    """Create test fixture."""
-    assert isinstance(values, dict), (
-        "Expects " "{field_name, field_value} dict. " f"Found {type(values)}"
-    )
-
-    class _Baker(baker.Baker):
-        fields = values
-
-        def _get_field_names(self):
-            return [each.name for each in self.get_fields()]
-
-        def _make(self, *args, **attrs):
-            for field_name, value in self.fields.items():
-                if field_name in self._get_field_names():
-                    attrs.setdefault(field_name, value)
-            return super()._make(*args, **attrs)
-
-    return _Baker
-
-
-patch_baker = partial(patch, "model_bakery.baker.Baker", new_callable=mock_baker)
-
-
 def make_transitions(obj, transitions, note={}):
     """Change state of organisation."""
     for each in transitions:

mycarehub/common/tests/test_views.py

@@ -2,10 +2,7 @@
 from django.urls import reverse
 from rest_framework import status
 
-from mycarehub.common.models import Facility
-from mycarehub.common.serializers import FacilitySerializer
-from mycarehub.common.views import DRFSerializerExcelIOMixin, HomeView
-from mycarehub.utils.excel_utils import DRFSerializerExcelIO, DRFSerializerExcelIOTemplate
+from mycarehub.common.views import HomeView
 
 pytestmark = pytest.mark.django_db
 
@@ -46,32 +43,3 @@ def test_user_facility_allotment_view(user_with_all_permissions, client):
     url = reverse("common:user_facility_allotments")
     response = client.get(url)
     assert response.status_code == status.HTTP_200_OK
-
-
-def test_drf_excel_io_mixin_get_filter_form(rf, user_with_all_permissions):
-    url = reverse("api:facility-dump-data")
-    request = rf.get(url)
-    request.user = user_with_all_permissions
-    response = DRFSerializerExcelIOMixin.as_view(
-        {"get": "get_filter_form"},
-        excel_io_class=DRFSerializerExcelIO,
-        excel_io_template_class=DRFSerializerExcelIOTemplate,
-        queryset=Facility.objects.mycarehub_facilities(),
-        serializer_class=FacilitySerializer,
-    )(request=request)
-
-    assert response.status_code == status.HTTP_200_OK
-
-
-def test_graphql_view_initialization(user_with_all_permissions, client):
-    client.force_login(user_with_all_permissions)
-    url = reverse("graphql")
-    response = client.post(
-        url,
-        data={"query": "query { hello }"},
-        content_type="application/json",
-        accept="application/json",
-    )
-
-    print(response.content)
-    assert response.status_code == status.HTTP_200_OK

mycarehub/common/views/base_views/drf_base_views.py

@@ -2,20 +2,14 @@
 from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet
 
-from mycarehub.utils.excel_utils import AuditSerializerExcelIO
 
-from ..mixins import AuditSerializerExcelIOMixin
-
-
-class BaseView(ModelViewSet, AuditSerializerExcelIOMixin):
+class BaseView(ModelViewSet):
     """Base class for most application views.
 
     This view's `create` method has been extended to support the creation of
     a single or multiple records.
     """
 
-    excel_io_class = AuditSerializerExcelIO
-
     def create(self, request, *args, **kwargs):
         """Create and persist single or multiple records."""
 

mycarehub/common/views/mixins/__init__.py

@@ -1,10 +1,6 @@
-from .drf_mixins import AuditSerializerExcelIOMixin, DRFSerializerExcelIOMixin, ExcelIOMixin
 from .vanilla_mixins import ApprovedMixin, BaseFormMixin
 
 __all__ = [
     "ApprovedMixin",
-    "AuditSerializerExcelIOMixin",
     "BaseFormMixin",
-    "DRFSerializerExcelIOMixin",
-    "ExcelIOMixin",
 ]