Merge pull request #1516 from younginnovations/recover-email-changes

Review: recover-email-changes

.gitignore

@@ -1,6 +1,8 @@
 /node_modules
 /public/hot
 /public/storage
+/public/css
+/public/js
 /storage/*.key
 /vendor
 .env

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -5,6 +5,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\IATI\Models\User\User;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Auth\Events\PasswordReset;
 use Illuminate\Foundation\Auth\ResetsPasswords;
@@ -136,6 +137,10 @@ protected function resetPassword($user, $password)
 
         $user->save();
 
+        if (!$user->email_verified_at) {
+            User::resendEmail($user);
+        }
+
         event(new PasswordReset($user));
     }
 }

app/IATI/Repositories/User/UserRepository.php

@@ -189,7 +189,8 @@ public function filterUsers($query, $queryParams): Builder
         if (array_key_exists('q', $queryParams)) {
             $query = $query->where(function ($query) use ($queryParams) {
                 $query->where('username', 'ilike', '%' . Arr::get($queryParams, 'q') . '%')
-                    ->orWhere('full_name', 'ilike', '%' . Arr::get($queryParams, 'q') . '%');
+                    ->orWhere('full_name', 'ilike', '%' . Arr::get($queryParams, 'q') . '%')
+                    ->orWhere('email', 'ilike', '%' . Arr::get($queryParams, 'q') . '%');
             });
         }
 

database/migrations/2024_07_22_091222_update_email_collation_in_users_table.php

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Constants\DBTables;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+/*
+ * Change source: https://github.com/younginnovations/iatipublisher/issues/1491
+ */
+return new class extends Migration {
+    /**
+     * Making email field case-insensitive by:
+     * 1. Creating citext extension. Citext datatype makes string values case-insensitive on db level.
+     * 2. Change email field type to citext.
+     * 3. Refresh unique constraint in email field.
+     *
+     * @return void
+     */
+    public function up(): void
+    {
+        DB::statement('CREATE EXTENSION IF NOT EXISTS citext;');
+
+        DB::statement('ALTER TABLE ' . DBTables::USERS . ' ALTER COLUMN email TYPE citext USING email::citext;');
+
+        $uniqueConstraintExists = DB::select(
+            "
+            SELECT constraint_name
+            FROM information_schema.table_constraints
+            WHERE table_name = '" . DBTables::USERS . "'
+            AND constraint_type = 'UNIQUE'
+            AND constraint_name = 'users_email_unique'"
+        );
+
+        if (empty($uniqueConstraintExists)) {
+            Schema::table(DBTables::USERS, function (Blueprint $table) {
+                $table->unique('email');
+            });
+        }
+    }
+
+    /**
+     * Reverse the migration.
+     * Basically
+     * 1. Drop unique constraint.
+     * 2. Change email field type to varchar.
+     * 3. Add unique constraint again.
+     *
+     * @return void
+     */
+    public function down(): void
+    {
+        Schema::table(DBTables::USERS, function (Blueprint $table) {
+            $table->dropUnique('users_email_unique');
+        });
+
+        DB::statement('ALTER TABLE ' . DBTables::USERS . ' ALTER COLUMN email TYPE varchar USING email::varchar;');
+
+        Schema::table(DBTables::USERS, function (Blueprint $table) {
+            $table->unique('email');
+        });
+    }
+};

tests/Feature/AuthenticationTest.php

@@ -107,4 +107,19 @@ public function test_successful_login_with_email_and_password(): void
 
         $response->assertRedirect('/activities');
     }
+
+    public function test_successful_login_with_different_email_case(): void
+    {
+        $role = Role::factory()->create();
+        $org = Organization::factory()->has(User::factory(['role_id' => $role->id]))->create();
+
+        $uppercasedEmail = strtoupper($org->user->email);
+
+        $response = $this->post('/login', [
+            'emailOrUsername' => $uppercasedEmail,
+            'password' => encryptString('password'),
+        ]);
+
+        $response->assertRedirect('/activities');
+    }
 }