Fixed local_secure_restricted preventing attachment uploads

[bookstack] / app / Auth / Access / UserTokenService.php

diff --git a/app/Auth/Access/UserTokenService.php b/app/Auth/Access/UserTokenService.php
index a1defbf62d439a4bdacdef971271db1dde532afd..ffd828ab5095194b8df7ab638a73980215095c52 100644 (file)
--- a/app/Auth/Access/UserTokenService.php
+++ b/app/Auth/Access/UserTokenService.php
@@ -1,59 +1,56 @@
-<?php namespace BookStack\Auth\Access;
+<?php
+
+namespace BookStack\Auth\Access;

 
 use BookStack\Auth\User;
 use BookStack\Exceptions\UserTokenExpiredException;
 use BookStack\Exceptions\UserTokenNotFoundException;
 use Carbon\Carbon;
 
 use BookStack\Auth\User;
 use BookStack\Exceptions\UserTokenExpiredException;
 use BookStack\Exceptions\UserTokenNotFoundException;
 use Carbon\Carbon;

-use Illuminate\Database\Connection as Database;
+use Illuminate\Support\Facades\DB;

 use Illuminate\Support\Str;
 use stdClass;
 
 class UserTokenService
 {
 use Illuminate\Support\Str;
 use stdClass;
 
 class UserTokenService
 {

-

     /**
      * Name of table where user tokens are stored.
     /**
      * Name of table where user tokens are stored.

+     *

      * @var string
      */
     protected $tokenTable = 'user_tokens';
 
     /**
      * Token expiry time in hours.
      * @var string
      */
     protected $tokenTable = 'user_tokens';
 
     /**
      * Token expiry time in hours.

+     *

      * @var int
      */
     protected $expiryTime = 24;
 
      * @var int
      */
     protected $expiryTime = 24;
 

-    protected $db;
-
-    /**
-     * UserTokenService constructor.
-     * @param Database $db
-     */
-    public function __construct(Database $db)
-    {
-        $this->db = $db;
-    }
-

     /**
      * Delete all email confirmations that belong to a user.
     /**
      * Delete all email confirmations that belong to a user.

+     *

      * @param User $user
      * @param User $user

+     *

      * @return mixed
      */
     public function deleteByUser(User $user)
     {
      * @return mixed
      */
     public function deleteByUser(User $user)
     {

-        return $this->db->table($this->tokenTable)
+        return DB::table($this->tokenTable)

             ->where('user_id', '=', $user->id)
             ->delete();
     }
 
     /**
      * Get the user id from a token, while check the token exists and has not expired.
             ->where('user_id', '=', $user->id)
             ->delete();
     }
 
     /**
      * Get the user id from a token, while check the token exists and has not expired.

+     *

      * @param string $token
      * @param string $token

-     * @return int
+     *

      * @throws UserTokenNotFoundException
      * @throws UserTokenExpiredException
      * @throws UserTokenNotFoundException
      * @throws UserTokenExpiredException

+     *
+     * @return int

      */
      */

-    public function checkTokenAndGetUserId(string $token) : int
+    public function checkTokenAndGetUserId(string $token): int

     {
         $entry = $this->getEntryByToken($token);
 
     {
         $entry = $this->getEntryByToken($token);
 


@@ -70,63 +67,74 @@ class UserTokenService
 
     /**
      * Creates a unique token within the email confirmation database.
 
     /**
      * Creates a unique token within the email confirmation database.

+     *

      * @return string
      */
      * @return string
      */

-    protected function generateToken() : string
+    protected function generateToken(): string

     {
         $token = Str::random(24);
         while ($this->tokenExists($token)) {
             $token = Str::random(25);
         }
     {
         $token = Str::random(24);
         while ($this->tokenExists($token)) {
             $token = Str::random(25);
         }

+

         return $token;
     }
 
     /**
      * Generate and store a token for the given user.
         return $token;
     }
 
     /**
      * Generate and store a token for the given user.

+     *

      * @param User $user
      * @param User $user

+     *

      * @return string
      */
      * @return string
      */

-    protected function createTokenForUser(User $user) : string
+    protected function createTokenForUser(User $user): string

     {
         $token = $this->generateToken();
     {
         $token = $this->generateToken();

-        $this->db->table($this->tokenTable)->insert([
-            'user_id' => $user->id,
-            'token' => $token,
+        DB::table($this->tokenTable)->insert([
+            'user_id'    => $user->id,
+            'token'      => $token,

             'created_at' => Carbon::now(),
             'created_at' => Carbon::now(),

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

         ]);
         ]);

+

         return $token;
     }
 
     /**
      * Check if the given token exists.
         return $token;
     }
 
     /**
      * Check if the given token exists.

+     *

      * @param string $token
      * @param string $token

+     *

      * @return bool
      */
      * @return bool
      */

-    protected function tokenExists(string $token) : bool
+    protected function tokenExists(string $token): bool

     {
     {

-        return $this->db->table($this->tokenTable)
+        return DB::table($this->tokenTable)

             ->where('token', '=', $token)->exists();
     }
 
     /**
      * Get a token entry for the given token.
             ->where('token', '=', $token)->exists();
     }
 
     /**
      * Get a token entry for the given token.

+     *

      * @param string $token
      * @param string $token

+     *

      * @return object|null
      */
     protected function getEntryByToken(string $token)
     {
      * @return object|null
      */
     protected function getEntryByToken(string $token)
     {

-        return $this->db->table($this->tokenTable)
+        return DB::table($this->tokenTable)

             ->where('token', '=', $token)
             ->first();
     }
 
     /**
      * Check if the given token entry has expired.
             ->where('token', '=', $token)
             ->first();
     }
 
     /**
      * Check if the given token entry has expired.

+     *

      * @param stdClass $tokenEntry
      * @param stdClass $tokenEntry

+     *

      * @return bool
      */
      * @return bool
      */

-    protected function entryExpired(stdClass $tokenEntry) : bool
+    protected function entryExpired(stdClass $tokenEntry): bool

     {
         return Carbon::now()->subHours($this->expiryTime)
             ->gt(new Carbon($tokenEntry->created_at));
     {
         return Carbon::now()->subHours($this->expiryTime)
             ->gt(new Carbon($tokenEntry->created_at));