Set email verified at & refactoring

Author: jrean

src/UserVerification.php

@@ -47,6 +47,10 @@ public function __construct(Mailer $mailer, Builder $schema)
  {
  $this->mailer = $mailer;
  $this->schema = $schema;
+
+ if (! $this->isCompliant()) {
+ throw new ModelNotCompliantException();
+ }
  }
 
  /**
@@ -85,10 +89,6 @@ protected function generateToken()
  */
  protected function saveToken(AuthenticatableContract $user, $token)
  {
- if (! $this->isCompliant($user)) {
- throw new ModelNotCompliantException();
- }
-
  $user->verified = false;
 
  $user->verification_token = $token;
@@ -114,10 +114,6 @@ public function send(
  $name = null
  )
  {
- if (! $this->isCompliant($user)) {
- throw new ModelNotCompliantException();
- }
-
  $this->emailVerificationLink($user, $subject, $from, $name);
 
  event(new VerificationEmailSent($user));
@@ -141,10 +137,6 @@ public function sendQueue(
  $name = null
  )
  {
- if (! $this->isCompliant($user)) {
- throw new ModelNotCompliantException();
- }
-
  $this->emailQueueVerificationLink($user, $subject, $from, $name);
 
  event(new VerificationEmailSent($user));
@@ -170,10 +162,6 @@ public function sendLater(
  $name = null
  )
  {
- if (! $this->isCompliant($user)) {
- throw new ModelNotCompliantException();
- }
-
  $this->emailLaterVerificationLink($delay, $user, $subject, $from, $name);
 
  event(new VerificationEmailSent($user));
@@ -336,6 +324,8 @@ protected function wasVerified($user)
 
  $user->verified = true;
 
+ $user->verified_at = now();
+
  $this->updateUser($user);
 
  event(new UserVerified($user));
@@ -353,34 +343,21 @@ protected function updateUser($user)
  ->where('email', $user->email)
  ->update([
  'verification_token' => $user->verification_token,
- 'verified' => $user->verified
+ 'verified' => $user->verified,
+ 'email_verified_at' => $user->verified_at,
  ]);
  }
 
  /**
  * Determine if the given model table has the verified and verification_token
  * columns.
  *
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
  * @return bool
  */
- protected function isCompliant(AuthenticatableContract $user)
+ protected function isCompliant()
  {
- return $this->hasColumn($user, 'verified')
- && $this->hasColumn($user, 'verification_token')
- ? true
- : false;
- }
+ $user = config('auth.providers.users.model', App\User::class);
 
- /**
- * Check if the given model talbe has the given column.
- *
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
- * @param string $column
- * @return bool
- */
- protected function hasColumn(AuthenticatableContract $user, $column)
- {
- return $this->schema->hasColumn($user->getTable(), $column);
+ return $this->schema->hasColumns((new $user())->getTable(), ['verified', 'verification_token'])? true : false;
  }
 }