refactor: replace custom CRM with Monica fork
Some checks failed
Build & Push Monica Image to Gitea Registry / build-and-push (push) Failing after 9s
Some checks failed
Build & Push Monica Image to Gitea Registry / build-and-push (push) Failing after 9s
This commit is contained in:
118
app/Http/Controllers/Auth/EmailChangeController.php
Normal file
118
app/Http/Controllers/Auth/EmailChangeController.php
Normal file
@@ -0,0 +1,118 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Models\User\User;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Services\User\EmailChange;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use App\Http\Requests\EmailChangeRequest;
|
||||
use Illuminate\Foundation\Auth\AuthenticatesUsers;
|
||||
|
||||
class EmailChangeController extends Controller
|
||||
{
|
||||
use AuthenticatesUsers;
|
||||
|
||||
/**
|
||||
* Where to redirect users after login / registration.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $redirectTo = '/settings/emailchange2';
|
||||
|
||||
/**
|
||||
* Show the application's login form.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
|
||||
*/
|
||||
public function showLoginFormSpecial(Request $request)
|
||||
{
|
||||
$user = $request->user();
|
||||
if ($user &&
|
||||
$user instanceof User &&
|
||||
! $user->hasVerifiedEmail()) {
|
||||
return view('auth.emailchange1')
|
||||
->with('email', $user->email);
|
||||
}
|
||||
|
||||
return redirect()->route('login');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function index(Request $request): \Illuminate\View\View
|
||||
{
|
||||
$user = auth()->user();
|
||||
|
||||
return view('auth.emailchange2')
|
||||
->with('email', $user->email);
|
||||
}
|
||||
|
||||
/**
|
||||
* Change user email.
|
||||
*
|
||||
* @param EmailChangeRequest $request
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function save(EmailChangeRequest $request)
|
||||
{
|
||||
$response = $this->validateAndEmailChange($request);
|
||||
|
||||
return $response == 'auth.email_changed'
|
||||
? $this->sendChangedResponse($response)
|
||||
: $this->sendChangedFailedResponse($response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate a password change request and update password of the user.
|
||||
*
|
||||
* @param EmailChangeRequest $request
|
||||
* @return mixed
|
||||
*/
|
||||
protected function validateAndEmailChange(EmailChangeRequest $request)
|
||||
{
|
||||
$user = $request->user();
|
||||
|
||||
app(EmailChange::class)->execute([
|
||||
'account_id' => $user->account_id,
|
||||
'email' => $request->input('newmail'),
|
||||
'user_id' => $user->id,
|
||||
]);
|
||||
|
||||
// Logout the user
|
||||
Auth::guard()->logout();
|
||||
$request->session()->invalidate();
|
||||
|
||||
return 'auth.email_changed';
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the response for a successful password changed.
|
||||
*
|
||||
* @param string $response
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
protected function sendChangedResponse($response)
|
||||
{
|
||||
return redirect()->route('login')
|
||||
->with('status', trans($response));
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the response for a failed password.
|
||||
*
|
||||
* @param string $response
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
protected function sendChangedFailedResponse($response)
|
||||
{
|
||||
return redirect()->route('login')
|
||||
->withErrors(trans($response));
|
||||
}
|
||||
}
|
||||
22
app/Http/Controllers/Auth/ForgotPasswordController.php
Normal file
22
app/Http/Controllers/Auth/ForgotPasswordController.php
Normal file
@@ -0,0 +1,22 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
|
||||
|
||||
class ForgotPasswordController extends Controller
|
||||
{
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reset Controller
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| This controller is responsible for handling password reset emails and
|
||||
| includes a trait which assists in sending these notifications from
|
||||
| your application to your users. Feel free to explore this trait.
|
||||
|
|
||||
*/
|
||||
|
||||
use SendsPasswordResetEmails;
|
||||
}
|
||||
150
app/Http/Controllers/Auth/InvitationController.php
Normal file
150
app/Http/Controllers/Auth/InvitationController.php
Normal file
@@ -0,0 +1,150 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Helpers\RequestHelper;
|
||||
use App\Jobs\SendNewUserAlert;
|
||||
use App\Services\User\CreateUser;
|
||||
use App\Models\Account\Invitation;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Auth\Events\Registered;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Foundation\Auth\RedirectsUsers;
|
||||
use Illuminate\Validation\Rules\Password as PasswordRules;
|
||||
|
||||
class InvitationController extends Controller
|
||||
{
|
||||
use RedirectsUsers;
|
||||
|
||||
/**
|
||||
* Where to redirect users after login / registration.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $redirectTo = '/dashboard';
|
||||
|
||||
/**
|
||||
* Create a new controller instance.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('guest');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param string $key
|
||||
* @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function show($key)
|
||||
{
|
||||
if (Auth::check()) {
|
||||
return redirect()->route('loginRedirect');
|
||||
}
|
||||
|
||||
$invitation = Invitation::where('invitation_key', $key)
|
||||
->firstOrFail();
|
||||
|
||||
return view('settings.users.accept')
|
||||
->withKey($key)
|
||||
->withEmail($invitation->email);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a validator for an incoming registration request.
|
||||
*
|
||||
* @param array $data
|
||||
* @return \Illuminate\Contracts\Validation\Validator
|
||||
*/
|
||||
protected function validator(array $data)
|
||||
{
|
||||
return Validator::make($data, [
|
||||
'last_name' => 'required|max:255',
|
||||
'first_name' => 'required|max:255',
|
||||
'email' => 'required|email|max:255|unique:users',
|
||||
'email_security' => 'required',
|
||||
'password' => ['required', 'confirmed', PasswordRules::defaults()],
|
||||
'policy' => 'required',
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store the specified resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param string $key
|
||||
* @return null|\Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function store(Request $request, $key)
|
||||
{
|
||||
$this->validator($request->all())->validate();
|
||||
|
||||
$invitation = Invitation::where('invitation_key', $key)
|
||||
->firstOrFail();
|
||||
|
||||
// as a security measure, make sure that the new user provides the email
|
||||
// of the person who has invited him/her.
|
||||
if ($request->input('email_security') != $invitation->invitedBy->email) {
|
||||
return redirect()->back()->withErrors(trans('settings.users_error_email_not_similar'))->withInput();
|
||||
}
|
||||
|
||||
event(new Registered($user = $this->create($request->all(), $invitation)));
|
||||
|
||||
$invitation->delete();
|
||||
|
||||
/** @var \Illuminate\Contracts\Auth\StatefulGuard */
|
||||
$guard = Auth::guard();
|
||||
$guard->login($user);
|
||||
|
||||
$this->registered($request, $user);
|
||||
|
||||
return redirect($this->redirectPath());
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new user instance after a valid registration.
|
||||
*
|
||||
* @param array $data
|
||||
* @param mixed $invitation
|
||||
* @return \App\Models\User\User
|
||||
*/
|
||||
protected function create(array $data, $invitation)
|
||||
{
|
||||
$user = app(CreateUser::class)->execute([
|
||||
'account_id' => $invitation->account_id,
|
||||
'first_name' => $data['first_name'],
|
||||
'last_name' => $data['last_name'],
|
||||
'email' => $data['email'],
|
||||
'password' => $data['password'],
|
||||
'locale' => $invitation->invitedBy->locale,
|
||||
'ip_address' => RequestHelper::ip(),
|
||||
]);
|
||||
$user->invited_by_user_id = $invitation->invited_by_user_id;
|
||||
$user->save();
|
||||
|
||||
// send me an alert
|
||||
SendNewUserAlert::dispatch($user);
|
||||
|
||||
return $user;
|
||||
}
|
||||
|
||||
/**
|
||||
* The user has been registered.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param mixed $user
|
||||
* @return void
|
||||
*/
|
||||
protected function registered(Request $request, $user)
|
||||
{
|
||||
if (! config('monica.signup_double_optin')) {
|
||||
// if signup_double_optin is disabled, skip the confirm email part
|
||||
$user->markEmailAsVerified();
|
||||
}
|
||||
}
|
||||
}
|
||||
50
app/Http/Controllers/Auth/LoginController.php
Normal file
50
app/Http/Controllers/Auth/LoginController.php
Normal file
@@ -0,0 +1,50 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Helpers\InstanceHelper;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Foundation\Auth\AuthenticatesUsers;
|
||||
|
||||
class LoginController extends Controller
|
||||
{
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Login Controller
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| This controller handles authenticating users for the application and
|
||||
| redirecting them to your home screen. The controller uses a trait
|
||||
| to conveniently provide its functionality to your applications.
|
||||
|
|
||||
*/
|
||||
|
||||
use AuthenticatesUsers;
|
||||
|
||||
/**
|
||||
* Where to redirect users after login / registration.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $redirectTo = '/dashboard';
|
||||
|
||||
/**
|
||||
* Create a new controller instance.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('guest', ['except' => 'logout']);
|
||||
}
|
||||
|
||||
public function showLoginOrRegister()
|
||||
{
|
||||
$first = ! InstanceHelper::hasAtLeastOneAccount();
|
||||
if ($first) {
|
||||
return redirect()->route('register');
|
||||
}
|
||||
|
||||
return $this->showLoginForm();
|
||||
}
|
||||
}
|
||||
157
app/Http/Controllers/Auth/PasswordChangeController.php
Normal file
157
app/Http/Controllers/Auth/PasswordChangeController.php
Normal file
@@ -0,0 +1,157 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Models\User\User;
|
||||
use Illuminate\Support\Str;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Auth\Events\PasswordReset;
|
||||
use App\Http\Requests\PasswordChangeRequest;
|
||||
use Illuminate\Contracts\Auth\Authenticatable;
|
||||
use Illuminate\Foundation\Auth\RedirectsUsers;
|
||||
use Illuminate\Contracts\Auth\CanResetPassword;
|
||||
|
||||
class PasswordChangeController extends Controller
|
||||
{
|
||||
use RedirectsUsers;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $redirectTo = '/settings/security';
|
||||
|
||||
/**
|
||||
* Get useful parameters from request.
|
||||
*
|
||||
* @param \App\Http\Requests\PasswordChangeRequest $request
|
||||
* @return array
|
||||
*/
|
||||
protected function credentials(PasswordChangeRequest $request)
|
||||
{
|
||||
return $request->only(
|
||||
'password_current', 'password', 'password_confirmation'
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Change user password.
|
||||
*
|
||||
* @param \App\Http\Requests\PasswordChangeRequest $request
|
||||
*/
|
||||
public function passwordChange(PasswordChangeRequest $request)
|
||||
{
|
||||
$credentials = $this->credentials($request);
|
||||
|
||||
$response = $this->validateAndPasswordChange($credentials);
|
||||
|
||||
return $response === 'passwords.changed'
|
||||
? $this->sendChangedResponse($response)
|
||||
: $this->sendChangedFailedResponse($response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate a password change request and update password of the user.
|
||||
*
|
||||
* @param array $credentials
|
||||
* @return string|Authenticatable
|
||||
*/
|
||||
protected function validateAndPasswordChange($credentials)
|
||||
{
|
||||
$user = $this->validateChange($credentials);
|
||||
if (! $user instanceof CanResetPassword) {
|
||||
return $user;
|
||||
}
|
||||
|
||||
if ($user instanceof User) {
|
||||
$this->setNewPassword($user, $credentials['password']);
|
||||
}
|
||||
|
||||
return 'passwords.changed';
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate a password change request with the given credentials.
|
||||
*
|
||||
* @param array $credentials
|
||||
* @return string|Authenticatable
|
||||
*
|
||||
* @throws \UnexpectedValueException
|
||||
*/
|
||||
protected function validateChange(array $credentials)
|
||||
{
|
||||
if (is_null($user = $this->getUser($credentials))) {
|
||||
return 'passwords.invalid';
|
||||
}
|
||||
|
||||
return $user;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the user with the given credentials.
|
||||
*
|
||||
* @param array $credentials
|
||||
* @return null|Authenticatable
|
||||
*/
|
||||
protected function getUser(array $credentials): ?Authenticatable
|
||||
{
|
||||
/** @var User */
|
||||
$user = Auth::user();
|
||||
|
||||
// Using current email from user, and current password sent with the request to authenticate the user
|
||||
if (! Auth::attempt([
|
||||
'email' => $user->getEmailForPasswordReset(),
|
||||
'password' => $credentials['password_current'],
|
||||
])) {
|
||||
// authentication fails
|
||||
return null;
|
||||
}
|
||||
|
||||
return $user;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the new password if all validation has passed.
|
||||
*
|
||||
* @param User $user
|
||||
* @param string $password
|
||||
* @return void
|
||||
*/
|
||||
protected function setNewPassword($user, $password)
|
||||
{
|
||||
$user->password = Hash::make($password);
|
||||
|
||||
$user->setRememberToken(Str::random(60));
|
||||
|
||||
$user->save();
|
||||
|
||||
event(new PasswordReset($user));
|
||||
|
||||
Auth::guard()->login($user);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the response for a successful password change.
|
||||
*
|
||||
* @param string $response
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
protected function sendChangedResponse($response)
|
||||
{
|
||||
return redirect($this->redirectPath())
|
||||
->with('status', trans($response));
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the response for a failed password change.
|
||||
*
|
||||
* @param string $response
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
protected function sendChangedFailedResponse($response)
|
||||
{
|
||||
return redirect($this->redirectPath())
|
||||
->withErrors(['password' => trans($response)]);
|
||||
}
|
||||
}
|
||||
69
app/Http/Controllers/Auth/RecoveryLoginController.php
Normal file
69
app/Http/Controllers/Auth/RecoveryLoginController.php
Normal file
@@ -0,0 +1,69 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Events\RecoveryLogin;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Foundation\Auth\RedirectsUsers;
|
||||
|
||||
class RecoveryLoginController extends Controller
|
||||
{
|
||||
use RedirectsUsers;
|
||||
|
||||
/**
|
||||
* Where to redirect users after login / registration.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $redirectTo = '/dashboard';
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory
|
||||
*/
|
||||
public function get(Request $request)
|
||||
{
|
||||
return view('auth.recovery.login');
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate recovery login.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
Validator::make($request->all(), [
|
||||
'recovery' => 'required',
|
||||
])->validate();
|
||||
|
||||
$user = auth()->user();
|
||||
$recovery = $request->input('recovery');
|
||||
|
||||
if ($user instanceof \App\Models\User\User &&
|
||||
$user->recoveryChallenge($recovery)) {
|
||||
$this->fireLoginEvent($user);
|
||||
} else {
|
||||
abort(403);
|
||||
}
|
||||
|
||||
return redirect($this->redirectPath());
|
||||
}
|
||||
|
||||
/**
|
||||
* Fire the login event.
|
||||
*
|
||||
* @param \Illuminate\Contracts\Auth\Authenticatable $user
|
||||
* @return void
|
||||
*/
|
||||
protected function fireLoginEvent($user)
|
||||
{
|
||||
Event::dispatch(new RecoveryLogin($user));
|
||||
}
|
||||
}
|
||||
140
app/Http/Controllers/Auth/RegisterController.php
Normal file
140
app/Http/Controllers/Auth/RegisterController.php
Normal file
@@ -0,0 +1,140 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Models\User\User;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Helpers\LocaleHelper;
|
||||
use App\Helpers\RequestHelper;
|
||||
use App\Jobs\SendNewUserAlert;
|
||||
use App\Helpers\InstanceHelper;
|
||||
use App\Models\Account\Account;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Foundation\Auth\RegistersUsers;
|
||||
use Illuminate\Validation\Rules\Password as PasswordRules;
|
||||
|
||||
class RegisterController extends Controller
|
||||
{
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Register Controller
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| This controller handles the registration of new users as well as their
|
||||
| validation and creation. By default this controller uses a trait to
|
||||
| provide this functionality without requiring any additional code.
|
||||
|
|
||||
*/
|
||||
|
||||
use RegistersUsers;
|
||||
|
||||
/**
|
||||
* Where to redirect users after login / registration.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $redirectTo = '/dashboard';
|
||||
|
||||
/**
|
||||
* Create a new controller instance.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('guest');
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the application registration form.
|
||||
*
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function showRegistrationForm(Request $request)
|
||||
{
|
||||
$first = ! InstanceHelper::hasAtLeastOneAccount();
|
||||
if (config('monica.disable_signup') == 'true' && ! $first) {
|
||||
abort(403, trans('auth.signup_disabled'));
|
||||
}
|
||||
|
||||
return view('auth.register')
|
||||
->withFirst($first)
|
||||
->withLocales(LocaleHelper::getLocaleList()->sortByCollator('lang'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a validator for an incoming registration request.
|
||||
*
|
||||
* @param array $data
|
||||
* @return \Illuminate\Contracts\Validation\Validator
|
||||
*/
|
||||
protected function validator(array $data)
|
||||
{
|
||||
return Validator::make($data, [
|
||||
'last_name' => 'required|max:255',
|
||||
'first_name' => 'required|max:255',
|
||||
'email' => 'required|email|max:255|unique:users',
|
||||
'password' => ['required', 'confirmed', PasswordRules::defaults()],
|
||||
'policy' => 'required',
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new user instance after a valid registration.
|
||||
*
|
||||
* @param array $data
|
||||
* @return User|null
|
||||
*/
|
||||
protected function create(array $data): ?User
|
||||
{
|
||||
$first = ! InstanceHelper::hasAtLeastOneAccount();
|
||||
if (config('monica.disable_signup') == 'true' && ! $first) {
|
||||
abort(403, trans('auth.signup_disabled'));
|
||||
}
|
||||
|
||||
try {
|
||||
$account = Account::createDefault(
|
||||
$data['first_name'],
|
||||
$data['last_name'],
|
||||
$data['email'],
|
||||
$data['password'],
|
||||
RequestHelper::ip(),
|
||||
$data['lang']
|
||||
);
|
||||
/** @var User */
|
||||
$user = $account->users()->first();
|
||||
|
||||
if (! $first) {
|
||||
// send me an alert
|
||||
SendNewUserAlert::dispatch($user);
|
||||
}
|
||||
|
||||
return $user;
|
||||
} catch (\Exception $e) {
|
||||
Log::error($e);
|
||||
|
||||
abort(500, trans('auth.signup_error'));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The user has been registered.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param mixed $user
|
||||
* @return mixed
|
||||
*/
|
||||
protected function registered(Request $request, $user)
|
||||
{
|
||||
if (! is_null($user)) {
|
||||
/** @var int $count */
|
||||
$count = Account::count();
|
||||
if (! config('monica.signup_double_optin') || $count == 1) {
|
||||
// if signup_double_optin is disabled, skip the confirm email part
|
||||
$user->markEmailAsVerified();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
42
app/Http/Controllers/Auth/ResetPasswordController.php
Normal file
42
app/Http/Controllers/Auth/ResetPasswordController.php
Normal file
@@ -0,0 +1,42 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Foundation\Auth\ResetsPasswords;
|
||||
use Illuminate\Validation\Rules\Password as PasswordRules;
|
||||
|
||||
class ResetPasswordController extends Controller
|
||||
{
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Password Reset Controller
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| This controller is responsible for handling password reset requests
|
||||
| and uses a simple trait to include this behavior. You're free to
|
||||
| explore this trait and override any methods you wish to tweak.
|
||||
|
|
||||
*/
|
||||
|
||||
use ResetsPasswords;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $redirectTo = '/dashboard';
|
||||
|
||||
/**
|
||||
* Get the password reset validation rules.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
protected function rules()
|
||||
{
|
||||
return [
|
||||
'token' => 'required',
|
||||
'email' => 'required|email',
|
||||
'password' => ['required', 'confirmed', PasswordRules::defaults()],
|
||||
];
|
||||
}
|
||||
}
|
||||
35
app/Http/Controllers/Auth/Validate2faController.php
Normal file
35
app/Http/Controllers/Auth/Validate2faController.php
Normal file
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use PragmaRX\Google2FALaravel\Facade as Google2FA;
|
||||
|
||||
class Validate2faController extends Controller
|
||||
{
|
||||
/**
|
||||
* Redirect the user after 2fa form has been submitted.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\Http\JsonResponse|\Illuminate\Http\Response
|
||||
*/
|
||||
public function index(Request $request)
|
||||
{
|
||||
if ($request->session()->get('oauth')) {
|
||||
return Route::respondWithRoute('oauth.verify');
|
||||
}
|
||||
if ($request->has('url')) {
|
||||
return redirect(urldecode($request->input('url')));
|
||||
}
|
||||
|
||||
return redirect()->route('login');
|
||||
}
|
||||
|
||||
public static function loginCallback()
|
||||
{
|
||||
app('pragmarx.google2fa')->setStateless(false);
|
||||
Google2FA::login();
|
||||
}
|
||||
}
|
||||
41
app/Http/Controllers/Auth/VerificationController.php
Normal file
41
app/Http/Controllers/Auth/VerificationController.php
Normal file
@@ -0,0 +1,41 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Foundation\Auth\VerifiesEmails;
|
||||
|
||||
class VerificationController extends Controller
|
||||
{
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Email Verification Controller
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| This controller is responsible for handling email verification for any
|
||||
| user that recently registered with the application. Emails may also
|
||||
| be re-sent if the user didn't receive the original email message.
|
||||
|
|
||||
*/
|
||||
|
||||
use VerifiesEmails;
|
||||
|
||||
/**
|
||||
* Where to redirect users after verification.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $redirectTo = '/dashboard';
|
||||
|
||||
/**
|
||||
* Create a new controller instance.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth');
|
||||
$this->middleware('signed')->only('verify');
|
||||
$this->middleware('throttle:6,1')->only('verify', 'resend');
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user