diff --git a/code/app/Http/Controllers/GasController.php b/code/app/Http/Controllers/GasController.php index 73a39532..6aadd4b6 100644 --- a/code/app/Http/Controllers/GasController.php +++ b/code/app/Http/Controllers/GasController.php @@ -173,14 +173,16 @@ private function configUsers($gas, $request) ]; } - $socials = []; + $socials = (object) [ + 'providers' => [] + ]; if ($request->has('enable_login_google')) { - $socials[] = 'google'; + $socials->providers[] = 'google'; } if ($request->has('enable_login_facebook')) { - $socials[] = 'facebook'; + $socials->providers[] = 'facebook'; } $gas->setConfig('public_registrations', $registrations_info); diff --git a/code/resources/views/auth/socialbuttons.blade.php b/code/resources/views/auth/socialbuttons.blade.php index a4a4aa5f..88e352c2 100644 --- a/code/resources/views/auth/socialbuttons.blade.php +++ b/code/resources/views/auth/socialbuttons.blade.php @@ -3,7 +3,7 @@ $enabled = []; foreach(App\Gas::all() as $gas) { - $enabled = array_merge($enabled, $gas->social_login); + $enabled = array_merge($enabled, $gas->social_login['providers']); } $enabled = array_unique($enabled); diff --git a/code/resources/views/gas/users.blade.php b/code/resources/views/gas/users.blade.php index 85d8b36f..37b03134 100644 --- a/code/resources/views/gas/users.blade.php +++ b/code/resources/views/gas/users.blade.php @@ -4,8 +4,8 @@
- - + +