Merge pull request #561 from colts661/ywang_auth_constraint

Added database constraint on AuthRocket

Author: cassidysymons

microsetta_private_api/api/tests/test_api.py

@@ -900,21 +900,6 @@ def test_accounts_legacies_post_success_empty_already_claimed(self):
         response_obj = json.loads(response.data)
         self.assertEqual(0, len(response_obj))
 
-    def test_accounts_legacies_post_fail_422(self):
-        """Return 422 if info in db somehow prevents claiming legacy"""
-
-        # It is invalid to have one of the auth fields (e.g. sub)
-        # be null while the other is filled.
-        create_dummy_acct(create_dummy_1=True, iss=ACCT_MOCK_ISS,
-                          sub=None)
-
-        # execute accounts/legacies post (claim legacy account)
-        url = '/api/accounts/legacies?%s' % self.default_lang_querystring
-        response = self.client.post(url, headers=MOCK_HEADERS)
-
-        # check response code
-        self.assertEqual(422, response.status_code)
-
     # endregion accounts/legacies post tests
 
 

microsetta_private_api/db/patches/0136.sql

@@ -0,0 +1,8 @@
+-- Add constraint to the ag.account table so that
+-- auth_issuer and auth_sub should either both be null or both be non-null
+ALTER TABLE ag.account
+ADD CONSTRAINT auth_nullable
+CHECK (
+    (auth_issuer IS NULL AND auth_sub IS NULL) OR 
+    (auth_issuer IS NOT NULL AND auth_sub IS NOT NULL)
+);

microsetta_private_api/repo/account_repo.py

@@ -188,6 +188,10 @@ def update_account(self, account):
                     raise RepoException("Cannot claim more than one account")
                 # Unknown exception, re raise it.
                 raise e
+            except psycopg2.errors.CheckViolation:
+                raise RepoException(
+                    "Faulty Authorization Status - Contact Admin"
+                )
 
     def create_account(self, account):
         try:
@@ -215,6 +219,8 @@ def create_account(self, account):
 
             # Unknown exception, re raise it.
             raise e
+        except psycopg2.errors.CheckViolation:
+            raise RepoException("Faulty Authorization Status - Contact Admin")
 
     def delete_account(self, account_id):
         with self._transaction.cursor() as cur:

microsetta_private_api/repo/tests/test_account.py

@@ -4,11 +4,13 @@
 from microsetta_private_api.exceptions import RepoException
 from microsetta_private_api.repo.transaction import Transaction
 from microsetta_private_api.repo.account_repo import AccountRepo
+from microsetta_private_api.model.account import Account
 
 
 ACCOUNT_ID = '607f6723-c704-4b52-bc26-556a9aec85f6'
 BAD_ACCOUNT_ID = 'badbadba-dbad-badb-adba-dbadbadbadba'
 
+AUTH_ACCT_ID = '0004f77e-d3fd-404a-8f5c-3d548a5b0a3f'
 ACCT_ID_1 = '7a98df6a-e4db-40f4-91ec-627ac315d881'
 DUMMY_ACCT_INFO_1 = {
     "address": {
@@ -25,19 +27,21 @@
     "language": "en_US",
     "kit_name": 'jb_qhxqe',
     "consent_privacy_terms": True,
+    "latitude": 32.8798916,
+    "longitude": -117.2363115,
+    "cannot_geocode": False,
     "id": ACCT_ID_1
 }
 ACCT_MOCK_ISS_1 = "MrUnitTest.go"
 ACCT_MOCK_SUB_1 = "NotARealSub"
-RESULT_LAT = 32.882274018668355
-RESULT_LONG = -117.2353976693118
 
 
 class AccountTests(unittest.TestCase):
     def setUp(self):
         with Transaction() as t:
             ar = AccountRepo(t)
             self.untouched = ar.get_account(ACCOUNT_ID)
+            self.untouched_auth = ar.get_account(AUTH_ACCT_ID)
 
     def test_scrub(self):
         with Transaction() as t:
@@ -86,6 +90,71 @@ def test_scrub_no_account(self):
             with self.assertRaises(RepoException):
                 ar.scrub(BAD_ACCOUNT_ID)
 
+    def test_faulty_auth_status_insert(self):
+        # none of the tests commit
+        # success: both non-null
+        with Transaction() as t:
+            ar = AccountRepo(t)
+            acct_1 = Account.from_dict(
+                DUMMY_ACCT_INFO_1,
+                ACCT_MOCK_ISS_1,
+                ACCT_MOCK_SUB_1
+            )
+            self.assertTrue(ar.create_account(acct_1))
+
+        # success: both null
+        with Transaction() as t:
+            ar = AccountRepo(t)
+            acct_2 = Account.from_dict(DUMMY_ACCT_INFO_1, None, None)
+            self.assertTrue(ar.create_account(acct_2))
+
+        # fail: sub null
+        with Transaction() as t:
+            ar = AccountRepo(t)
+            acct_3 = Account.from_dict(
+                DUMMY_ACCT_INFO_1,
+                ACCT_MOCK_ISS_1,
+                None
+            )
+            with self.assertRaises(RepoException):
+                ar.create_account(acct_3)
+
+        # fail: iss null
+        with Transaction() as t:
+            ar = AccountRepo(t)
+            acct_4 = Account.from_dict(
+                DUMMY_ACCT_INFO_1,
+                None,
+                ACCT_MOCK_SUB_1
+            )
+            with self.assertRaises(RepoException):
+                ar.create_account(acct_4)
+
+    def test_faulty_auth_status_update(self):
+        # none of the tests commit
+        # success: both non-null
+        with Transaction() as t:
+            ar = AccountRepo(t)
+            self.untouched_auth.auth_issuer = ACCT_MOCK_ISS_1
+            self.untouched_auth.auth_sub = ACCT_MOCK_SUB_1
+            self.assertTrue(ar.update_account(self.untouched_auth))
+
+        # fail: sub null
+        with Transaction() as t:
+            ar = AccountRepo(t)
+            self.untouched_auth.auth_issuer = ACCT_MOCK_ISS_1
+            self.untouched_auth.auth_sub = None
+            with self.assertRaises(RepoException):
+                ar.update_account(self.untouched_auth)
+
+        # fail: iss null
+        with Transaction() as t:
+            ar = AccountRepo(t)
+            self.untouched_auth.auth_issuer = None
+            self.untouched_auth.auth_sub = ACCT_MOCK_SUB_1
+            with self.assertRaises(RepoException):
+                ar.update_account(self.untouched_auth)
+
 
 if __name__ == '__main__':
     unittest.main()