Fixed model extending mis-use

[bookstack] / app / Services / EmailConfirmationService.php

diff --git a/app/Services/EmailConfirmationService.php b/app/Services/EmailConfirmationService.php
index dd85ad83444fc9614958f6daa493bc468c29fd84..8eb52708c9f567bbfafa57be73d7709b2c65a238 100644 (file)
--- a/app/Services/EmailConfirmationService.php
+++ b/app/Services/EmailConfirmationService.php
@@ -1,30 +1,27 @@
-<?php namespace Oxbow\Services;
-
+<?php namespace BookStack\Services;

 
 

+use BookStack\Notifications\ConfirmEmail;
+use BookStack\Repos\UserRepo;

 use Carbon\Carbon;
 use Carbon\Carbon;

-use Illuminate\Contracts\Mail\Mailer;
-use Illuminate\Mail\Message;
-use Oxbow\EmailConfirmation;
-use Oxbow\Exceptions\ConfirmationEmailException;
-use Oxbow\Exceptions\UserRegistrationException;
-use Oxbow\Repos\UserRepo;
-use Oxbow\Setting;
-use Oxbow\User;
+use BookStack\Exceptions\ConfirmationEmailException;
+use BookStack\Exceptions\UserRegistrationException;
+use BookStack\User;
+use Illuminate\Database\Connection as Database;

 
 class EmailConfirmationService
 {
 
 class EmailConfirmationService
 {

-    protected $mailer;
-    protected $emailConfirmation;
+    protected $db;
+    protected $users;

 
     /**
      * EmailConfirmationService constructor.
 
     /**
      * EmailConfirmationService constructor.

-     * @param Mailer            $mailer
-     * @param EmailConfirmation $emailConfirmation
+     * @param Database $db
+     * @param UserRepo $users

      */
      */

-    public function __construct(Mailer $mailer, EmailConfirmation $emailConfirmation)
+    public function __construct(Database $db, UserRepo $users)

     {
     {

-        $this->mailer = $mailer;
-        $this->emailConfirmation = $emailConfirmation;
+        $this->db = $db;
+        $this->users = $users;

     }
 
     /**
     }
 
     /**


@@ -35,46 +32,60 @@ class EmailConfirmationService
      */
     public function sendConfirmation(User $user)
     {
      */
     public function sendConfirmation(User $user)
     {

-        if($user->email_confirmed) {
-            throw new ConfirmationEmailException('Email has already been confirmed, Try logging in.', '/login');
+        if ($user->email_confirmed) {
+            throw new ConfirmationEmailException(trans('errors.email_already_confirmed'), '/login');

         }
         }

+

         $this->deleteConfirmationsByUser($user);
         $this->deleteConfirmationsByUser($user);

+        $token = $this->createEmailConfirmation($user);
+
+        $user->notify(new ConfirmEmail($token));
+    }
+
+    /**
+     * Creates a new email confirmation in the database and returns the token.
+     * @param User $user
+     * @return string
+     */
+    public function createEmailConfirmation(User $user)
+    {

         $token = $this->getToken();
         $token = $this->getToken();

-        $this->emailConfirmation->create([
+        $this->db->table('email_confirmations')->insert([

             'user_id' => $user->id,
             'user_id' => $user->id,

-            'token'   => $token,
+            'token' => $token,
+            'created_at' => Carbon::now(),
+            'updated_at' => Carbon::now()

         ]);
         ]);

-        $this->mailer->send('emails/email-confirmation', ['token' => $token], function (Message $message) use ($user) {
-            $appName = \Setting::get('app-name', 'BookStack');
-            $message->to($user->email, $user->name)->subject('Confirm your email on ' . $appName . '.');
-        });
+        return $token;

     }
 
     /**
      * Gets an email confirmation by looking up the token,
      * Ensures the token has not expired.
      * @param string $token
     }
 
     /**
      * Gets an email confirmation by looking up the token,
      * Ensures the token has not expired.
      * @param string $token

-     * @return EmailConfirmation
+     * @return array|null|\stdClass

      * @throws UserRegistrationException
      */
     public function getEmailConfirmationFromToken($token)
     {
      * @throws UserRegistrationException
      */
     public function getEmailConfirmationFromToken($token)
     {

-        $emailConfirmation = $this->emailConfirmation->where('token', '=', $token)->first();
-        // If not found
+        $emailConfirmation = $this->db->table('email_confirmations')->where('token', '=', $token)->first();
+
+        // If not found show error

         if ($emailConfirmation === null) {
         if ($emailConfirmation === null) {

-            throw new UserRegistrationException('This confirmation token is not valid or has already been used, Please try registering again.', '/register');
+            throw new UserRegistrationException(trans('errors.email_confirmation_invalid'), '/register');

         }
 
         // If more than a day old
         }
 
         // If more than a day old

-        if(Carbon::now()->subDay()->gt($emailConfirmation->created_at)) {
-            $this->sendConfirmation($emailConfirmation->user);
-            throw new UserRegistrationException('The confirmation token has expired, A new confirmation email has been sent.', '/register/confirm');
+        if (Carbon::now()->subDay()->gt(new Carbon($emailConfirmation->created_at))) {
+            $user = $this->users->getById($emailConfirmation->user_id);
+            $this->sendConfirmation($user);
+            throw new UserRegistrationException(trans('errors.email_confirmation_expired'), '/register/confirm');

         }
 
         }
 

+        $emailConfirmation->user = $this->users->getById($emailConfirmation->user_id);

         return $emailConfirmation;
     }
 
         return $emailConfirmation;
     }
 

-

     /**
      * Delete all email confirmations that belong to a user.
      * @param User $user
     /**
      * Delete all email confirmations that belong to a user.
      * @param User $user


@@ -82,7 +93,7 @@ class EmailConfirmationService
      */
     public function deleteConfirmationsByUser(User $user)
     {
      */
     public function deleteConfirmationsByUser(User $user)
     {

-        return $this->emailConfirmation->where('user_id', '=', $user->id)->delete();
+        return $this->db->table('email_confirmations')->where('user_id', '=', $user->id)->delete();

     }
 
     /**
     }
 
     /**


@@ -92,7 +103,7 @@ class EmailConfirmationService
     protected function getToken()
     {
         $token = str_random(24);
     protected function getToken()
     {
         $token = str_random(24);

-        while ($this->emailConfirmation->where('token', '=', $token)->exists()) {
+        while ($this->db->table('email_confirmations')->where('token', '=', $token)->exists()) {

             $token = str_random(25);
         }
         return $token;
             $token = str_random(25);
         }
         return $token;