Merge branch 'develop' into master

Author: michaeldzjap

README.md

@@ -163,7 +163,7 @@ The first route is the route the user will be redirected to once the two-factor
  * Log out the user and start the two factor authentication state.
  *
  * @param \Illuminate\Http\Request $request
- * @param \App\User $user
+ * @param \App\Models\User $user
  * @return \Illuminate\Http\Response
  */
  private function startTwoFactorAuthProcess(Request $request, $user)
@@ -185,7 +185,7 @@ The first route is the route the user will be redirected to once the two-factor
  * Provider specific two-factor authentication logic. In the case of MessageBird
  * we just want to send an authentication token via SMS.
  *
- * @param \App\User $user
+ * @param \App\Models\User $user
  * @return mixed
  */
  private function registerUserAndSendToken(User $user)

composer.json

@@ -7,7 +7,7 @@
  "type": "package",
  "minimum-stability": "dev",
  "require": {
- "illuminate/support": "^5.5.0 || ^6.0 || ^7.0"
+ "illuminate/support": "^8.0"
  },
  "extra": {
  "laravel": {

src/TwoFactorAuth.php src/Models/TwoFactorAuth.phpsrc/TwoFactorAuth.php renamed to src/Models/TwoFactorAuth.php

@@ -1,12 +1,16 @@
 <?php
 
-namespace MichaelDzjap\TwoFactorAuth;
+namespace MichaelDzjap\TwoFactorAuth\Models;
 
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class TwoFactorAuth extends Model
 {
+ use HasFactory;
+
  /**
  * The reference to the user model.
  *
@@ -64,4 +68,14 @@ private function model(): string
 
  return $this->model;
  }
+
+ /**
+ * Create a new factory instance for the model.
+ *
+ * @return \Illuminate\Database\Eloquent\Factories\Factory
+ */
+ protected static function newFactory(): Factory
+ {
+ return \MichaelDzjap\TwoFactorAuth\Database\Factories\TwoFactorAuthFactory::new();
+ }
 }

src/TwoFactorAuthManager.php

@@ -29,7 +29,7 @@ public function provider(string $driver = null): TwoFactorProvider
  protected function createMessageBirdDriver(): TwoFactorProvider
  {
  return new MessageBirdVerify(
- new Client($this->app['config']['twofactor-auth.providers.messagebird.key'])
+ new Client($this->config['twofactor-auth.providers.messagebird.key'])
  );
  }
 
@@ -50,7 +50,7 @@ protected function createNullDriver(): TwoFactorProvider
  */
  public function getDefaultDriver(): string
  {
- return $this->app['config']['twofactor-auth.default'];
+ return $this->config['twofactor-auth.default'];
  }
 
  /**
@@ -61,6 +61,6 @@ public function getDefaultDriver(): string
  */
  public function setDefaultDriver(string $name): void
  {
- $this->app['config']['twofactor-auth.default'] = $name;
+ $this->config['twofactor-auth.default'] = $name;
  }
 }

src/TwoFactorAuthenticable.php

@@ -27,7 +27,7 @@ public function getMobile(): string
  public function twoFactorAuth(): HasOne
  {
  return $this->hasOne(
- \MichaelDzjap\TwoFactorAuth\TwoFactorAuth::class, 'user_id', $this->getKeyName()
+ \MichaelDzjap\TwoFactorAuth\Models\TwoFactorAuth::class, 'user_id', $this->getKeyName()
  );
  }
 

src/config/twofactor-auth.php

@@ -92,6 +92,6 @@
  |
  */
 
- 'model' => \App\User::class,
+ 'model' => \App\Models\User::class,
 
 ];

src/database/factories/TwoFactorAuthFactory.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace MichaelDzjap\TwoFactorAuth\Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use MichaelDzjap\TwoFactorAuth\Models\TwoFactorAuth;
+
+class TwoFactorAuthFactory extends Factory
+{
+ /**
+ * The name of the factory's corresponding model.
+ *
+ * @var string
+ */
+ protected $model = TwoFactorAuth::class;
+
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'user_id' => config('twofactor-auth.model')::factory(),
+ ];
+ }
+}

src/resources/views/form.blade.php

@@ -15,7 +15,7 @@
  <label for="token" class="col-md-4 col-form-label text-md-right">@lang('twofactor-auth::twofactor-auth.label')</label>
 
  <div class="col-md-6">
- <input id="token" type="text" class="form-control{{ $errors->has('token') ? ' is-invalid' : '' }}" name="token" value="{{ old('token') }}" required autofocus>
+ <input id="token" type="text" autocomplete="one-time-code" class="form-control{{ $errors->has('token') ? ' is-invalid' : '' }}" name="token" value="{{ old('token') }}" required autofocus>
 
  @if ($errors->has('token'))
  <span class="invalid-feedback" role="alert">