drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

another one?

Browse Source
This commit is contained in:
drkthunder02
2018-10-15 22:10:55 -05:00
parent 7bcbcf2605
commit d870e5cc95
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Http/Controllers/Auth/LoginController.php
View File

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Socialite; use Socialite;
use Auth; use Auth;
use Illuminate\Foundation\Auth\User;
class LoginController extends Controller class LoginController extends Controller
{ {
@@ -48,10 +49,10 @@ class LoginController extends Controller
return Socialite::driver('eveonline')->setScopes(['publicData'])->redirect(); return Socialite::driver('eveonline')->setScopes(['publicData'])->redirect();
} }
public function handleProviderCallback(AuthAccountService $service) { public function handleProviderCallback() {
$ssoUser = Socialite::driver('eveonline')->user(); $ssoUser = Socialite::driver('eveonline')->user();
$user = $service->createOrGetUser($ssoUser); $user = $this->createOrGetUser($ssoUser);
auth()->login($user); auth()->login($user);
@@ -66,20 +67,20 @@ class LoginController extends Controller
*/ */
private function createOrGetUser($eve_user) { private function createOrGetUser($eve_user) {
//Search for user in the database //Search for user in the database
$authUser = User::where($eve_user->id)->first(); $authUser = User::where('id', $eve_user->id)->first();
//$account = AuthAccount::whereProvider('eveonline')->whereProviderUserId($eve_user->getId())->first();
if($authUser) { if($authUser) {
return $authUser; return $authUser;
} else { } else {
return User::create([ return User::create([
'name' => $user->getName(), 'name' => $eve_user->getName(),
'email' => null, 'email' => null,
'avatar' => $user->avatar, 'avatar' => $eve_user->avatar,
'owner_hash' => $user->character_owner_hash, 'owner_hash' => $eve_user->owner_hash,
'id'=> $user->getId(), 'id'=> $eve_user->getId(),
'expiresIn' => $user->expiresIn, 'expiresIn' => $eve_user->expiresIn,
'token' => $user->token, 'token' => $eve_user->token,
'refreshToken' => $user->refreshToken, 'refreshToken' => $eve_user->refreshToken,
]); ]);
} }
} }

2
app/User.php
View File

@@ -19,6 +19,8 @@ class User extends Authenticatable
'name', 'email', 'avatar', 'owner_hash', 'id', 'expiresIn', 'token', 'refreshToken', 'name', 'email', 'avatar', 'owner_hash', 'id', 'expiresIn', 'token', 'refreshToken',
]; ];
protected $table = 'users';
/** /**
* The attributes that should be hidden for arrays. * The attributes that should be hidden for arrays.
* *