replace "request account deletion" with "disable" (#612)

Author: simonLeary42

README.md

@@ -156,6 +156,7 @@ rm "$prod" && ln -s "$old" "$prod"
   - `disable_warning_days`: list of day numbers when a user will get an email warning that their account will be disabled
   - `disable_day`: day number when a user will be disabled
   - a "day number" starts counting from the last day that a user logged in, so on day 5, the user last logged in 5 days ago
+- drop the `account_deletion_requests` table
 
 ### 1.5 -> 1.6
 

phpstan.neon

@@ -53,6 +53,7 @@ parameters:
         - '#If condition is always false\.#'
       paths:
         - test/functional/PIBecomeDenyTest.php
+        - test/functional/UserDisableTest.php
         - webroot/panel/pi.php
     # $Subject is written by mail templates
     - messages:

resources/lib/UnityGroup.php

@@ -43,9 +43,6 @@ public function requestGroup(?bool $send_mail_to_admins = null, bool $send_mail
         if ($this->exists() && !$this->getIsDisabled()) {
             return;
         }
-        if ($this->SQL->accDeletionRequestExists($this->getOwner()->uid)) {
-            return;
-        }
         $context = [
             "user" => $this->getOwner()->uid,
             "org" => $this->getOwner()->getOrg(),
@@ -289,9 +286,6 @@ public function newUserRequest(UnityUser $new_user, bool $send_mail = true): voi
             UnityHTTPD::errorLog("warning", "user '$new_user' already requested group membership");
             return;
         }
-        if ($this->SQL->accDeletionRequestExists($new_user->uid)) {
-            throw new Exception("user '$new_user' requested account deletion");
-        }
         $this->addRequest($new_user->uid);
         if ($send_mail) {
             $this->MAILER->sendMail($new_user->getMail(), "group_user_request", [

resources/lib/UnitySQL.php

@@ -5,15 +5,13 @@
 use PDO;
 
 /**
- * @phpstan-type account_deletion_request array{timestamp: string, uid: string}
  * @phpstan-type user_last_login array{operator: string, last_login: string}
  * @phpstan-type request array{request_for: string, uid: string, timestamp: string}
  */
 class UnitySQL
 {
     private const string TABLE_REQS = "requests";
     private const string TABLE_AUDIT_LOG = "audit_log";
-    private const string TABLE_ACCOUNT_DELETION_REQUESTS = "account_deletion_requests";
     private const string TABLE_USER_LAST_LOGINS = "user_last_logins";
     // FIXME this string should be changed to something more intuitive, requires production change
     public const string REQUEST_BECOME_PI = "admin";
@@ -157,45 +155,6 @@ public function addLog(string $action_type, string $recipient): void
         $stmt->execute();
     }
 
-    public function addAccountDeletionRequest(string $uid): void
-    {
-        $stmt = $this->conn->prepare(
-            "INSERT INTO " . self::TABLE_ACCOUNT_DELETION_REQUESTS . " (uid) VALUE (:uid)",
-        );
-        $stmt->bindParam(":uid", $uid);
-        $stmt->execute();
-    }
-
-    public function accDeletionRequestExists(string $uid): bool
-    {
-        $stmt = $this->conn->prepare(
-            "SELECT * FROM " . self::TABLE_ACCOUNT_DELETION_REQUESTS . " WHERE uid=:uid",
-        );
-        $stmt->bindParam(":uid", $uid);
-        $stmt->execute();
-        return count($stmt->fetchAll()) > 0;
-    }
-
-    public function deleteAccountDeletionRequest(string $uid): void
-    {
-        if (!$this->accDeletionRequestExists($uid)) {
-            return;
-        }
-        $stmt = $this->conn->prepare(
-            "DELETE FROM " . self::TABLE_ACCOUNT_DELETION_REQUESTS . " WHERE uid=:uid",
-        );
-        $stmt->bindParam(":uid", $uid);
-        $stmt->execute();
-    }
-
-    /** @return account_deletion_request[] */
-    public function getAllAccountDeletionRequests(): array
-    {
-        $stmt = $this->conn->prepare("SELECT * FROM " . self::TABLE_ACCOUNT_DELETION_REQUESTS);
-        $stmt->execute();
-        return $stmt->fetchAll();
-    }
-
     /** @return user_last_login[] */
     public function getAllUserLastLogins(): array
     {

resources/lib/UnityUser.php

@@ -377,39 +377,6 @@ public function getPIGroupGIDs(): array
         return $this->LDAP->getNonDisabledPIGroupGIDsWithMemberUID($this->uid);
     }
 
-    /**
-     * Sends an email to admins about account deletion request
-     * and also adds it to a table in the database
-     */
-    public function requestAccountDeletion(): void
-    {
-        $this->SQL->deleteRequestsByUser($this->uid);
-        $this->SQL->addAccountDeletionRequest($this->uid);
-        $this->MAILER->sendMail("admin", "account_deletion_request_admin", [
-            "user" => $this->uid,
-            "name" => $this->getFullname(),
-            "email" => $this->getMail(),
-        ]);
-    }
-
-    public function cancelRequestAccountDeletion(): void
-    {
-        $this->SQL->deleteAccountDeletionRequest($this->uid);
-        $this->MAILER->sendMail("admin", "account_deletion_request_cancelled_admin", [
-            "user" => $this->uid,
-            "name" => $this->getFullname(),
-            "email" => $this->getMail(),
-        ]);
-    }
-
-    /**
-     * Checks if the user has requested account deletion
-     */
-    public function hasRequestedAccountDeletion(): bool
-    {
-        return $this->SQL->accDeletionRequestExists($this->uid);
-    }
-
     /**
      * Checks whether a user is in a group or not
      */

resources/mail/account_deletion_request_admin.php

@@ -38,27 +38,4 @@ public function testRequestBecomePi()
             }
         }
     }
-
-    public function testRequestBecomePiUserRequestedAccountDeletion()
-    {
-        global $USER, $SQL;
-        $this->switchUser("Blank");
-        $this->assertNumberPiBecomeRequests(0);
-        try {
-            $USER->requestAccountDeletion();
-            http_post(__DIR__ . "/../../webroot/panel/account.php", [
-                "form_type" => "pi_request",
-                "tos" => "agree",
-                "account_policy" => "agree",
-            ]);
-            $this->assertNumberPiBecomeRequests(0);
-        } finally {
-            if ($SQL->requestExists($USER, UnitySQL::REQUEST_BECOME_PI)) {
-                $SQL->removeRequest($USER->uid, UnitySQL::REQUEST_BECOME_PI);
-            }
-            if ($SQL->accDeletionRequestExists($USER->uid)) {
-                $SQL->deleteAccountDeletionRequest($USER->uid);
-            }
-        }
-    }
 }

resources/mail/account_deletion_request_cancelled_admin.php

@@ -53,9 +53,6 @@ public function testRemoveUser($methodName)
         foreach ($memberUIDs as $uid) {
             if ($uid != $piUid) {
                 $memberToDelete = new UnityUser($uid, $LDAP, $SQL, $MAILER, $WEBHOOK);
-                if ($memberToDelete->hasRequestedAccountDeletion()) {
-                    continue;
-                }
                 break;
             }
         }