Merge pull request #84 from offen/retired-accounts

Enable retiring of accounts

accounts/accounts/models.py

@@ -11,7 +11,7 @@ class Account(db.Model):
     __tablename__ = "accounts"
     account_id = db.Column(db.String(36), primary_key=True, default=generate_key)
     name = db.Column(db.Text, nullable=False)
-    users = db.relationship("AccountUserAssociation", back_populates="account")
+    users = db.relationship("AccountUserAssociation", back_populates="account", cascade="delete")
 
     def __repr__(self):
         return self.name

accounts/accounts/views.py

@@ -20,7 +20,7 @@ class RemoteServerException(Exception):
         )
 
 
-def create_remote_account(name, account_id):
+def _call_remote_server(account_id, method):
     # expires in 30 seconds as this will mean the HTTP request would have
     # timed out anyways
     expiry = datetime.utcnow() + timedelta(seconds=30)
@@ -30,9 +30,18 @@ def create_remote_account(name, account_id):
         algorithm="RS256",
     ).decode("utf-8")
 
-    r = requests.post(
+    do_request = None
+    if method == "POST":
+        do_request = requests.post
+    elif method == "DELETE":
+        do_request = requests.delete
+
+    if not do_request:
+        raise Exception("Received unsupported method {}, cannot continue.".format(method))
+
+    r = do_request(
         "{}/accounts".format(app.config["SERVER_HOST"]),
-        json={"name": name, "accountId": account_id},
+        json={"accountId": account_id},
         headers={"X-RPC-Authentication": encoded},
     )
 
@@ -43,6 +52,14 @@ def create_remote_account(name, account_id):
         raise remote_err
 
 
+def create_remote_account(account_id):
+    return _call_remote_server(account_id, "POST")
+
+
+def retire_remote_account(account_id):
+    return _call_remote_server(account_id, "DELETE")
+
+
 class AccountForm(Form):
     name = StringField(
         "Account Name",
@@ -59,12 +76,15 @@ class AccountView(ModelView):
     def after_model_change(self, form, model, is_created):
         if is_created:
             try:
-                create_remote_account(model.name, model.account_id)
+                create_remote_account(model.account_id)
             except RemoteServerException as server_error:
                 db.session.delete(model)
                 db.session.commit()
                 raise server_error
 
+    def after_model_delete(self, model):
+        retire_remote_account(model.account_id)
+
 
 class UserView(ModelView):
     inline_models = [(AccountUserAssociation, dict(form_columns=["id", "account"]))]