Updated Dutch language files

[bookstack] / app / Services / SocialAuthService.php

diff --git a/app/Services/SocialAuthService.php b/app/Services/SocialAuthService.php
index c96446ddf67e4c519e0b48b57e2ce8e48685b54d..2c15e73ce4d460215ac76a8f44a9ebf9c10e6617 100644 (file)
--- a/app/Services/SocialAuthService.php
+++ b/app/Services/SocialAuthService.php
@@ -1,14 +1,11 @@
 <?php namespace BookStack\Services;
 
 <?php namespace BookStack\Services;
 

-use GuzzleHttp\Exception\ClientException;

 use Laravel\Socialite\Contracts\Factory as Socialite;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialSignInException;
 use BookStack\Exceptions\UserRegistrationException;
 use Laravel\Socialite\Contracts\Factory as Socialite;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialSignInException;
 use BookStack\Exceptions\UserRegistrationException;

-use BookStack\Http\Controllers\Auth\AuthController;

 use BookStack\Repos\UserRepo;
 use BookStack\SocialAccount;
 use BookStack\Repos\UserRepo;
 use BookStack\SocialAccount;

-use BookStack\User;

 
 class SocialAuthService
 {
 
 class SocialAuthService
 {


@@ -17,7 +14,7 @@ class SocialAuthService
     protected $socialite;
     protected $socialAccount;
 
     protected $socialite;
     protected $socialAccount;
 

-    protected $validSocialDrivers = ['google', 'github'];
+    protected $validSocialDrivers = ['google', 'github', 'facebook', 'slack', 'twitter'];

 
     /**
      * SocialAuthService constructor.
 
     /**
      * SocialAuthService constructor.


@@ -73,12 +70,12 @@ class SocialAuthService
 
         // Check social account has not already been used
         if ($this->socialAccount->where('driver_id', '=', $socialUser->getId())->exists()) {
 
         // Check social account has not already been used
         if ($this->socialAccount->where('driver_id', '=', $socialUser->getId())->exists()) {

-            throw new UserRegistrationException('This ' . $socialDriver . ' account is already in use, Try logging in via the ' . $socialDriver . ' option.', '/login');
+            throw new UserRegistrationException(trans('errors.social_account_in_use', ['socialAccount'=>$socialDriver]), '/login');

         }
 
         }
 

-        if($this->userRepo->getByEmail($socialUser->getEmail())) {
+        if ($this->userRepo->getByEmail($socialUser->getEmail())) {

             $email = $socialUser->getEmail();
             $email = $socialUser->getEmail();

-            throw new UserRegistrationException('The email '. $email.' is already in use. If you already have an account you can connect your ' . $socialDriver .' account from your profile settings.', '/login');
+            throw new UserRegistrationException(trans('errors.social_account_in_use', ['socialAccount'=>$socialDriver, 'email' => $email]), '/login');

         }
 
         return $socialUser;
         }
 
         return $socialUser;


@@ -101,9 +98,8 @@ class SocialAuthService
 
         // Get any attached social accounts or users
         $socialAccount = $this->socialAccount->where('driver_id', '=', $socialId)->first();
 
         // Get any attached social accounts or users
         $socialAccount = $this->socialAccount->where('driver_id', '=', $socialId)->first();

-        $user = $this->userRepo->getByEmail($socialUser->getEmail());

         $isLoggedIn = auth()->check();
         $isLoggedIn = auth()->check();

-        $currentUser = auth()->user();
+        $currentUser = user();

 
         // When a user is not logged in and a matching SocialAccount exists,
         // Simply log the user into the application.
 
         // When a user is not logged in and a matching SocialAccount exists,
         // Simply log the user into the application.


@@ -116,28 +112,28 @@ class SocialAuthService
         if ($isLoggedIn && $socialAccount === null) {
             $this->fillSocialAccount($socialDriver, $socialUser);
             $currentUser->socialAccounts()->save($this->socialAccount);
         if ($isLoggedIn && $socialAccount === null) {
             $this->fillSocialAccount($socialDriver, $socialUser);
             $currentUser->socialAccounts()->save($this->socialAccount);

-            \Session::flash('success', title_case($socialDriver) . ' account was successfully attached to your profile.');
+            session()->flash('success', trans('settings.users_social_connected', ['socialAccount' => title_case($socialDriver)]));

             return redirect($currentUser->getEditUrl());
         }
 
         // When a user is logged in and the social account exists and is already linked to the current user.
         if ($isLoggedIn && $socialAccount !== null && $socialAccount->user->id === $currentUser->id) {
             return redirect($currentUser->getEditUrl());
         }
 
         // When a user is logged in and the social account exists and is already linked to the current user.
         if ($isLoggedIn && $socialAccount !== null && $socialAccount->user->id === $currentUser->id) {

-            \Session::flash('error', 'This ' . title_case($socialDriver) . ' account is already attached to your profile.');
+            session()->flash('error', trans('errors.social_account_existing', ['socialAccount' => title_case($socialDriver)]));

             return redirect($currentUser->getEditUrl());
         }
 
         // When a user is logged in, A social account exists but the users do not match.
             return redirect($currentUser->getEditUrl());
         }
 
         // When a user is logged in, A social account exists but the users do not match.

-        // Change the user that the social account is assigned to.

         if ($isLoggedIn && $socialAccount !== null && $socialAccount->user->id != $currentUser->id) {
         if ($isLoggedIn && $socialAccount !== null && $socialAccount->user->id != $currentUser->id) {

-            \Session::flash('success', 'This ' . title_case($socialDriver) . ' account is already used buy another user.');
+            session()->flash('error', trans('errors.social_account_already_used_existing', ['socialAccount' => title_case($socialDriver)]));

             return redirect($currentUser->getEditUrl());
         }
 
         // Otherwise let the user know this social account is not used by anyone.
             return redirect($currentUser->getEditUrl());
         }
 
         // Otherwise let the user know this social account is not used by anyone.

-        $message = 'This ' . $socialDriver . ' account is not linked to any users. Please attach it in your profile settings';
-        if (\Setting::get('registration-enabled')) {
-            $message .= ' or, If you do not yet have an account, You can register an account using the ' . $socialDriver . ' option';
+        $message = trans('errors.social_account_not_used', ['socialAccount' => title_case($socialDriver)]);
+        if (setting('registration-enabled')) {
+            $message .= trans('errors.social_account_register_instructions', ['socialAccount' => title_case($socialDriver)]);

         }
         }

+        

         throw new SocialSignInException($message . '.', '/login');
     }
 
         throw new SocialSignInException($message . '.', '/login');
     }
 


@@ -159,8 +155,8 @@ class SocialAuthService
     {
         $driver = trim(strtolower($socialDriver));
 
     {
         $driver = trim(strtolower($socialDriver));
 

-        if (!in_array($driver, $this->validSocialDrivers)) abort(404, 'Social Driver Not Found');
-        if (!$this->checkDriverConfigured($driver)) throw new SocialDriverNotConfigured;
+        if (!in_array($driver, $this->validSocialDrivers)) abort(404, trans('errors.social_driver_not_found'));
+        if (!$this->checkDriverConfigured($driver)) throw new SocialDriverNotConfigured(trans('errors.social_driver_not_configured', ['socialAccount' => title_case($socialDriver)]));

 
         return $driver;
     }
 
         return $driver;
     }


@@ -172,9 +168,10 @@ class SocialAuthService
      */
     private function checkDriverConfigured($driver)
     {
      */
     private function checkDriverConfigured($driver)
     {

-        $upperName = strtoupper($driver);
-        $config = [env($upperName . '_APP_ID', false), env($upperName . '_APP_SECRET', false), env('APP_URL', false)];
-        return (!in_array(false, $config) && !in_array(null, $config));
+        $lowerName = strtolower($driver);
+        $configPrefix = 'services.' . $lowerName . '.';
+        $config = [config($configPrefix . 'client_id'), config($configPrefix . 'client_secret'), config('services.callback_url')];
+        return !in_array(false, $config) && !in_array(null, $config);

     }
 
     /**
     }
 
     /**


@@ -184,16 +181,26 @@ class SocialAuthService
     public function getActiveDrivers()
     {
         $activeDrivers = [];
     public function getActiveDrivers()
     {
         $activeDrivers = [];

-        foreach ($this->validSocialDrivers as $driverName) {
-            if ($this->checkDriverConfigured($driverName)) {
-                $activeDrivers[$driverName] = true;
+        foreach ($this->validSocialDrivers as $driverKey) {
+            if ($this->checkDriverConfigured($driverKey)) {
+                $activeDrivers[$driverKey] = $this->getDriverName($driverKey);

             }
         }
         return $activeDrivers;
     }
 
     /**
             }
         }
         return $activeDrivers;
     }
 
     /**

-     * @param string $socialDriver
+     * Get the presentational name for a driver.
+     * @param $driver
+     * @return mixed
+     */
+    public function getDriverName($driver)
+    {
+        return config('services.' . strtolower($driver) . '.name');
+    }
+
+    /**
+     * @param string                            $socialDriver

      * @param \Laravel\Socialite\Contracts\User $socialUser
      * @return SocialAccount
      */
      * @param \Laravel\Socialite\Contracts\User $socialUser
      * @return SocialAccount
      */


@@ -214,10 +221,9 @@ class SocialAuthService
      */
     public function detachSocialAccount($socialDriver)
     {
      */
     public function detachSocialAccount($socialDriver)
     {

-        session();
-        auth()->user()->socialAccounts()->where('driver', '=', $socialDriver)->delete();
-        \Session::flash('success', $socialDriver . ' account successfully detached');
-        return redirect(auth()->user()->getEditUrl());
+        user()->socialAccounts()->where('driver', '=', $socialDriver)->delete();
+        session()->flash('success', trans('settings.users_social_disconnected', ['socialAccount' => title_case($socialDriver)]));
+        return redirect(user()->getEditUrl());

     }
 
 }
\ No newline at end of file
     }
 
 }
\ No newline at end of file