feat: username in jetstream (#34)

* feat: username in jetstream
* feat: mary ui template
* fix: psalm
* fix: tests
* fix: ignore test
* chore: run pint

Author: lightszentip

.env.testing

@@ -0,0 +1,64 @@
+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=base64:bihmw9M/GyC73y3gQjA5hmQQg+Rq3AoHgqojUZeSUoA=
+APP_DEBUG=true
+APP_TIMEZONE=UTC
+APP_URL=
+
+APP_LOCALE=en
+APP_FALLBACK_LOCALE=en
+APP_FAKER_LOCALE=en_US
+
+APP_MAINTENANCE_DRIVER=file
+# APP_MAINTENANCE_STORE=database
+
+BCRYPT_ROUNDS=12
+
+LOG_CHANNEL=stack
+LOG_STACK=single
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
+
+DB_CONNECTION=sqlite
+# DB_HOST=127.0.0.1
+# DB_PORT=3306
+DB_DATABASE=:memory:
+# DB_USERNAME=root
+# DB_PASSWORD=
+
+SESSION_DRIVER=database
+SESSION_LIFETIME=120
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null
+
+BROADCAST_CONNECTION=log
+FILESYSTEM_DISK=local
+QUEUE_CONNECTION=database
+
+CACHE_STORE=database
+CACHE_PREFIX=
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_CLIENT=phpredis
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=log
+MAIL_HOST=127.0.0.1
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS="[email protected]"
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
+
+VITE_APP_NAME="${APP_NAME}"

.github/workflows/psalm.yml

@@ -9,6 +9,10 @@ on:
 jobs:
   psalm:
     runs-on: ${{ matrix.operating-system }}
+    permissions:
+        contents: write
+        packages: write
+        actions: write
     strategy:
       fail-fast: false
       matrix:
@@ -20,8 +24,10 @@ jobs:
       - uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: mbstring, intl
+          extensions: mbstring, intl, , :php-psr
           ini-values: post_max_size=256M, max_execution_time=180
           coverage: xdebug
-      - uses: php-actions/composer@8a65f0d3c6a1d17ca4800491a40b5756a4c164f3 # v6 # or alternative dependency management
-      - run: ./vendor/bin/psalm
+
+      - name: Composer install
+        run: composer install --optimize-autoloader --prefer-dist
+      - run: php ./vendor/bin/psalm --threads=2 --output-format=github --report=results.sarif

app/Actions/Fortify/CreateNewUser.php

@@ -7,6 +7,7 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
 use Laravel\Fortify\Contracts\CreatesNewUsers;
 use Laravel\Jetstream\Jetstream;
 
@@ -18,12 +19,15 @@ class CreateNewUser implements CreatesNewUsers
      * Create a newly registered user.
      *
      * @param  array<string, string>  $input
+     *
+     * @throws ValidationException
      */
     public function create(array $input): User
     {
         Validator::make($input, [
             'name' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
+            'username' => ['required', 'string', 'max:255', 'unique:users'],
             'password' => $this->passwordRules(),
             'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature() ? ['accepted', 'required'] : '',
         ])->validate();
@@ -32,6 +36,7 @@ public function create(array $input): User
             return tap(User::create([
                 'name' => $input['name'],
                 'email' => $input['email'],
+                'username' => $input['username'],
                 'password' => Hash::make($input['password']),
             ]), function (User $user) {
                 $this->createTeam($user);

app/Actions/Fortify/UpdateUserPassword.php

@@ -5,6 +5,7 @@
 use App\Models\User;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
 use Laravel\Fortify\Contracts\UpdatesUserPasswords;
 
 class UpdateUserPassword implements UpdatesUserPasswords
@@ -15,6 +16,8 @@ class UpdateUserPassword implements UpdatesUserPasswords
      * Validate and update the user's password.
      *
      * @param  array<string, string>  $input
+     *
+     * @throws ValidationException
      */
     public function update(User $user, array $input): void
     {

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -14,6 +14,7 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
      * Validate and update the given user's profile information.
      *
      * @param  array<string, mixed>  $input
+     *
      * @SuppressWarnings(PHPMD.ElseExpression)
      */
     public function update(User $user, array $input): void

app/Models/Team.php

@@ -11,6 +11,8 @@
 
 /**
  * @psalm-suppress all
+ *
+ * @method static forceCreate(array $array)
  */
 class Team extends JetstreamTeam
 {

app/Models/User.php

@@ -13,7 +13,12 @@
 
 /**
  * @property mixed $id
+ * @property mixed $name
+ *
  * @psalm-suppress all
+ *
+ * @method static where(string $string, mixed $identity)
+ * @method static create(array $array)
  */
 class User extends Authenticatable
 {
@@ -33,6 +38,7 @@ class User extends Authenticatable
         'name',
         'email',
         'password',
+        'username',
     ];
 
     /**

app/Policies/TeamPolicy.php

@@ -5,6 +5,7 @@
 use App\Models\Team;
 use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
+
 /**
  * @SuppressWarnings(PHPMD.UnusedFormalParameter)
  */

app/Providers/FortifyServiceProvider.php

@@ -6,8 +6,10 @@
 use App\Actions\Fortify\ResetUserPassword;
 use App\Actions\Fortify\UpdateUserPassword;
 use App\Actions\Fortify\UpdateUserProfileInformation;
+use App\Models\User;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
@@ -45,5 +47,14 @@ public function boot(): void
         RateLimiter::for('two-factor', function (Request $request) {
             return Limit::perMinute(5)->by($request->session()->get('login.id'));
         });
+
+        Fortify::authenticateUsing(function (Request $request) {
+            $user = User::where('email', $request->identity)
+                ->orWhere('username', $request->identity)->first();
+            if ($user && Hash::check($request->password, $user->password)
+            ) {
+                return $user;
+            }
+        });
     }
 }

composer.json

@@ -57,9 +57,10 @@
 
 
     "scripts": {
+        "psalm": "vendor/bin/psalm --config=psalm.xml",
         "larastan": "vendor/bin/phpstan analyse --memory-limit=2G app tests",
         "pint": "vendor/bin/pint",
-        "test:pest": "vendor/bin/pest --parallel",
+        "test:pest": "vendor/bin/pest --parallel --compact",
         "test:phpstan": "vendor/bin/phpstan analyse",
         "test": [
             "@test:pest",