Merge branch 'ps-sean/1.x' into 1.x

Author: taylorotwell

routes/routes.php

@@ -17,6 +17,7 @@
 use Laravel\Fortify\Http\Controllers\TwoFactorAuthenticatedSessionController;
 use Laravel\Fortify\Http\Controllers\TwoFactorAuthenticationController;
 use Laravel\Fortify\Http\Controllers\TwoFactorQrCodeController;
+use Laravel\Fortify\Http\Controllers\TwoFactorSecretKeyController;
 use Laravel\Fortify\Http\Controllers\VerifyEmailController;
 
 Route::group(['middleware' => config('fortify.middleware', ['web'])], function () {
@@ -154,6 +155,10 @@
             ->middleware($twoFactorMiddleware)
             ->name('two-factor.qr-code');
 
+        Route::get('/user/two-factor-secret-key', [TwoFactorSecretKeyController::class, 'show'])
+            ->middleware($twoFactorMiddleware)
+            ->name('two-factor.secret-key');
+
         Route::get('/user/two-factor-recovery-codes', [RecoveryCodeController::class, 'index'])
             ->middleware($twoFactorMiddleware)
             ->name('two-factor.recovery-codes');

src/Http/Controllers/TwoFactorSecretKeyController.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Laravel\Fortify\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+
+class TwoFactorSecretKeyController extends Controller
+{
+    /**
+     * Get the current user's two factor authentication setup / secret key.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function show(Request $request)
+    {
+        if (is_null($request->user()->two_factor_secret)) {
+            abort(404, 'Two factor authentication has not been enabled.');
+        }
+
+        return response()->json([
+            'secretKey' => decrypt($request->user()->two_factor_secret),
+        ]);
+    }
+}

tests/TwoFactorAuthenticationControllerTest.php

@@ -44,6 +44,29 @@ public function test_two_factor_authentication_can_be_enabled()
         $this->assertNotNull($user->twoFactorQrCodeSvg());
     }
 
+    public function test_two_factor_authentication_secret_key_can_be_retrieved()
+    {
+        Event::fake();
+
+        $this->loadLaravelMigrations(['--database' => 'testbench']);
+        $this->artisan('migrate', ['--database' => 'testbench'])->run();
+
+        $user = TestTwoFactorAuthenticationUser::forceCreate([
+            'name' => 'Taylor Otwell',
+            'email' => '[email protected]',
+            'password' => bcrypt('secret'),
+            'two_factor_secret' => encrypt('foo'),
+        ]);
+
+        $response = $this->withoutExceptionHandling()->actingAs($user)->getJson(
+            '/user/two-factor-secret-key'
+        );
+
+        $response->assertStatus(200);
+
+        $this->assertEquals('foo', $response->original['secretKey']);
+    }
+
     public function test_two_factor_authentication_can_be_confirmed()
     {
         Event::fake();