Update user roles assignment functions

This commit is contained in:
DariusIII
2019-10-15 21:42:40 +02:00
parent 36a786ea98
commit 57f256938a
4 changed files with 6 additions and 6 deletions
@@ -79,7 +79,7 @@ class RegisterController extends Controller
$role = Role::query()->where('id', '=', $data['roles_id'])->first();
if ($role !== null) {
$user->assignRole($role->name);
$user->syncRoles([$role->name]);
if ($user->can('view console')) {
$user->givePermissionTo('view console');
}
+2 -2
View File
@@ -396,7 +396,7 @@ class User extends Authenticatable
$roleName = $roleQuery->name;
$user = self::find($uid);
$user->assignRole($roleName);
$user->syncRoles([$roleName]);
return self::find($uid)->update(['roles_id' => $role]);
}
@@ -436,7 +436,7 @@ class User extends Authenticatable
}
foreach (self::query()->whereDate('rolechangedate', '<', $now)->get() as $expired) {
$expired->update(['roles_id' => self::ROLE_USER, 'rolechangedate' => null]);
$expired->syncRoles('User');
$expired->syncRoles(['User']);
SendAccountExpiredEmail::dispatch($expired)->onQueue('emails');
}
}
+1 -1
View File
@@ -28,7 +28,7 @@ class UserServiceObserver
$roleData = Role::query()->where('id', $user->roles_id);
$rateLimit = $roleData->value('rate_limit');
$roleName = $roleData->value('name');
$user->assignRole($roleName);
$user->syncRoles([$roleName]);
$user->update(
[
'api_token' => md5(Password::getRepository()->createNewToken()),
+2 -2
View File
@@ -62,10 +62,10 @@ foreach ($oldRoles as $oldRole) {
foreach ($users as $user) {
if ($user->role !== null && $user->hasRole($user->role->name) === false) {
$user->assignRole($user->role->name);
$user->syncRoles([$user->role->name]);
echo 'Role: '.$user->role->name.' assigned to user: '.$user->username.PHP_EOL;
} elseif ($user->role === null) {
$user->assignRole('User');
$user->syncRoles(['User']);
} else {
echo 'User '.$user->username.' already has the role: '.$user->role->name.PHP_EOL;
}