Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

fix(auth): honor instance registration for non-OIDC OAuth providers

Andras Bacsaidf692e627877
diff --git a/app/Services/Auth/OauthLoginService.php b/app/Services/Auth/OauthLoginService.php
index ebf6cc0a35..761b6a8ccb 100644
--- a/app/Services/Auth/OauthLoginService.php
+++ b/app/Services/Auth/OauthLoginService.php
@@ -229,9 +229,17 @@ class OauthLoginService
}
}
+ /**
+ * Only OIDC exposes a provider-level user creation setting. Other providers
+ * follow the instance registration setting, as before OIDC support.
+ */
private function canCreateUser(OauthSetting $oauthSetting): bool
{
- return instanceSettings()->is_registration_enabled || $oauthSetting->allow_registration;
+ if (instanceSettings()->is_registration_enabled) {
+ return true;
+ }
+
+ return $oauthSetting->provider === 'oidc' && $oauthSetting->allow_registration;
}
private function createUser(string $name, string $email, OauthSetting $oauthSetting): User
diff --git a/tests/Feature/OauthControllerTest.php b/tests/Feature/OauthControllerTest.php
index b1a64369de..5ce4a4cb58 100644
--- a/tests/Feature/OauthControllerTest.php
+++ b/tests/Feature/OauthControllerTest.php
@@ -225,6 +225,51 @@ it('registers a new user from a verified provider identity', function () {
]);
});
+it('does not register a new user through a non-OIDC provider when registration is disabled', function (string $provider, array $rawClaims) {
+ // Upgraded installs have allow_registration = true on every provider row (column default).
+ OauthSetting::updateOrCreate(['provider' => $provider], [
+ 'client_id' => 'client-id',
+ 'client_secret' => 'client-secret',
+ 'enabled' => true,
+ 'allow_registration' => true,
+ ]);
+
+ expect(fn () => app(OauthLoginService::class)->login($provider, (object) [
+ 'email' => '[email protected]',
+ 'name' => 'Stranger',
+ 'id' => 'stranger-id',
+ 'user' => $rawClaims,
+ ], OauthSetting::where('provider', $provider)->firstOrFail()))->toThrow(HttpException::class, 'Registration is disabled');
+
+ $this->assertGuest();
+ expect(User::count())->toBe(0)
+ ->and(OauthIdentity::count())->toBe(0);
+})->with([
+ 'github' => ['github', []],
+ 'google' => ['google', ['verified_email' => true, 'hd' => 'example.com']],
+]);
+
+it('registers a new user through a non-OIDC provider when registration is enabled', function () {
+ InstanceSettings::findOrFail(0)->update(['is_registration_enabled' => true]);
+ OauthSetting::create([
+ 'provider' => 'github',
+ 'client_id' => 'client-id',
+ 'client_secret' => 'client-secret',
+ 'enabled' => true,
+ 'allow_registration' => false,
+ ]);
+
+ $user = app(OauthLoginService::class)->login('github', (object) [
+ 'email' => '[email protected]',
+ 'name' => 'New User',
+ 'id' => 'github-new-user-id',
+ 'user' => [],
+ ], OauthSetting::where('provider', 'github')->firstOrFail());
+
+ expect($user->email)->toBe('[email protected]');
+ $this->assertAuthenticatedAs($user);
+});
+
it('does not link another provider identity to an account by shared email', function () {
$user = User::factory()->create(['email' => '[email protected]']);
OauthIdentity::create([