Merge branch 'release/v0.7.14' into feature/react

2019-06-22 12:28:44 -07:00 · 2019-06-22 12:28:44 -07:00 · 56640253b9
commit 56640253b9
parent 2a626a3e1f c38f78df84
16 changed files with 178 additions and 59 deletions
--- a/app/Http/Controllers/Base/SecurityController.php
+++ b/app/Http/Controllers/Base/SecurityController.php
@ -83,8 +83,8 @@ class SecurityController extends Controller

        return JsonResponse::create([
            'enabled' => false,
-            'qr_image' => $response->get('image'),
-            'secret' => $response->get('secret'),
+            'qr_image' => $response,
+            'secret' => '',
        ]);
    }