feature: Two factor authentication

limanmys · Oct 16, 2023 · d00a6ec · d00a6ec
1 parent f6ba894
commit d00a6ec
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 91 deletions.
diff --git a/app/Http/Controllers/API/AuthController.php b/app/Http/Controllers/API/AuthController.php
@@ -94,23 +94,27 @@ public function login(Request $request)
         }
 
         if (auth('api')->user()->otp_enabled) {
-            $tfa = new TwoFactorAuth(
-                "Liman", 6, 30, \RobThree\Auth\Algorithm::Sha1
-            );
+            $tfa = app('pragmarx.google2fa');
+
 
             if (auth('api')->user()->google2fa_secret == null) {
-                $secret = $tfa->createSecret();
+                $secret = $tfa->generateSecretKey();
                 return response()->json([
                     'message' => 'İki faktörlü doğrulama için Google Authenticator uygulaması ile QR kodunu okutunuz.',
                     'secret' => $secret,
-                    'image' => $secret,
+                    'image' => $tfa->getQRCodeInline(
+                        "Liman",
+                        auth('api')->user()->email,
+                        $secret,
+                        400
+                    ),
                 ], 402);
             }
 
             if (! $request->token) {
                 return response()->json(['message' => 'İki faktörlü doğrulama gerekmektedir.'], 406);
             } else {
-                if (! $tfa->verifyCode(
+                if (! $tfa->verifyGoogle2FA(
                     auth('api')->user()->google2fa_secret,
                     $request->token
                 )) {

diff --git a/app/Http/Controllers/API/Settings/UserController.php b/app/Http/Controllers/API/Settings/UserController.php
@@ -25,7 +25,8 @@ class UserController extends Controller
      */
     public function index()
     {
-        return User::all();
+        return User::orderBy('last_login_at', 'desc')
+            ->get();
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -30,7 +30,6 @@
         "phpseclib/phpseclib": "~3.0",
         "pragmarx/google2fa-laravel": "^2.0",
         "pusher/pusher-php-server": "^7.0",
-        "robthree/twofactorauth": "^2.0",
         "tymon/jwt-auth": "^2.0"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,8 @@ class UserController extends Controller @@
          */
         public function index()
         {
-            return User::all();
+            return User::orderBy('last_login_at', 'desc')
+                ->get();
         }
         /**
@@ Expand Down @@