Merge pull request #23 from DarkGhostHunter/master

Added issuer config key plus other minor fixes.

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# Help me support this package
+
+ko_fi: DarkGhostHunter
+custom: ['https://paypal.me/darkghosthunter']

README.md

@@ -270,6 +270,7 @@ return [
         'expiration_days' => 14,
 	],    
     'secret_length' => 20,
+    'issuer' => env('APP_NAME', 'Laravel'),
     'totp' => [
         'digits' => 6,
         'seconds' => 30,
@@ -386,6 +387,7 @@ It's recommended to use 128-bit or 160-bit because some Authenticator apps may h
 
 ```php
 return [
+    'issuer' => env('APP_NAME', 'Laravel'),
     'totp' => [
         'digits' => 6,
         'seconds' => 30,
@@ -397,10 +399,11 @@ return [
 
 This controls TOTP code generation and verification mechanisms:
 
-* Digits: The amount of digits to ask for TOTP code. 
-* Seconds: The number of seconds a code is considered valid.
-* Window: Additional steps of seconds to keep a code as valid.
-* Algorithm: The system-supported algorithm to handle code generation.
+* Issuer: The name of the issuer of the TOTP. Default is the application name. 
+* TOTP Digits: The amount of digits to ask for TOTP code. 
+* TOTP Seconds: The number of seconds a code is considered valid.
+* TOTP Window: Additional steps of seconds to keep a code as valid.
+* TOTP Algorithm: The system-supported algorithm to handle code generation.
 
 This configuration values are always passed down to the authentication app as URI parameters:
 

config/laraguard.php

@@ -115,6 +115,8 @@
     |
     */
 
+    'issuer' => env('APP_NAME', 'Laravel'),
+
     'totp' => [
         'digits' => 6,
         'seconds' => 30,

resources/views/notice.blade.php

@@ -4,9 +4,11 @@
     <p class="text-center">
         {{ __('To proceed, you need to enable Two Factor Authentication.') }}
     </p>
+    @isset($url)
     <div class="col-auto mb-3">
         <a href="{{ $url }}" class="btn btn-primary btn-lg">
             {{ __('Enable') }} &raquo;
         </a>
     </div>
+    @endisset
 @endsection

src/Eloquent/SerializesSharedSecret.php

@@ -17,14 +17,14 @@ trait SerializesSharedSecret
     public function toUri() : string
     {
         $query = http_build_query([
-            'issuer'    => $issuer = rawurlencode(config('app.name')),
+            'issuer'    => $issuer = config('laraguard.issuer') ?? config('app.name'),
             'label'     => $this->attributes['label'],
             'secret'    => $this->shared_secret,
             'algorithm' => strtoupper($this->attributes['algorithm']),
             'digits'     => $this->attributes['digits'],
         ], null, '&', PHP_QUERY_RFC3986);
 
-        return "otpauth://totp/$issuer%3A{$this->attributes['label']}?$query";
+        return 'otpauth://totp/' . rawurlencode($issuer) . '%3A' . $this->attributes['label'] . "?$query";
     }
 
     /**

tests/Eloquent/TwoFactorAuthenticationTest.php

@@ -3,11 +3,11 @@
 namespace Tests\Eloquent;
 
 use Carbon\Carbon;
-use Tests\RunsPublishableMigrations;
 use Tests\RegistersPackage;
 use Orchestra\Testbench\TestCase;
 use ParagonIE\ConstantTime\Base32;
 use Tests\Stubs\UserTwoFactorStub;
+use Tests\RunsPublishableMigrations;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
@@ -269,7 +269,7 @@ public function test_serializes_to_grouped_string()
 
     public function test_serializes_to_uri()
     {
-        config(['app.name' => 'quz']);
+        config(['laraguard.issuer' => 'quz']);
 
         $tfa = factory(TwoFactorAuthentication::class)->states('with recovery', 'with safe devices')->make([
             'label'         => '[email protected]',
@@ -285,7 +285,7 @@ public function test_serializes_to_uri()
 
     public function test_serializes_to_qr_and_renders_to_qr()
     {
-        config(['app.name' => 'quz']);
+        config(['laraguard.issuer' => 'quz']);
 
         $tfa = factory(TwoFactorAuthentication::class)->states('with recovery', 'with safe devices')->make([
             'label'         => '[email protected]',
@@ -300,7 +300,7 @@ public function test_serializes_to_qr_and_renders_to_qr()
 
     public function test_serializes_uri_to_json()
     {
-        config(['app.name' => 'quz']);
+        config(['laraguard.issuer' => 'quz']);
 
         $tfa = factory(TwoFactorAuthentication::class)->states('with recovery', 'with safe devices')->make([
             'label'         => '[email protected]',
@@ -315,4 +315,22 @@ public function test_serializes_uri_to_json()
         $this->assertEquals($uri, $tfa->toJson());
         $this->assertEquals($uri, json_encode($tfa));
     }
+
+    public function test_changes_issuer()
+    {
+        config(['laraguard.issuer' => 'foo bar']);
+
+        $tfa = factory(TwoFactorAuthentication::class)->states('with recovery', 'with safe devices')->make([
+            'label'         => '[email protected]',
+            'shared_secret' => 'KS72XBTN5PEBGX2IWBMVW44LXHPAQ7L3',
+            'algorithm'     => 'sHa256',
+            'digits'        => 14,
+        ]);
+
+        $uri = '"otpauth:\/\/totp\/foo%20bar%[email protected]?issuer=foo%20bar&label=test%40foo.com&secret=KS72XBTN5PEBGX2IWBMVW44LXHPAQ7L3&algorithm=SHA256&digits=14"';
+
+        $this->assertJson($tfa->toJson());
+        $this->assertEquals($uri, $tfa->toJson());
+        $this->assertEquals($uri, json_encode($tfa));
+    }
 }