Merge pull request #5 from LifeOnScreen/development

[Fix] Timestamps generation
LifeOnScreen · Oct 23, 2018 · a9b684a · a9b684a
2 parents e18a241 + 3a7124e
commit a9b684a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/config/lifeonscreen2fa.php b/config/lifeonscreen2fa.php
@@ -8,13 +8,13 @@
 
     'models' => [
         /**
-         * Change this variable to your User model.
+         * Change this variable to path to user model.
          */
         'user' => 'App\User',
     ],
     'tables' => [
         /**
-         * Table in witch users are stored.
+         * Table in which users are stored.
          */
         'user' => 'users',
     ],

diff --git a/src/Google2fa.php b/src/Google2fa.php
@@ -108,11 +108,12 @@ public function authenticate()
                 ->toArray();
 
             User2fa::where('user_id', auth()->user()->id)->delete();
-            User2fa::insert([
-                'user_id'          => auth()->user()->id,
-                'google2fa_secret' => $secretKey,
-                'recovery'         => json_encode($data['recovery']),
-            ]);
+
+            $user2fa = new User2fa();
+            $user2fa->user_id = auth()->user()->id;
+            $user2fa->google2fa_secret = $secretKey;
+            $user2fa->recovery = json_encode($data['recovery']);
+            $user2fa->save();
 
             return response(view('google2fa::recovery', $data));
         }

diff --git a/src/Http/Middleware/Google2fa.php b/src/Http/Middleware/Google2fa.php
@@ -47,11 +47,12 @@ public function handle($request, Closure $next)
                 ->toArray();
 
             User2fa::where('user_id', auth()->user()->id)->delete();
-            User2fa::insert([
-                'user_id'          => auth()->user()->id,
-                'google2fa_secret' => $secretKey,
-                'recovery'         => json_encode($data['recovery']),
-            ]);
+
+            $user2fa = new User2fa();
+            $user2fa->user_id = auth()->user()->id;
+            $user2fa->google2fa_secret = $secretKey;
+            $user2fa->recovery = json_encode($data['recovery']);
+            $user2fa->save();
 
             return response(view('google2fa::recovery', $data));
         }