implement social auto registration feature

diff --git a/app/Repos/UserRepo.php b/app/Repos/UserRepo.php
index d113b676ab5a3616a73232a91dae7f1f2734cbc6..b828a582b40b08b023a623e8918e8327591b3f55 100644 (file)
--- a/app/Repos/UserRepo.php
+++ b/app/Repos/UserRepo.php
@@ -76,14 +76,15 @@ class UserRepo
         return $query->paginate($count);
     }
 
         return $query->paginate($count);
     }
 

-    /**
+        /**

      * Creates a new user and attaches a role to them.
      * @param array $data
      * Creates a new user and attaches a role to them.
      * @param array $data

+     * @param boolean autoVerifyEmail

      * @return User
      */
      * @return User
      */

-    public function registerNew(array $data)
+    public function registerNew(array $data, $autoVerifyEmail=false)

     {
     {

-        $user = $this->create($data);
+        $user = $this->create($data, $autoVerifyEmail);

         $this->attachDefaultRole($user);
 
         // Get avatar from gravatar and save
         $this->attachDefaultRole($user);
 
         // Get avatar from gravatar and save


@@ -143,13 +144,14 @@ class UserRepo
      * @param array $data
      * @return User
      */
      * @param array $data
      * @return User
      */

-    public function create(array $data)
+    public function create(array $data, $autoVerifyEmail)

     {
     {

+

         return $this->user->forceCreate([
             'name'     => $data['name'],
             'email'    => $data['email'],
             'password' => bcrypt($data['password']),
         return $this->user->forceCreate([
             'name'     => $data['name'],
             'email'    => $data['email'],
             'password' => bcrypt($data['password']),

-            'email_confirmed' => false
+            'email_confirmed' => $autoVerifyEmail

         ]);
     }
 
         ]);
     }
 


@@ -259,4 +261,4 @@ class UserRepo
             return false;
         }
     }
             return false;
         }
     }

-}
+}
\ No newline at end of file

diff --git a/app/Services/SocialAuthService.php b/app/Services/SocialAuthService.php
index dac6b7773690b42d4576dd77272dce3f28de1d74..6b4c221b0fbd63782b163a7b9be37dacf6361179 100644 (file)
--- a/app/Services/SocialAuthService.php
+++ b/app/Services/SocialAuthService.php
@@ -109,6 +109,40 @@ class SocialAuthService
             return redirect()->intended('/');
         }
 
             return redirect()->intended('/');
         }
 

+        // When a user is not logged in and no matching SocialAccount exists,
+        // If the auto social registration is enabled, attach the social account, create new user and log him in.
+        if (!$isLoggedIn && $socialAccount === null && setting('autosocialregistration-confirmation')) {
+
+            // Fill social account
+            $socialAccount = $this->fillSocialAccount($socialDriver, $socialUser);
+
+            // Create an array of the user data to create a new user instance
+            $userData = [
+                'name' => $socialUser->getName(),
+                'email' => $socialUser->getEmail(),
+                'password' => str_random(30)
+            ];
+
+            // Check domain if domain restriction setting is set
+            if (setting('registration-restrict')) {
+                $restrictedEmailDomains = explode(',', str_replace(' ', '', setting('registration-restrict')));
+                $userEmailDomain = $domain = substr(strrchr($socialUser->getEmail(), "@"), 1);
+                if (!in_array($userEmailDomain, $restrictedEmailDomains)) {
+                    throw new SocialSignInException(trans('auth.registration_email_domain_invalid'), '/login');
+                }
+            }
+
+            // Register new user with autoVerifyEmail set to true and attach the social account
+            $newUser = $this->userRepo->registerNew($userData, true);
+            $newUser->socialAccounts()->save($socialAccount);
+            $newUser->save();
+
+            // Log him in
+            auth()->login($newUser);
+
+            return redirect()->intended('/');
+        }
+

         // When a user is logged in but the social account does not exist,
         // Create the social account and attach it to the user & redirect to the profile page.
         if ($isLoggedIn && $socialAccount === null) {
         // When a user is logged in but the social account does not exist,
         // Create the social account and attach it to the user & redirect to the profile page.
         if ($isLoggedIn && $socialAccount === null) {

diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index d6fbb6107c51454965252c8c605ab00dc81dac3a..82430152253b48786ed81a7a09497133eb39ff0d 100755 (executable)
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -44,6 +44,8 @@ return [
 
     'reg_settings' => 'Registration Settings',
     'reg_allow' => 'Allow registration?',
 
     'reg_settings' => 'Registration Settings',
     'reg_allow' => 'Allow registration?',

+    'reg_auto_social_allow'  => 'Allow auto social registration?',
+    'reg_auto_social_allow_desc' => 'If the social user doesn\'t exist, automatically sign him up. Domain restriction is respected if set. Email is also automatically validated for this kind of social registration.',

     'reg_default_role' => 'Default user role after registration',
     'reg_confirm_email' => 'Require email confirmation?',
     'reg_confirm_email_desc' => 'If domain restriction is used then email confirmation will be required and the below value will be ignored.',
     'reg_default_role' => 'Default user role after registration',
     'reg_confirm_email' => 'Require email confirmation?',
     'reg_confirm_email_desc' => 'If domain restriction is used then email confirmation will be required and the below value will be ignored.',


@@ -148,7 +150,7 @@ return [
         'it' => 'Italian',
         'ru' => 'Русский',
         'zh_CN' => '简体中文',
         'it' => 'Italian',
         'ru' => 'Русский',
         'zh_CN' => '简体中文',

-           'zh_TW' => '繁體中文'
+        'zh_TW' => '繁體中文'

     ]
     ///////////////////////////////////
 ];
     ]
     ///////////////////////////////////
 ];

diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index 64017e6e00ec9ceb71b538313b0ada29a9e0f8c5..bcaf2f4d793e9715456dcab2d9c7aa30d95bc8b8 100644 (file)
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -126,6 +126,11 @@
                                 @endforeach
                             </select>
                         </div>
                                 @endforeach
                             </select>
                         </div>

+                        <div class="form-group">
+                            <label for="setting-autosocialregistration-confirmation">{{ trans('settings.reg_auto_social_allow') }}</label>
+                            <p class="small">{{ trans('settings.reg_auto_social_allow_desc') }}</p>
+                            @include('components.toggle-switch', ['name' => 'setting-autosocialregistration-confirmation', 'value' => setting('autosocialregistration-confirmation')])
+                        </div>

                         <div class="form-group">
                             <label for="setting-registration-confirmation">{{ trans('settings.reg_confirm_email') }}</label>
                             <p class="small">{{ trans('settings.reg_confirm_email_desc') }}</p>
                         <div class="form-group">
                             <label for="setting-registration-confirmation">{{ trans('settings.reg_confirm_email') }}</label>
                             <p class="small">{{ trans('settings.reg_confirm_email_desc') }}</p>