pr/custom user model

.gitignore

@@ -43,6 +43,7 @@ venv.bak/
 #Visual studio
 .vscode/*
 .vscode
+.theia
 
 #Idea Files
 **/.idea/

BUILD

@@ -13,6 +13,7 @@ buildifier(
 )
 
 REQS = [
+    "django",
     "python-dotenv",
     "social-auth-app-django",
     "social-auth-core",
@@ -23,7 +24,7 @@ REQS = [
     ]
 
 DEPS = [
-    "//covidX/settings:dev",
+    "//covidX:settings",
     "//covidX:urls",
     "//covidX:asgi",
     "//covidX:wsgi",

Dockerfile

@@ -80,11 +80,14 @@ ENV DEBUG_ENV=1
 ENV SECRET_KEY=dskaj343
 ENV CPPFLAGS="$(pg_config --cppflags)"
 ENV LDFLAGS="$(pg_config --ldflags)"
-COPY privateKey.key /privateKey.key
-COPY certificate /certificate
+ENV BAZEL_CACHE="/bazel-cache"
 
 #build
-RUN CPPFLAGS="$(pg_config --cppflags)" LDFLAGS="$(pg_config --ldflags)" bazel build :manage --watchfs --spawn_strategy=standalone --copt --aspects=@bazel_tools//tools/python:srcs_version.bzl%find_requirements --verbose_failures=true --show_timestamps=true --python_version=PY3 --build_python_zip --sandbox_debug --color=yes --curses=yes --jobs=2000 --loading_phase_threads=HOST_CPUS --action_env=LDFLAGS --action_env=CPPFLAGS --action_env=DEBUG_ENV --action_env=SECRET_KEY
+RUN mkdir -p $BAZEL_CACHE
+RUN CPPFLAGS="$(pg_config --cppflags)" LDFLAGS="$(pg_config --ldflags)" bazel build :manage --watchfs --spawn_strategy=standalone --copt --aspects=@bazel_tools//tools/python:srcs_version.bzl%find_requirements --verbose_failures=true --show_timestamps=true --python_version=PY3 --build_python_zip --sandbox_debug --color=yes --curses=yes --jobs=2000 --loading_phase_threads=HOST_CPUS --action_env=LDFLAGS --action_env=CPPFLAGS --action_env=DEBUG_ENV --action_env=SECRET_KEY --action_env=$BAZEL_CACHE --disk_cache=$BAZEL_CACHE
+
+COPY privateKey.key /privateKey.key
+COPY certificate /certificate
 
 COPY pre-start.sh /pre-start.sh
 COPY up-script.sh /up-script.sh

apps/auth_zero/BUILD

@@ -68,6 +68,22 @@ py_library(
     ],
 )
 
+py_test(
+    name = "test",
+    srcs = [
+        "tests.py",
+    ],
+    # TODO(codecakes): include common in deps module once moved to apps/
+    deps = [
+        requirement("django"),
+    ],
+    # TODO(codecakes): include data to include data folder
+    #  that has config/test_config.ini
+    data = [],
+    main = "tests.py",
+    srcs_version = "PY3"
+)
+
 filegroup(
     name = "auth_zero_tmpl",
     srcs = glob([

apps/auth_zero/config/data/test/test_config.ini

@@ -0,0 +1,21 @@
+[DEFAULT]
+PASSWORD = testPass
+EMAIL = [email protected]
+otp_verified = False
+email_verified = False
+
+[fully_unverified]
+USERNAME = fullyUnverifiedUser
+
+[only_otp_verified]
+USERNAME = onlyOTPVerifiedUser
+otp_verified=True
+
+[only_email_verified]
+USERNAME = onlyEmailVerifiedUser
+email_verified=True
+
+[fully_verified]
+USERNAME = fullyVerifiedUser
+otp_verified = True
+email_verified = True

apps/auth_zero/migrations/0004_auto_20201227_1514.py

@@ -0,0 +1,31 @@
+# Generated by Django 3.0.7 on 2020-12-27 15:14
+
+from django.db import migrations, models
+import phonenumber_field.modelfields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("auth_zero", "0003_auto_20201211_1219"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="last_otp",
+            field=models.CharField(max_length=20, null=True),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="mobile",
+            field=phonenumber_field.modelfields.PhoneNumberField(
+                blank=True, max_length=128, region=None
+            ),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="otp_verified",
+            field=models.BooleanField(default=False),
+        ),
+    ]

apps/auth_zero/migrations/0005_user_email_verified.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2020-12-27 16:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("auth_zero", "0004_auto_20201227_1514"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="email_verified",
+            field=models.BooleanField(default=False),
+        ),
+    ]

apps/auth_zero/models.py

@@ -8,6 +8,8 @@
 from django.db import transaction
 from django.db.models import Q
 
+from phonenumber_field.modelfields import PhoneNumberField
+
 UserTypes_T = TypeVar("UserTypes_T", bound="UserTypes")
 User_T = TypeVar("User_T", bound="User")
 AccountTypes_T = TypeVar("AccountTypes_T", bound="AccountType")
@@ -26,10 +28,18 @@ class User(AbstractUser):
     """Custom Auth User model."""
 
     default_user_type = UserTypes.PATIENT
+    mobile = PhoneNumberField(blank=True)
+    last_otp = models.CharField(blank=False, null=True, max_length=20)
+    otp_verified = models.BooleanField(default=False)
+    email_verified = models.BooleanField(default=False)
 
     class Meta:
         app_label = "auth_zero"
 
+    @property
+    def is_verified(self):
+        return self.otp_verified and self.email_verified
+
     @property
     def user_types(self):
         return self.account_types  # pylint: disable=no-member

apps/auth_zero/tests.py

@@ -0,0 +1,33 @@
+from django.contrib.auth import get_user_model
+from django.test import TestCase
+
+from apps.common.config import ConfigFileLoader
+from apps.common.config import CredentialsLoader
+
+
+class UserTestCase(TestCase):
+    def setUp(self):
+        self.user_model = get_user_model()
+        config_file = "apps/auth_zero/config/data/test/test_config.ini"
+        self.creds_obj = CredentialsLoader(config_file, ConfigFileLoader)
+        self.users = {
+            verification_status: self.user_model.objects.create_user(
+                **self.creds_obj.loader_class.read_config(verification_status)
+            )
+            for verification_status in [
+                "fully_unverified",
+                "only_otp_verified",
+                "only_email_verified",
+                "fully_verified",
+            ]
+        }
+
+    def test_fully_unverified_user(self):
+        self.assertFalse(self.users["fully_unverified"].is_verified)
+
+    def test_partially_verfied_users(self):
+        self.assertFalse(self.users["only_otp_verified"].is_verified)
+        self.assertFalse(self.users["only_email_verified"].is_verified)
+
+    def test_fully_verified_user(self):
+        self.assertTrue(self.users["fully_verified"].is_verified)

apps/common/config.py

@@ -0,0 +1,61 @@
+import abc
+from configparser import ConfigParser
+from typing import TypeVar
+
+from django.utils.encoding import force_text
+
+
+class InterfaceConfigLoader(metaclass=abc.ABCMeta):
+    """Enforce abstract interface for class capability."""
+
+    impl_methods = ("read_config",)
+
+    @classmethod
+    def __subclasshook__(cls, subclass: object):
+        """A subclass hooks to methods in impl_methods or NotImplemented."""
+        return all(map(cls.get_implementation, cls.impl_methods)) or NotImplemented
+
+    @staticmethod
+    def get_implementation(subclass, attr_name: str) -> bool:
+        """Fetch an implemented method."""
+        return hasattr(subclass, attr_name)
+
+    @abc.abstractmethod
+    def read_config(self, verification_status: str) -> dict:
+        raise NotImplementedError
+
+
+IConfigLoader_T = TypeVar("IConfigLoader_T", bound=InterfaceConfigLoader)
+
+
+class CredentialsLoader:
+    """Loads credentials from config file using custom loader class"""
+
+    def __init__(
+        self, config_file: str, loader_class: TypeVar("ConfigFileLoader")
+    ) -> IConfigLoader_T:
+        """Initialises custom loader class."""
+        self.__loader_class = loader_class(config_file)
+
+    @property
+    def loader_class(self):
+        return self.__loader_class
+
+
+class ConfigFileLoader(InterfaceConfigLoader):
+    """Loads data from .ini file"""
+
+    def __init__(self, config_file: str):
+        """Initialises ConfigParser instance and reads inputted config file."""
+        self.config = ConfigParser()
+        self.config.read(config_file)
+
+    def read_config(self, verification_status: str) -> dict:
+        config_settings = self.config[verification_status]
+        return dict(
+            username=force_text(config_settings["username"]),
+            password=force_text(config_settings["password"]),
+            email=force_text(config_settings["email"]),
+            otp_verified=config_settings.getboolean("otp_verified"),
+            email_verified=config_settings.getboolean("email_verified"),
+        )

covidX/BUILD

@@ -15,28 +15,11 @@ py_library(
 
 py_library(
     name = "settings",
-    srcs = ["settings.py"],
+    srcs = [
+        "//covidX/settings:base",
+        "//covidX/settings:dev",
+    ],
     deps = [
-        requirement("django-extensions"),
-        requirement("social-auth-core"),
-        requirement("social-auth-app-django"),
-        requirement("graphene-django"),
-        requirement("django-guardian"),
-        requirement("djangorestframework"),
-        requirement("drf-jwt"),
-        requirement("django-debug-toolbar"),
-        ":gae_settings",
-        ":schema",
-        ":utils",
-        "//apps/apihealth:__init__",
-        "//apps/apihealth:apps",
-        "//apps/hrm:__init__",
-        "//apps/hrm:apps",
-        "//apps/hrm:models",
-        "//apps/auth_zero:__init__",
-        "//apps/auth_zero:apps",
-        "//apps/auth_zero:models",
-        "//apps/auth_zero:auth0backend",
         "//:__init__",
     ],
     srcs_version="PY3",

covidX/settings/BUILD

@@ -34,6 +34,7 @@ py_library(
     ],
     srcs_version="PY3",
     data = ["//:static",],
+    visibility=["//visibility:public"],
 )
 
 py_library(
@@ -43,4 +44,5 @@ py_library(
         ":base",
     ],
     srcs_version="PY3",
+    visibility=["//visibility:public"],
 )

covidX/settings/dev.py

@@ -1,3 +1,4 @@
+# pylint:disable=E0611
 from covidX.settings.base import *
 
 CONFIG_FILE = "apps/auth_zero/config/test_config.ini"

docker-compose.yml

@@ -43,6 +43,7 @@ services:
       - redis
     volumes:
       - ./django-api:/app
+      - ./bazel-cache:/bazel-cache
     hostname: django-api
     env_file: .env
     environment:
@@ -53,5 +54,6 @@ services:
 
 volumes:
   django-api:
+  bazel-cache:
   pgdata:
   redisdata:

up-script.sh

@@ -1,4 +1,4 @@
 echo "=====migrate & runserver_plus====="
-CPPFLAGS="$(pg_config --cppflags)" LDFLAGS="$(pg_config --ldflags)" bazel run :manage --watchfs --spawn_strategy=standalone --copt --aspects=@bazel_tools//tools/python:srcs_version.bzl%find_requirements --verbose_failures=true --show_timestamps=true --python_version=PY3 --build_python_zip --sandbox_debug --color=yes --curses=yes --jobs=2000 --loading_phase_threads=HOST_CPUS --action_env=LDFLAGS --action_env=CPPFLAGS --action_env=DEBUG_ENV --action_env=SECRET_KEY -- collectstatic --noinput
-CPPFLAGS="$(pg_config --cppflags)" LDFLAGS="$(pg_config --ldflags)" bazel run :manage --watchfs --spawn_strategy=standalone --copt --aspects=@bazel_tools//tools/python:srcs_version.bzl%find_requirements --verbose_failures=true --show_timestamps=true --python_version=PY3 --build_python_zip --sandbox_debug --color=yes --curses=yes --jobs=2000 --loading_phase_threads=HOST_CPUS --action_env=LDFLAGS --action_env=CPPFLAGS --action_env=DEBUG_ENV --action_env=SECRET_KEY -- migrate;
-CPPFLAGS="$(pg_config --cppflags)" LDFLAGS="$(pg_config --ldflags)" bazel run :manage --watchfs --spawn_strategy=standalone --copt --aspects=@bazel_tools//tools/python:srcs_version.bzl%find_requirements --verbose_failures=true --show_timestamps=true --python_version=PY3 --build_python_zip --sandbox_debug --color=yes --curses=yes --jobs=2000 --loading_phase_threads=HOST_CPUS --action_env=LDFLAGS --action_env=CPPFLAGS --action_env=DEBUG_ENV --action_env=SECRET_KEY -- runserver_plus --cert-file ./certificate 0.0.0.0:8000;
+CPPFLAGS="$(pg_config --cppflags)" LDFLAGS="$(pg_config --ldflags)" bazel run :manage --watchfs --spawn_strategy=standalone --copt --aspects=@bazel_tools//tools/python:srcs_version.bzl%find_requirements --verbose_failures=true --show_timestamps=true --python_version=PY3 --build_python_zip --sandbox_debug --color=yes --curses=yes --jobs=2000 --loading_phase_threads=HOST_CPUS --action_env=LDFLAGS --action_env=CPPFLAGS --action_env=DEBUG_ENV --action_env=SECRET_KEY --action_env=BAZEL_CACHE --disk_cache="$BAZEL_CACHE" -- collectstatic --noinput
+CPPFLAGS="$(pg_config --cppflags)" LDFLAGS="$(pg_config --ldflags)" bazel run :manage --watchfs --spawn_strategy=standalone --copt --aspects=@bazel_tools//tools/python:srcs_version.bzl%find_requirements --verbose_failures=true --show_timestamps=true --python_version=PY3 --build_python_zip --sandbox_debug --color=yes --curses=yes --jobs=2000 --loading_phase_threads=HOST_CPUS --action_env=LDFLAGS --action_env=CPPFLAGS --action_env=DEBUG_ENV --action_env=SECRET_KEY --action_env=BAZEL_CACHE --disk_cache="$BAZEL_CACHE" -- migrate;
+CPPFLAGS="$(pg_config --cppflags)" LDFLAGS="$(pg_config --ldflags)" bazel run :manage --watchfs --spawn_strategy=standalone --copt --aspects=@bazel_tools//tools/python:srcs_version.bzl%find_requirements --verbose_failures=true --show_timestamps=true --python_version=PY3 --build_python_zip --sandbox_debug --color=yes --curses=yes --jobs=2000 --loading_phase_threads=HOST_CPUS --action_env=LDFLAGS --action_env=CPPFLAGS --action_env=DEBUG_ENV --action_env=SECRET_KEY --action_env=BAZEL_CACHE --disk_cache="$BAZEL_CACHE" -- runserver_plus --cert-file ./certificate 0.0.0.0:8000;