refactoring de Name & Email vers Service & Account

app/Http/Controllers/QrCodeController.php

@@ -33,18 +33,18 @@ class QrCodecontroller extends Controller
                 $options[$option[0]] = $option[1];
             }
 
-            $email = $service = '';
+            $account = $service = '';
 
             $serviceChunks = explode(':', str_replace('otpauth://totp/', '', $uriChunks[0]));
 
             if( count($serviceChunks) > 1 ) {
-                $email = $serviceChunks[1];
+                $account = $serviceChunks[1];
             }
 
             $service = $serviceChunks[0];
 
             if( strstr( $service, '@') ) {
-                $email = $service;
+                $account = $service;
                 $service = '';
             }
 
@@ -53,8 +53,8 @@ class QrCodecontroller extends Controller
             }
 
             $twofaccount = (object) array(
-                'name' => $service,
+                'service' => $service,
-                'email' => $email,
+                'account' => $account,
                 'uri' => $uri,
                 'icon' => '',
                 'options' => $options

app/Http/Controllers/TwoFAccountController.php

@@ -30,8 +30,8 @@ class TwoFAccountController extends Controller
     public function store(Request $request)
     {
         $twofaccount = TwoFAccount::create([
-            'name' => $request->name,
+            'service' => $request->service,
-            'email' => $request->email,
+            'account' => $request->account,
             'uri' => $request->uri,
             'icon' => $request->icon
         ]);

app/TwoFAccount.php

@@ -9,7 +9,7 @@ class TwoFAccount extends Model
 {
         use SoftDeletes;
 
-        protected $fillable = ['name', 'email', 'uri', 'icon'];
+        protected $fillable = ['service', 'account', 'uri', 'icon'];
 
 
     /**

database/factories/TwoFAccountFactory.php

@@ -19,8 +19,8 @@ use Faker\Generator as Faker;
 
 $factory->define(TwoFAccount::class, function (Faker $faker) {
     return [
-        'name' => $faker->unique()->domainName,
+        'service' => $faker->unique()->domainName,
-        'email' => $faker->safeEmail,
+        'account' => $faker->safeEmail,
         'uri' => 'otpauth://totp/' . $faker->email . '?secret=' . $faker->regexify('[A-Z0-9]{16}') . '&issuer=test',
     ];
 });

database/migrations/2019_05_16_162730_create_twofaccounts_table.php

@@ -15,9 +15,9 @@ class CreateTwoFAccountsTable extends Migration
     {
         Schema::create('twofaccounts', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('name')->unique();
+            $table->string('service');
             $table->string('uri');
-            $table->string('email');
+            $table->string('account');
             $table->string('icon')->nullable();
             $table->timestamps();
             $table->softDeletes();

database/seeds/TwoFAccountsTableSeeder.php

@@ -14,32 +14,32 @@ class TwoFAccountsTableSeeder extends Seeder
         $faker = \Faker\Factory::create();
 
         TwoFAccount::create([
-            'name' => $faker->unique()->domainName,
+            'service' => $faker->unique()->domainName,
-            'email' => $faker->email,
+            'account' => $faker->email,
             'uri' => 'otpauth://totp/test@test.com?secret=A4GRFTVVRBGY7UIW&issuer=test',
             'icon' => 'https://fakeimg.pl/64x64/'
         ]);
         TwoFAccount::create([
-            'name' => $faker->unique()->domainName,
+            'service' => $faker->unique()->domainName,
-            'email' => $faker->email,
+            'account' => $faker->email,
             'uri' => 'otpauth://totp/test@test.com?secret=A4GRFHYVRBGY7UIW&issuer=test',
             'icon' => 'https://fakeimg.pl/64x64/'
         ]);
         TwoFAccount::create([
-            'name' => $faker->unique()->domainName,
+            'service' => $faker->unique()->domainName,
-            'email' => $faker->email,
+            'account' => $faker->email,
             'uri' => 'otpauth://totp/test@test.com?secret=A4GRFHZVRBGY7UIW&issuer=test',
             'icon' => 'https://fakeimg.pl/64x64/'
         ]);
         TwoFAccount::create([
-            'name' => $faker->unique()->domainName,
+            'service' => $faker->unique()->domainName,
-            'email' => $faker->email,
+            'account' => $faker->email,
             'uri' => 'otpauth://totp/test@test.com?secret=A4GRFHVIRBGY7UIW&issuer=test',
             'icon' => 'https://fakeimg.pl/64x64/'
         ]);
         TwoFAccount::create([
-            'name' => $faker->unique()->domainName,
+            'service' => $faker->unique()->domainName,
-            'email' => $faker->email,
+            'account' => $faker->email,
             'uri' => 'otpauth://totp/test@test.com?secret=A4GRFHVVOBGY7UIW&issuer=test',
             'icon' => 'https://fakeimg.pl/64x64/'
         ]);

resources/js/components/TwofaccountShow.vue

@@ -3,8 +3,8 @@
         <figure class="image is-64x64" style="display: inline-block">
             <img :src="icon">
         </figure>
-        <p class="is-size-4 has-text-grey-light">{{ name }}</p>
+        <p class="is-size-4 has-text-grey-light">{{ service }}</p>
-        <p class="is-size-6 has-text-grey">{{ email }}</p>
+        <p class="is-size-6 has-text-grey">{{ account }}</p>
         <slot></slot>
         <div class="modal-action-links has-text-grey">
             <router-link :to="{ name: 'edit', params: { twofaccountId: twofaccountid }}">Edit</router-link>
@@ -18,6 +18,6 @@
             return {
             }
         },
-        props: ['twofaccountid', 'name', 'email', 'icon'],
+        props: ['twofaccountid', 'service', 'account', 'icon'],
     }
 </script>

resources/js/views/Accounts.vue

@@ -5,8 +5,8 @@
                 <span v-for="account in accounts" class="button is-black twofaccount" >
                     <span @click.stop="getAccount(account.id)">
                         <img :src="account.icon">
-                        {{ account.name }}
+                        {{ account.service }}
-                        <span class="is-family-primary is-size-7 has-text-grey">{{ account.email }}</span>
+                        <span class="is-family-primary is-size-7 has-text-grey">{{ account.account }}</span>
                     </span>
                     <a v-on:click="deleteAccount(account.id)">Delete</a>
                 </span>
@@ -15,9 +15,9 @@
         <modal v-model="ShowTwofaccountInModal">
             <twofaccount-show
                 :twofaccountid='twofaccount.id'
-                :name='twofaccount.name'
+                :service='twofaccount.service'
                 :icon='twofaccount.icon'
-                :email='twofaccount.email'>
+                :account='twofaccount.account'>
                 <one-time-password ref="OneTimePassword"></one-time-password>
             </twofaccount-show>
         </modal>
@@ -48,8 +48,8 @@
                 response.data.forEach((data) => {
                     this.accounts.push({
                         id : data.id,
-                        name : data.name,
+                        service : data.service,
-                        email : data.email,
+                        account : data.account,
                         icon : data.icon
                     })
                 })
@@ -77,8 +77,8 @@
                 axios.get('api/twofaccounts/' + id).then(response => {
 
                     this.twofaccount.id = response.data.id
-                    this.twofaccount.name = response.data.name
+                    this.twofaccount.service = response.data.service
-                    this.twofaccount.email = response.data.email
+                    this.twofaccount.account = response.data.account
                     this.twofaccount.icon = response.data.icon
 
                     this.$refs.OneTimePassword.AccountId = response.data.id

resources/js/views/Create.vue

@@ -20,13 +20,13 @@
                     <div class="field">
                         <label class="label">Service</label>
                         <div class="control">
-                            <input class="input" type="text" placeholder="Name" v-model="twofaccount.name" required autofocus />
+                            <input class="input" type="text" placeholder="Service" v-model="twofaccount.service" required autofocus />
                         </div>
                     </div>
                     <div class="field">
-                        <label class="label">Email</label>
+                        <label class="label">Account</label>
                         <div class="control">
-                            <input class="input" type="text" placeholder="Email" v-model="twofaccount.email"  />
+                            <input class="input" type="text" placeholder="Email" v-model="twofaccount.account"  />
                         </div>
                     </div>
                     <div class="field">
@@ -73,8 +73,8 @@
         data() {
             return {
                 twofaccount: {
-                    'name' : '',
+                    'service' : '',
-                    'email' : '',
+                    'account' : '',
                     'uri' : '',
                     'icon' : ''
                 }

resources/js/views/Edit.vue

@@ -7,13 +7,13 @@
                     <div class="field">
                         <label class="label">Service</label>
                         <div class="control">
-                            <input class="input" type="text" placeholder="Account name" v-model="twofaccount.name" required autofocus />
+                            <input class="input" type="text" placeholder="Service" v-model="twofaccount.service" required autofocus />
                         </div>
                     </div>
                     <div class="field">
-                        <label class="label">Email</label>
+                        <label class="label">Account</label>
                         <div class="control">
-                            <input class="input" type="text" placeholder="account email" v-model="twofaccount.email" />
+                            <input class="input" type="text" placeholder="Account" v-model="twofaccount.account" />
                         </div>
                     </div>
                     <div class="field">

tests/Unit/TwoFAccountTest.php

@@ -32,14 +32,14 @@ class TwoFAccountTest extends TestCase
     {
         $response = $this->actingAs($this->user, 'api')
             ->json('POST', '/api/twofaccounts', [
-                    'name' => 'testCreation',
+                    'service' => 'testCreation',
-                    'email' => 'test@example.org',
+                    'account' => 'test@example.org',
                     'uri' => 'test',
                 ])
             ->assertStatus(201)
             ->assertJson([
-                'name' => 'testCreation',
+                'service' => 'testCreation',
-                'email' => 'test@example.org',
+                'account' => 'test@example.org',
                 'uri' => 'test',
             ]);
     }
@@ -53,8 +53,8 @@ class TwoFAccountTest extends TestCase
     public function testTOTPgeneration()
     {
         $twofaccount = factory(TwoFAccount::class)->create([
-            'name' => 'testTOTP',
+            'service' => 'testTOTP',
-            'email' => 'test@test.com',
+            'account' => 'test@test.com',
             'uri' => 'otpauth://totp/test@test.com?secret=A4GRFHVVRBGY7UIW&issuer=test'
         ]);
 
@@ -78,15 +78,15 @@ class TwoFAccountTest extends TestCase
 
         $response = $this->actingAs($this->user, 'api')
             ->json('PUT', '/api/twofaccounts/' . $twofaccount->id, [
-                    'name' => 'testUpdate',
+                    'service' => 'testUpdate',
-                    'email' => 'testUpdate@test.com',
+                    'account' => 'testUpdate@test.com',
                     'uri' => 'testUpdate',
                 ])
             ->assertStatus(200)
             ->assertJson([
                 'id' => 1,
-                'name' => 'testUpdate',
+                'service' => 'testUpdate',
-                'email' => 'testUpdate@test.com',
+                'account' => 'testUpdate@test.com',
                 'uri' => 'testUpdate',
                 'icon' => null,
             ]);
@@ -108,8 +108,8 @@ class TwoFAccountTest extends TestCase
             ->assertJsonStructure([
                 '*' => [
                     'id',
-                    'name',
+                    'service',
-                    'email',
+                    'account',
                     'uri',
                     'icon',
                     'created_at',