From 58987edd125a8d841123f05336f9c75c4dae8718 Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Fri, 27 Jul 2018 01:50:55 +0800
Subject: [PATCH] Update User model

---
 app/Models/User.php                     |  1 +
 database/factories/UserModelFactory.php | 28 +++++++++++++++++++++----
 tests/AdminControllerTest.php           |  4 +++-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index c129fafe..6289d8d0 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -47,6 +47,7 @@ class User extends Model
         'score' => 'integer',
         'avatar' => 'integer',
         'permission' => 'integer',
+        'verified' => 'bool',
     ];
 
     /**
diff --git a/database/factories/UserModelFactory.php b/database/factories/UserModelFactory.php
index 8359104b..d2bb8ff9 100644
--- a/database/factories/UserModelFactory.php
+++ b/database/factories/UserModelFactory.php
@@ -12,7 +12,24 @@ $factory->define(User::class, function (Faker\Generator $faker) {
         'ip' => '127.0.0.1',
         'permission' => 0,
         'last_sign_at' => $faker->dateTime,
-        'register_at' => $faker->dateTime
+        'register_at' => $faker->dateTime,
+        'verified' => 1
+    ];
+});
+
+$factory->defineAs(User::class, 'unverified', function (Faker\Generator $faker) {
+    return [
+        'email' => $faker->email,
+        'nickname' => $faker->name,
+        'score' => 1000,
+        'avatar' => 0,
+        'password' => app('cipher')->hash(str_random(10), config('secure.salt')),
+        'ip' => '127.0.0.1',
+        'permission' => 1,
+        'last_sign_at' => $faker->dateTime,
+        'register_at' => $faker->dateTime,
+        'verified' => 0,
+        'verification_token' => hash_hmac('sha256', str_random(40), 'key')
     ];
 });
 
@@ -26,7 +43,8 @@ $factory->defineAs(User::class, 'admin', function (Faker\Generator $faker) {
         'ip' => '127.0.0.1',
         'permission' => 1,
         'last_sign_at' => $faker->dateTime,
-        'register_at' => $faker->dateTime
+        'register_at' => $faker->dateTime,
+        'verified' => 1
     ];
 });
 
@@ -40,7 +58,8 @@ $factory->defineAs(User::class, 'superAdmin', function (Faker\Generator $faker)
         'ip' => '127.0.0.1',
         'permission' => 2,
         'last_sign_at' => $faker->dateTime,
-        'register_at' => $faker->dateTime
+        'register_at' => $faker->dateTime,
+        'verified' => 1
     ];
 });
 
@@ -54,6 +73,7 @@ $factory->defineAs(User::class, 'banned', function (Faker\Generator $faker) {
         'ip' => '127.0.0.1',
         'permission' => -1,
         'last_sign_at' => $faker->dateTime,
-        'register_at' => $faker->dateTime
+        'register_at' => $faker->dateTime,
+        'verified' => 1
     ];
 });
diff --git a/tests/AdminControllerTest.php b/tests/AdminControllerTest.php
index 00e01b1b..7d786088 100644
--- a/tests/AdminControllerTest.php
+++ b/tests/AdminControllerTest.php
@@ -744,7 +744,9 @@ class AdminControllerTest extends TestCase
                     'nickname' => $user->nickname,
                     'score' => $user->score,
                     'avatar' => $user->avatar,
-                    'permission' => $user->permission
+                    'permission' => $user->permission,
+                    'verified' => (bool) $user->verified,
+                    'verification_token' => (string) $user->verification_token
                 ]
             ]);