优化登录注册

app/Constants/Device.php

@@ -4,6 +4,9 @@ namespace App\Constants;
 
 class Device
 {
-    public const PC = 'pc';
+    // 商城
     public const UNIAPP = 'uniapp';
+
+    // 商户端
+    public const MERCHANT = 'merchant';
 }

app/Endpoint/Api/Http/Controllers/Auth/LoginController.php

@@ -4,35 +4,61 @@ namespace App\Endpoint\Api\Http\Controllers\Auth;
 
 use App\Constants\Device;
 use App\Endpoint\Api\Http\Controllers\Controller;
-use App\Endpoint\Api\Http\Requests\LoginRequest;
 use App\Exceptions\BizException;
 use App\Models\User;
+use Illuminate\Http\Request;
 
 class LoginController extends Controller
 {
     /**
      * 登录
      *
-     * @param \App\Endpoint\Api\Http\Requests\LoginRequest $request
+     * @param \Illuminate\Http\Request $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function __invoke(LoginRequest $request)
+    public function __invoke(Request $request)
     {
-        $user = User::where('phone', $request->input('phone'))->first();
+        $validated = $request->validate([
+            'phone' => ['bail', 'required', 'string'],
+            'password' => ['bail', 'required', 'string'],
+        ]);
 
-        if (! $user?->verifyPassword($request->input('password'))) {
+        $user = User::where('phone', $validated['phone'])->first();
+
+        if (! $user?->verifyPassword($validated['password'])) {
             throw new BizException(__('Incorrect account or password'));
         }
 
-        $user->update([
+        if ($user->old_password) {
-            'last_login_at' => now(),
+            $user->password = $validated['password'];
-            'last_login_ip' => $request->realIp(),
+            $user->old_password = null;
+        }
+        $user->last_login_at = now();
+        $user->last_login_ip = $request->realIp();
+        $user->save();
+
+        // 获取登录设备
+        $device = $request->header('client-app', Device::UNIAPP);
+
+        switch ($device) {
+            case Device::MERCHANT:
+                // 清理此用户的商户端令牌
+                $user->tokens()->where('name', $device)->delete();
+                // 颁发新的商户端令牌
+                $token = $user->createToken($device);
+                break;
+
+            default:
+                $device = Device::UNIAPP;
+                // 清理此用户的商城端令牌
+                $user->tokens()->where('name', $device)->delete();
+                // 颁发新的商城端令牌
+                $token = $user->createToken($device, ['mall']);
+                break;
+        }
+
+        return response()->json([
+            'token' => $token->plainTextToken,
         ]);
-
-        $user->tokens()->delete();
-
-        return response()->json(
-            $user->createDeviceToken(Device::UNIAPP)
-        );
     }
 }

app/Endpoint/Api/Http/Controllers/Auth/RegisterController.php

@@ -59,9 +59,11 @@ class RegisterController extends Controller
             throw new BizException(__('Registration failed, please try again'));
         }
 
-        return response()->json(
+        $token = $user->createToken(Device::UNIAPP, ['mall']);
-            $user->createDeviceToken(Device::UNIAPP)
+
-        );
+        return response()->json([
+            'token' => $token->plainTextToken,
+        ]);
     }
 
     /**

app/Endpoint/Api/Http/Requests/LoginRequest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Endpoint\Api\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class LoginRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'phone' => ['bail', 'required', 'string'],
-            'password' => ['bail', 'required', 'string'],
-        ];
-    }
-}

app/Endpoint/Api/routes.php

@@ -179,6 +179,7 @@ Route::group([
         'prefix' => 'merchant',
         'middleware' => [
             'guard:api',
+            'ability:merchant',
         ],
     ], function () {
         Route::get('account', [Merchant\UserController::class, 'account']);

app/Http/Kernel.php

@@ -65,5 +65,6 @@ class Kernel extends HttpKernel
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'admin.permissions' => \App\Admin\Middleware\Permissions::class,
+        'ability' => \Laravel\Sanctum\Http\Middleware\CheckForAnyAbility::class,
     ];
 }

app/Models/User.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Constants\Device;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
@@ -12,6 +11,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Foundation\Auth\Access\Authorizable;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
 use Laravel\Sanctum\HasApiTokens;
 
 class User extends Model implements AuthorizableContract, AuthenticatableContract
@@ -330,20 +330,12 @@ class User extends Model implements AuthorizableContract, AuthenticatableContrac
      */
     public function verifyPassword(string $password): bool
     {
-        return $this->password && Hash::check($password, $this->password);
+        // 如果旧密码存在，则校验旧密码
-    }
+        if ($this->old_password) {
+            return $this->old_password === md5($password);
+        }
 
-    /**
+        return $this->password && Hash::check($password, $this->password);
-     * 创建设备授权令牌
-     *
-     * @param string $device
-     * @return array
-     */
-    public function createDeviceToken(string $device = null): array
-    {
-        return [
-            'token' => $this->createToken($device ?: Device::PC)->plainTextToken,
-        ];
     }
 
     /**
@@ -357,24 +349,19 @@ class User extends Model implements AuthorizableContract, AuthenticatableContrac
     {
         $user = static::query()->create($attributes);
 
-        $user->userInfo()->create(
+        // 邀请人的深度
-            $inviter ? [
+        $depth = (int) $inviter?->userInfo?->depth;
-                'inviter_id' => $inviter->id,
+
-                'depth' => $inviter->userInfo->depth + 1,
+        $user->userInfo()->create([
-                'path' => $inviter->userInfo->path.$inviter->id.'/',
+            'inviter_id' => $inviter?->id,
-            ] : [
+            'depth' => $depth + 1,
-                'inviter_id' => null,
+            'path' => Str::finish($inviter?->userInfo?->full_path, '/'),
-                'depth' => 1,
+        ]);
-                'path' => '/',
-            ]
-        );
 
         //初始化钱包
         $user->wallet()->create();
         //初始化余额
         $user->balance()->create();
-        //初始化绑定的银行卡
-        $user->bank()->create();
 
         return $user;
     }

app/Models/UserInfo.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Helpers\Str as StrHelper;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
@@ -126,7 +127,7 @@ class UserInfo extends Model
             // 如果没有邀请码，则自动分配邀请码
             if ($userInfo->code === null) {
                 do {
-                    $userInfo->code = strtolower(Str::randomAlpha(6));
+                    $userInfo->code = strtolower(StrHelper::randomAlpha(6));
                 } while (static::where('code', $userInfo->code)->exists());
             } elseif ($userInfo->isDirty('code')) {
                 $userInfo->code = strtolower($userInfo->code);

database/migrations/2021_12_30_095235_add_name_index_to_personal_access_tokens_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddNameIndexToPersonalAccessTokensTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('personal_access_tokens', function (Blueprint $table) {
+            $table->index('name');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('personal_access_tokens', function (Blueprint $table) {
+            $table->dropIndex(['name']);
+        });
+    }
+}

database/migrations/2021_12_30_152224_add_old_password_to_users_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddOldPasswordToUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('old_password')->nullable()->comment('旧密码');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn(['old_password']);
+        });
+    }
+}