Skip to content

Commit

Permalink
Minor fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Sam Poyigi <[email protected]>
  • Loading branch information
sampoyigi committed Feb 11, 2022
1 parent 05dc17f commit 5945fad
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
16 changes: 5 additions & 11 deletions classes/ProviderManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public function completeCallback()
if ($result instanceof RedirectResponse)
return $result;

Auth::login($user);
Auth::login($user, TRUE);

Event::fire('igniter.socialite.login', [$user], TRUE);

Expand Down Expand Up @@ -270,24 +270,18 @@ protected function handleProviderCallback($providerClass, $errorUrl)

protected function createOrUpdateUser(ProviderUser $providerUser, Provider $provider)
{
$data = [
'first_name' => $providerUser->getName(),
];

if ($user = Auth::getByCredentials(['email' => $providerUser->getEmail()])) {
$user->fill($data)->save();

if ($user = Auth::getByCredentials(['email' => $providerUser->getEmail()]))
return $user;
}

$data = array_merge($data, [
$data = [
'first_name' => $providerUser->getName() ?? 'blank name',
'email' => $providerUser->getEmail(),
// Generate a random password for the new user
'password' => str_random(),
// Assign the new user to default group
'customer_group_id' => optional(Customer_groups_model::getDefault())->getKey(),
'status' => TRUE,
]);
];

if (!$user = Event::fire('igniter.socialite.register', [$providerUser, $provider], TRUE))
$user = Auth::register($data, TRUE);
Expand Down
4 changes: 2 additions & 2 deletions routes.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

Route::get('igniter/socialite/{provider}/{action}', [
Route::any('igniter/socialite/{provider}/{action}', [
'as' => 'igniter_socialite_provider',
'middleware' => ['web'],
function ($provider, $action) {
return \Igniter\Socialite\Classes\ProviderManager::runEntryPoint($provider, $action);
},
])->where('provider', '[a-zA-Z-]+')->where('action', '[a-zA-Z-]+');
])->where('provider', '[a-zA-Z-]+')->where('action', '[a-zA-Z]+');

0 comments on commit 5945fad

Please sign in to comment.