Got standard form-based registration working

app/Http/Controllers/Auth/AuthController.php

@@ -2,7 +2,12 @@
 
 namespace Oxbow\Http\Controllers\Auth;
 
+use Illuminate\Http\Request;
 use Oxbow\Exceptions\SocialSignInException;
+use Oxbow\Exceptions\UserRegistrationException;
+use Oxbow\Repos\UserRepo;
+use Oxbow\Services\EmailConfirmationService;
+use Oxbow\Services\Facades\Setting;
 use Oxbow\Services\SocialAuthService;
 use Oxbow\User;
 use Validator;
@@ -30,15 +35,22 @@ class AuthController extends Controller
     protected $redirectAfterLogout = '/login';
 
     protected $socialAuthService;
+    protected $emailConfirmationService;
+    protected $userRepo;
 
     /**
      * Create a new authentication controller instance.
-     * @param SocialAuthService $socialAuthService
+     * @param SocialAuthService        $socialAuthService
+     * @param EmailConfirmationService $emailConfirmationService
+     * @param UserRepo                 $userRepo
      */
-    public function __construct(SocialAuthService $socialAuthService)
+    public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
     {
         $this->middleware('guest', ['only' => ['getLogin', 'postLogin', 'getRegister']]);
         $this->socialAuthService = $socialAuthService;
+        $this->emailConfirmationService = $emailConfirmationService;
+        $this->userRepo = $userRepo;
+        parent::__construct();
     }
 
     /**
@@ -52,7 +64,7 @@ class AuthController extends Controller
         return Validator::make($data, [
             'name'     => 'required|max:255',
             'email'    => 'required|email|max:255|unique:users',
-            'password' => 'required|confirmed|min:6',
+            'password' => 'required|min:6',
         ]);
     }
 
@@ -71,6 +83,13 @@ class AuthController extends Controller
         ]);
     }
 
+    protected function checkRegistrationAllowed()
+    {
+        if(!\Setting::get('registration-enabled')) {
+            throw new UserRegistrationException('Registrations are currently disabled.', '/login');
+        }
+    }
+
     /**
      * Show the application registration form.
      *
@@ -78,10 +97,104 @@ class AuthController extends Controller
      */
     public function getRegister()
     {
+        $this->checkRegistrationAllowed();
         $socialDrivers = $this->socialAuthService->getActiveDrivers();
         return view('auth.register', ['socialDrivers' => $socialDrivers]);
     }
 
+    /**
+     * Handle a registration request for the application.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\Response
+     * @throws UserRegistrationException
+     */
+    public function postRegister(Request $request)
+    {
+        $this->checkRegistrationAllowed();
+        $validator = $this->validator($request->all());
+
+        if ($validator->fails()) {
+            $this->throwValidationException(
+                $request, $validator
+            );
+        }
+
+        if(\Setting::get('registration-restrict')) {
+            $restrictedEmailDomains = explode(',', str_replace(' ', '', \Setting::get('registration-restrict')));
+            $userEmailDomain = $domain = substr(strrchr($request->get('email'), "@"), 1);
+            if(!in_array($userEmailDomain, $restrictedEmailDomains)) {
+                throw new UserRegistrationException('That email domain does not have access to this application', '/register');
+            }
+        }
+
+        $newUser = $this->create($request->all());
+        $newUser->attachRoleId(\Setting::get('registration-role'), 1);
+
+        if(\Setting::get('registration-confirmation') || \Setting::get('registration-restrict')) {
+            $newUser->email_confirmed = false;
+            $newUser->save();
+            $this->emailConfirmationService->sendConfirmation($newUser);
+            return redirect('/register/confirm');
+        }
+
+        auth()->login($newUser);
+        return redirect($this->redirectPath());
+    }
+
+    /**
+     * Show the page to tell the user to check thier email
+     * and confirm their address.
+     */
+    public function getRegisterConfirmation()
+    {
+        return view('auth/register-confirm');
+    }
+
+    /**
+     * Confirms an email via a token and logs the user into the system.
+     * @param $token
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @throws UserRegistrationException
+     */
+    public function confirmEmail($token)
+    {
+        $confirmation = $this->emailConfirmationService->getEmailConfirmationFromToken($token);
+        $user = $confirmation->user;
+        $user->email_confirmed = true;
+        $user->save();
+        auth()->login($confirmation->user);
+        session()->flash('success', 'Your email has been confirmed!');
+        $this->emailConfirmationService->deleteConfirmationsByUser($user);
+        return redirect($this->redirectPath);
+    }
+
+    /**
+     * Shows a notice that a user's email address has not been confirmed,
+     * Also has the option to re-send the confirmation email.
+     * @return \Illuminate\View\View
+     */
+    public function showAwaitingConfirmation()
+    {
+        return view('auth/user-unconfirmed');
+    }
+
+    /**
+     * Resend the confirmation email
+     * @param Request $request
+     * @return \Illuminate\View\View
+     */
+    public function resendConfirmation(Request $request)
+    {
+        $this->validate($request, [
+            'email' => 'required|email|exists:users,email'
+        ]);
+        $user = $this->userRepo->getByEmail($request->get('email'));
+        $this->emailConfirmationService->sendConfirmation($user);
+        \Session::flash('success', 'Confirmation email resent, Please check your inbox.');
+        return redirect('/register/confirm');
+    }
+
     /**
      * Show the application login form.
      *