GH-224 Move email address taken fetcher to an util

mdziekon · Jun 11, 2022 · ff6f74c · ff6f74c
1 parent a7a05a7
commit ff6f74c
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/modules/settings/_includes.php b/modules/settings/_includes.php
@@ -9,6 +9,8 @@
     include($includePath . './utils/errorMappers/validatePasswordChange.errorMapper.php');
     include($includePath . './utils/errorMappers/validateEmailChange.errorMapper.php');
 
+    include($includePath . './utils/queries/getUserWithEmailAddress.query.php');
+
     include($includePath . './utils/validators/validatePasswordChange.validator.php');
     include($includePath . './utils/validators/validateEmailChange.validator.php');
 

diff --git a/modules/settings/utils/queries/getUserWithEmailAddress.query.php b/modules/settings/utils/queries/getUserWithEmailAddress.query.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace UniEngine\Engine\Modules\Settings\Utils\Queries;
+
+/**
+ * @param array $params
+ * @param string $params['emailAddress']
+ */
+function getUserWithEmailAddress($params) {
+    $emailAddress = $params['emailAddress'];
+
+    $query = (
+        "SELECT `id` " .
+        "FROM {{table}} " .
+        "WHERE `email` = '{$emailAddress}' " .
+        "LIMIT 1 " .
+        ";"
+    );
+
+    $result = doquery($query, 'users', true);
+
+    return $result;
+}
+
+?>
diff --git a/modules/settings/utils/queries/index.php b/modules/settings/utils/queries/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/modules/settings/utils/validators/validateEmailChange.validator.php b/modules/settings/utils/validators/validateEmailChange.validator.php
@@ -3,6 +3,7 @@
 namespace UniEngine\Engine\Modules\Settings\Utils\Validators;
 
 use UniEngine\Engine\Common\Modules\Uni;
+use UniEngine\Engine\Modules\Settings;
 
 /**
  * @param array $params
@@ -49,11 +50,9 @@ function validateEmailChange($params) {
             ]);
         }
 
-        $fetchExistingEmailFromDB = doquery(
-            "SELECT `id` FROM {{table}} WHERE `email` = '{$newEmailAddress}' LIMIT 1;",
-            'users',
-            true
-        );
+        $fetchExistingEmailFromDB = Settings\Utils\Queries\getUserWithEmailAddress([
+            'emailAddress' => $newEmailAddress,
+        ]);
 
         if ($fetchExistingEmailFromDB) {
             // TODO: Verify whether we should fetch email change processes as well