From d0b09b5bd10440f5465725e9f99cb32b91b9985e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 7 Jul 2023 15:59:36 +1000 Subject: [PATCH] Updates --- .env.example | 2 +- app/Console/Kernel.php | 4 +- app/Providers/AppServiceProvider.php | 7 - app/Providers/MultiDatabaseUserProvider.php | 277 -------------------- app/Providers/RouteServiceProvider.php | 1 - 5 files changed, 3 insertions(+), 288 deletions(-) delete mode 100644 app/Providers/MultiDatabaseUserProvider.php diff --git a/.env.example b/.env.example index 2866713fa53d..00dab5f4d5c4 100644 --- a/.env.example +++ b/.env.example @@ -8,7 +8,7 @@ APP_URL=http://localhost DB_CONNECTION=mysql MULTI_DB_ENABLED=false -DB_HOST=localhost +DB_HOST=127.0.0.1 DB_DATABASE=ninja DB_USERNAME=ninja DB_PASSWORD=ninja diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 5590f81043d6..b87ea25c7a77 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -130,8 +130,8 @@ class Kernel extends ConsoleKernel */ protected function commands() { - // $this->load(__DIR__.'/Commands'); + $this->load(__DIR__.'/Commands'); - // require base_path('routes/console.php'); + require base_path('routes/console.php'); } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 40fb55b80022..6d5e145af815 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -113,13 +113,6 @@ class AppServiceProvider extends ServiceProvider return $this; }); - /* Extension for custom mailers */ - - /* Convenience helper for testing s*/ - ParallelTesting::setUpTestDatabase(function ($database, $token) { - Artisan::call('db:seed'); - }); - } public function register(): void diff --git a/app/Providers/MultiDatabaseUserProvider.php b/app/Providers/MultiDatabaseUserProvider.php deleted file mode 100644 index 6a6aef0de7de..000000000000 --- a/app/Providers/MultiDatabaseUserProvider.php +++ /dev/null @@ -1,277 +0,0 @@ -model = $model; - $this->hasher = $hasher; - } - - /** - * Retrieve a user by their unique identifier. - * - * @param mixed $identifier - * @return UserContract|null - */ - public function retrieveById($identifier) - { - $this->setDefaultDatabase($identifier); - - $model = $this->createModel(); - - return $model->newQuery() - ->where($model->getAuthIdentifierName(), $identifier) - ->first(); - } - - /** - * Retrieve a user by their unique identifier and "remember me" token. - * - * @param mixed $identifier - * @param string $token - * @return UserContract|null - */ - public function retrieveByToken($identifier, $token) - { - $this->setDefaultDatabase($identifier, $token); - - $model = $this->createModel(); - - $model = $model->where($model->getAuthIdentifierName(), $identifier)->first(); - - if (! $model) { - return null; - } - - $rememberToken = $model->getRememberToken(); - - return $rememberToken && hash_equals($rememberToken, $token) ? $model : null; - } - - /** - * Update the "remember me" token for the given user in storage. - * - * @param UserContract|Model $user - * @param string $token - * @return void - */ - public function updateRememberToken(UserContract $user, $token) - { - $user->setRememberToken($token); - - $timestamps = $user->timestamps; - - $user->timestamps = false; - - $user->save(); - - $user->timestamps = $timestamps; - } - - /** - * Retrieve a user by the given credentials. - * - * @param array $credentials - * @return UserContract|null - */ - public function retrieveByCredentials(array $credentials) - { - if (empty($credentials) || - (count($credentials) === 1 && - array_key_exists('password', $credentials))) { - return; - } - - $this->setDefaultDatabase(false, $credentials['email'], false); - - // First we will add each credential element to the query as a where clause. - // Then we can execute the query and, if we found a user, return it in a - // Eloquent User "model" that will be utilized by the Guard instances. - $query = $this->createModel()->newQuery(); - - foreach ($credentials as $key => $value) { - if (Str::contains($key, 'password')) { - continue; - } - - if (is_array($value) || $value instanceof Arrayable) { - $query->whereIn($key, $value); - } else { - $query->where($key, $value); - } - } - - return $query->first(); - } - - /** - * Validate a user against the given credentials. - * - * @param UserContract $user - * @param array $credentials - * @return bool - */ - public function validateCredentials(UserContract $user, array $credentials) - { - $plain = $credentials['password']; - - return $this->hasher->check($plain, $user->getAuthPassword()); - } - - /** - * Create a new instance of the model. - * - * @return Model - */ - public function createModel() - { - $class = '\\'.ltrim($this->model, '\\'); - - return new $class; - } - - /** - * Gets the hasher implementation. - * - * @return HasherContract - */ - public function getHasher() - { - return $this->hasher; - } - - /** - * Sets the hasher implementation. - * - * @param HasherContract $hasher - * @return $this - */ - public function setHasher(HasherContract $hasher) - { - $this->hasher = $hasher; - - return $this; - } - - /** - * Gets the name of the Eloquent user model. - * - * @return string - */ - public function getModel() - { - return $this->model; - } - - /** - * Sets the name of the Eloquent user model. - * - * @param string $model - * @return $this - */ - public function setModel($model) - { - $this->model = $model; - - return $this; - } - - /** - * Sets correct database by variable. - * @param bool $id - * @param bool $email - * @param bool $token - */ - private function setDefaultDatabase($id = false, $email = false, $token = false) : void - { - foreach (MultiDB::getDbs() as $database) { - $this->setDB($database); - - /** Make sure we hook into the correct guard class */ - $query = $this->conn->table((new $this->model)->getTable()); - - if ($id) { - $query->where('id', '=', $id); - } - - if ($email) { - $query->where('email', '=', $email); - } - - $user = $query->get(); - - if (count($user) >= 1) { - break; - } - - $query = $this->conn->table('company_tokens'); - - if ($token) { - $query->whereRaw('BINARY `token`= ?', $token); - - $token = $query->get(); - - if (count($token) >= 1) { - break; - } - } - } - } - - /** - * Sets the database at runtime. - * @param $database - */ - private function setDB($database) - { - /** Get the database name we want to switch to*/ - $db_name = config('database.connections.'.$database.'.database'); - - /* This will set the default configuration for the request / session?*/ - config(['database.default' => $database]); - - /* Set the connection to complete the user authentication */ - $this->conn = app('db')->connection(config('database.connections.database.'.$database)); - } -} diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 3a7364eda1ff..d8a11fba07e5 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -20,7 +20,6 @@ use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Support\Facades\RateLimiter; use App\Http\Middleware\ThrottleRequestsWithPredis; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Routing\Middleware\ThrottleRequestsWithRedis; use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;