Skip to content

Commit 9ea98eb

Browse files
committed
fix create_missing_users & link_missing_users and enable new providers by default
1 parent c0e5aeb commit 9ea98eb

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

generic-oidc-providers/src/Extensions/OAuth/Schemas/GenericOIDCProviderSchema.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,18 @@
33
namespace Boy132\GenericOIDCProviders\Extensions\OAuth\Schemas;
44

55
use App\Extensions\OAuth\Schemas\OAuthSchema;
6+
use App\Models\User;
67
use Boy132\GenericOIDCProviders\Filament\Admin\Resources\GenericOIDCProviders\Pages\EditGenericOIDCProvider;
78
use Boy132\GenericOIDCProviders\Models\GenericOIDCProvider;
89
use Filament\Infolists\Components\TextEntry;
910
use Filament\Schemas\Components\Wizard\Step;
11+
use Illuminate\Support\Str;
12+
use Laravel\Socialite\Contracts\User as OAuthUser;
1013
use SocialiteProviders\OIDC\Provider;
1114

1215
final class GenericOIDCProviderSchema extends OAuthSchema
1316
{
14-
public function __construct(private GenericOIDCProvider $model) {}
17+
public function __construct(private readonly GenericOIDCProvider $model) {}
1518

1619
public function getId(): string
1720
{
@@ -72,12 +75,19 @@ public function getHexColor(): ?string
7275
return $this->model->display_color;
7376
}
7477

75-
public function shouldCreateMissingUsers(): bool
78+
public function isEnabled(): bool
79+
{
80+
$id = Str::upper($this->getId());
81+
82+
return env("OAUTH_{$id}_ENABLED", true);
83+
}
84+
85+
public function shouldCreateMissingUser(OAuthUser $user): bool
7686
{
7787
return $this->model->create_missing_users;
7888
}
7989

80-
public function shouldLinkMissingUsers(): bool
90+
public function shouldLinkMissingUser(User $user, OAuthUser $oauthUser): bool
8191
{
8292
return $this->model->link_missing_users;
8393
}

0 commit comments

Comments
 (0)