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

login controller for inserted at token attribute

Browse Source
This commit is contained in:
drkthunder02
2019-10-22 23:18:40 -05:00
parent e76794172d
commit cc4f921fd6
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/Users/PurgeUsers.php
View File

@@ -148,6 +148,10 @@ class PurgeUsers extends Command
'character_id' => $user->character_id, 'character_id' => $user->character_id,
])->delete(); ])->delete();
UserAlt::where([
'main_id' => $user->character_id,
])->delete();
//Delete the user from the user table //Delete the user from the user table
User::where([ User::where([
'character_id' => $user->character_id, 'character_id' => $user->character_id,

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

@@ -133,10 +133,8 @@ class LoginController extends Controller
$newAlt->character_id = $user->id; $newAlt->character_id = $user->id;
$newAlt->avatar = $user->avatar; $newAlt->avatar = $user->avatar;
$newAlt->access_token = $user->token; $newAlt->access_token = $user->token;
if(isset($user->refresh_token)) {
$newAlt->refresh_token = $user->refresh_token;
}
$newAlt->owner_hash = $user->owner_hash; $newAlt->owner_hash = $user->owner_hash;
$newAlt->inserted_at = time();
$newAlt->expires_in = $user->expiresIn; $newAlt->expires_in = $user->expiresIn;
$newAlt->save(); $newAlt->save();
return 1; return 1;
@@ -203,6 +201,7 @@ class LoginController extends Controller
'character_id' => $eve_user->getId(), 'character_id' => $eve_user->getId(),
'access_token' => $eve_user->token, 'access_token' => $eve_user->token,
'refresh_token' => $eve_user->refreshToken, 'refresh_token' => $eve_user->refreshToken,
'inserted_at' => time(),
'expires_in' => $eve_user->expiresIn, 'expires_in' => $eve_user->expiresIn,
]); ]);
} }
@@ -215,6 +214,7 @@ class LoginController extends Controller
$token->character_id = $eve_user->id; $token->character_id = $eve_user->id;
$token->access_token = $eve_user->token; $token->access_token = $eve_user->token;
$token->refresh_token = $eve_user->refreshToken; $token->refresh_token = $eve_user->refreshToken;
$token->inserted_at = time();
$token->expires_in = $eve_user->expiresIn; $token->expires_in = $eve_user->expiresIn;
$token->save(); $token->save();
} }
@@ -260,6 +260,7 @@ class LoginController extends Controller
'avatar' => $eve_user->avatar, 'avatar' => $eve_user->avatar,
'owner_hash' => $eve_user->owner_hash, 'owner_hash' => $eve_user->owner_hash,
'character_id' => $eve_user->getId(), 'character_id' => $eve_user->getId(),
'inserted_at' => time(),
'expires_in' => $eve_user->expiresIn, 'expires_in' => $eve_user->expiresIn,
'access_token' => $eve_user->token, 'access_token' => $eve_user->token,
'user_type' => $this->GetAccountType(null, $eve_user->id), 'user_type' => $this->GetAccountType(null, $eve_user->id),

1
app/Models/Esi/EsiToken.php
View File

@@ -24,6 +24,7 @@ class EsiToken extends Model
'character_id', 'character_id',
'access_token', 'access_token',
'refresh_token', 'refresh_token',
'inserted_at',
'expires_in', 'expires_in',
]; ];

7
app/Models/User/User.php
View File

@@ -29,10 +29,7 @@ class User extends Authenticatable
'inserted_at', 'inserted_at',
'expires_in', 'expires_in',
'access_token', 'access_token',
'refresh_token',
'user_type', 'user_type',
'scopes',
'role',
]; ];
protected $table = 'users'; protected $table = 'users';
@@ -57,6 +54,10 @@ class User extends Authenticatable
return $this->hasMany('App\Models\Esi\EsiScope', 'character_id'); return $this->hasMany('App\Models\Esi\EsiScope', 'character_id');
} }
public function userAlts() {
return $this->hasMany('App\Models\User\UserAlt', 'character_id', 'main_id');
}
public function hasPermission($permission) { public function hasPermission($permission) {
$found = UserPermission::where(['character_id' => $this->character_id, 'permission' => $permission])->get(['permission']); $found = UserPermission::where(['character_id' => $this->character_id, 'permission' => $permission])->get(['permission']);
foreach($found as $foo) { foreach($found as $foo) {

5
app/Models/User/UserAlt.php
View File

@@ -22,9 +22,12 @@ class UserAlt extends Model
'character_id', 'character_id',
'avatar', 'avatar',
'access_token', 'access_token',
'refresh_token',
'inserted_at', 'inserted_at',
'expires_in', 'expires_in',
'owner_hash', 'owner_hash',
]; ];
public function mainCharacter() {
return $this->belongsTo('App\Models\User\User', 'character_id');
}
} }