Use ->withPivot() for teamed relationships

[juliangums]

The previous implementation is giving me issues when querying ->getPivotColumns() for example. It should probably use ->withPivot() to indicate there is a pivot value.

[juliangums]

Breaking tests so I’ll close but I am wondering if this is something to look in to?

[erikn69]

Breaking tests

that's because you did it wrong, must be:

if (! app(PermissionRegistrar::class)->teams) {
    return $relation;
}

$teamsKey = app(PermissionRegistrar::class)->teamsKey;
$relation->withPivot($teamsKey);
$teamField = config('permission.table_names.roles').'.'.$teamsKey;

return $relation->wherePivot($teamsKey, getPermissionsTeamId())
    ->where(fn ($q) => $q->whereNull($teamField)->orWhere($teamField, getPermissionsTeamId()));

Also, there is more places, not only there

laravel-permission/src/Traits/HasPermissions.php

Lines 88 to 92 in c99dca7

	if (! app(PermissionRegistrar::class)->teams) {
	return $relation;
	}
	return $relation->wherePivot(app(PermissionRegistrar::class)->teamsKey, getPermissionsTeamId());

[juliangums]

Oh yeah of course, I should have checked if teams is activated first before trying to access the config values. Corrected this now.

[juliangums]

Also added this for permissions

[juliangums]

@erikn69 good to merge?

[erikn69]

I am not a maintainer,
I only reviewed the code for you, and I have not reviewed this functionality

[juliangums]

@freekmurze @drbyte is this ok to merge?

[juliangums]

@drbyte thanks