Reviewed #2393, Removed image guessing and added testing

[bookstack] / app / Http / Controllers / Auth / SocialController.php

diff --git a/app/Http/Controllers/Auth/SocialController.php b/app/Http/Controllers/Auth/SocialController.php
index bcd82a9c03567a56ae885257b8697d2411574bbe..447f0afc9358f85eb8e7975ea08930878c332c1a 100644 (file)
--- a/app/Http/Controllers/Auth/SocialController.php
+++ b/app/Http/Controllers/Auth/SocialController.php
@@ -2,16 +2,17 @@
 
 namespace BookStack\Http\Controllers\Auth;
 
 
 namespace BookStack\Http\Controllers\Auth;
 

+use BookStack\Actions\ActivityType;

 use BookStack\Auth\Access\RegistrationService;
 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialSignInAccountNotUsed;
 use BookStack\Exceptions\SocialSignInException;
 use BookStack\Exceptions\UserRegistrationException;
 use BookStack\Auth\Access\RegistrationService;
 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialSignInAccountNotUsed;
 use BookStack\Exceptions\SocialSignInException;
 use BookStack\Exceptions\UserRegistrationException;

+use BookStack\Facades\Theme;

 use BookStack\Http\Controllers\Controller;
 use BookStack\Http\Controllers\Controller;

-use Illuminate\Http\RedirectResponse;
+use BookStack\Theming\ThemeEvents;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

-use Illuminate\Routing\Redirector;

 use Illuminate\Support\Str;
 use Laravel\Socialite\Contracts\User as SocialUser;
 
 use Illuminate\Support\Str;
 use Laravel\Socialite\Contracts\User as SocialUser;
 


@@ -31,12 +32,11 @@ class SocialController extends Controller
         $this->registrationService = $registrationService;
     }
 
         $this->registrationService = $registrationService;
     }
 

-

     /**
      * Redirect to the relevant social site.
     /**
      * Redirect to the relevant social site.

-     * @throws \BookStack\Exceptions\SocialDriverNotConfigured
+     * @throws SocialDriverNotConfigured

      */
      */

-    public function getSocialLogin(string $socialDriver)
+    public function login(string $socialDriver)

     {
         session()->put('social-callback', 'login');
         return $this->socialAuthService->startLogIn($socialDriver);
     {
         session()->put('social-callback', 'login');
         return $this->socialAuthService->startLogIn($socialDriver);


@@ -47,9 +47,9 @@ class SocialController extends Controller
      * @throws SocialDriverNotConfigured
      * @throws UserRegistrationException
      */
      * @throws SocialDriverNotConfigured
      * @throws UserRegistrationException
      */

-    public function socialRegister(string $socialDriver)
+    public function register(string $socialDriver)

     {
     {

-        $this->registrationService->checkRegistrationAllowed();
+        $this->registrationService->ensureRegistrationAllowed();

         session()->put('social-callback', 'register');
         return $this->socialAuthService->startRegister($socialDriver);
     }
         session()->put('social-callback', 'register');
         return $this->socialAuthService->startRegister($socialDriver);
     }


@@ -60,7 +60,7 @@ class SocialController extends Controller
      * @throws SocialDriverNotConfigured
      * @throws UserRegistrationException
      */
      * @throws SocialDriverNotConfigured
      * @throws UserRegistrationException
      */

-    public function socialCallback(Request $request, string $socialDriver)
+    public function callback(Request $request, string $socialDriver)

     {
         if (!session()->has('social-callback')) {
             throw new SocialSignInException(trans('errors.social_no_action_defined'), '/login');
     {
         if (!session()->has('social-callback')) {
             throw new SocialSignInException(trans('errors.social_no_action_defined'), '/login');


@@ -78,7 +78,7 @@ class SocialController extends Controller
 
         // Attempt login or fall-back to register if allowed.
         $socialUser = $this->socialAuthService->getSocialUser($socialDriver);
 
         // Attempt login or fall-back to register if allowed.
         $socialUser = $this->socialAuthService->getSocialUser($socialDriver);

-        if ($action == 'login') {
+        if ($action === 'login') {

             try {
                 return $this->socialAuthService->handleLoginCallback($socialDriver, $socialUser);
             } catch (SocialSignInAccountNotUsed $exception) {
             try {
                 return $this->socialAuthService->handleLoginCallback($socialDriver, $socialUser);
             } catch (SocialSignInAccountNotUsed $exception) {


@@ -89,7 +89,7 @@ class SocialController extends Controller
             }
         }
 
             }
         }
 

-        if ($action == 'register') {
+        if ($action === 'register') {

             return $this->socialRegisterCallback($socialDriver, $socialUser);
         }
 
             return $this->socialRegisterCallback($socialDriver, $socialUser);
         }
 


@@ -99,7 +99,7 @@ class SocialController extends Controller
     /**
      * Detach a social account from a user.
      */
     /**
      * Detach a social account from a user.
      */

-    public function detachSocialAccount(string $socialDriver)
+    public function detach(string $socialDriver)

     {
         $this->socialAuthService->detachSocialAccount($socialDriver);
         session()->flash('success', trans('settings.users_social_disconnected', ['socialAccount' => Str::title($socialDriver)]));
     {
         $this->socialAuthService->detachSocialAccount($socialDriver);
         session()->flash('success', trans('settings.users_social_disconnected', ['socialAccount' => Str::title($socialDriver)]));


@@ -108,31 +108,31 @@ class SocialController extends Controller
 
     /**
      * Register a new user after a registration callback.
 
     /**
      * Register a new user after a registration callback.

-     * @return RedirectResponse|Redirector

      * @throws UserRegistrationException
      */
     protected function socialRegisterCallback(string $socialDriver, SocialUser $socialUser)
     {
         $socialUser = $this->socialAuthService->handleRegistrationCallback($socialDriver, $socialUser);
      * @throws UserRegistrationException
      */
     protected function socialRegisterCallback(string $socialDriver, SocialUser $socialUser)
     {
         $socialUser = $this->socialAuthService->handleRegistrationCallback($socialDriver, $socialUser);

-        $socialAccount = $this->socialAuthService->fillSocialAccount($socialDriver, $socialUser);
+        $socialAccount = $this->socialAuthService->newSocialAccount($socialDriver, $socialUser);

         $emailVerified = $this->socialAuthService->driverAutoConfirmEmailEnabled($socialDriver);
 
         // Create an array of the user data to create a new user instance
         $userData = [
             'name' => $socialUser->getName(),
             'email' => $socialUser->getEmail(),
         $emailVerified = $this->socialAuthService->driverAutoConfirmEmailEnabled($socialDriver);
 
         // Create an array of the user data to create a new user instance
         $userData = [
             'name' => $socialUser->getName(),
             'email' => $socialUser->getEmail(),

-            'password' => Str::random(30)
+            'password' => Str::random(32)

         ];
 
         ];
 

-        try {
-            $this->registrationService->registerUser($userData, $socialAccount, $emailVerified);
-        } catch (UserRegistrationException $exception) {
-            if ($exception->getMessage()) {
-                $this->showErrorNotification($exception->getMessage());
-            }
-            return redirect($exception->redirectLocation);
+        // Take name from email address if empty
+        if (!$userData['name']) {
+            $userData['name'] = explode('@', $userData['email'])[0];

         }
 
         }
 

+        $user = $this->registrationService->registerUser($userData, $socialAccount, $emailVerified);
+        auth()->login($user);
+        Theme::dispatch(ThemeEvents::AUTH_LOGIN, $socialDriver, $user);
+        $this->logActivity(ActivityType::AUTH_LOGIN, $user);
+

         $this->showSuccessNotification(trans('auth.register_success'));
         return redirect('/');
     }
         $this->showSuccessNotification(trans('auth.register_success'));
         return redirect('/');
     }