From 534600034e81713930bf76ee6dae31f29dbeb686 Mon Sep 17 00:00:00 2001 From: Louis Jeckel Date: Thu, 15 Oct 2020 13:18:56 +0200 Subject: [PATCH] registreation options --- app/Http/Controllers/AccountController.php | 3 --- .../Controllers/Auth/RegisterController.php | 4 +++- app/Http/Middleware/ForceJsonResponse.php | 22 +++++++++++++++++++ resources/views/auth/register.blade.php | 13 +++++++++++ routes/web.php | 2 -- 5 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 app/Http/Middleware/ForceJsonResponse.php diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 25bb4c9..c972f45 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -86,9 +86,6 @@ class AccountController extends Controller 'wants_pdf' => $request->boolean('wantsPdf'), ]); - $user->markEmailAsVerified(); - - LoginToken::where('token', $request->input('login_token'))->delete(); Session::flash('message', "Informations enregistrées avec succès !"); diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 9539c3a..5c9ec41 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -106,7 +106,9 @@ class RegisterController extends Controller ] ); - $user->startTrial(); + if(! request()->boolean('no_trial')){ + $user->startTrial(); + } // $user->sendEmailVerificationNotification(); diff --git a/app/Http/Middleware/ForceJsonResponse.php b/app/Http/Middleware/ForceJsonResponse.php new file mode 100644 index 0000000..9f6fdb0 --- /dev/null +++ b/app/Http/Middleware/ForceJsonResponse.php @@ -0,0 +1,22 @@ +headers->set('Accept', 'application/json'); + + return $next($request); + } +} diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 82f1c56..bcce159 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -104,6 +104,19 @@ +
+
+
+ + + +
+ +
+
+
diff --git a/routes/web.php b/routes/web.php index da27e72..f1ee268 100644 --- a/routes/web.php +++ b/routes/web.php @@ -29,8 +29,6 @@ Route::domain(env('ADMIN_DOMAIN_NAME'))->middleware('auth:twill_users')->group(f }); -Route::get('/login-now', function() { \Auth::loginUsingId(2555); }); - /** Client routes */ Route::domain(env('CLIENT_DOMAIN_NAME'))->group(function() { /** Home */ -- 2.39.5