Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge pull request #1883 from procchio6/fix/oauth

Browse Source 
Fix azure oauth not recognizing tenant ID
This commit is contained in:
Andras Bacsai 2024-03-25 13:45:45 +01:00 committed by GitHub
commit 8d856b0ec6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bootstrap/helpers/socialite.php
View File

@ -6,19 +6,30 @@ use Laravel\Socialite\Facades\Socialite;
function get_socialite_provider(string $provider) function get_socialite_provider(string $provider)
{ {
$oauth_setting = OauthSetting::firstWhere('provider', $provider); $oauth_setting = OauthSetting::firstWhere('provider', $provider);
if ($provider == 'azure') {
$azure_config = new \SocialiteProviders\Manager\Config(
$oauth_setting->client_id,
$oauth_setting->client_secret,
$oauth_setting->redirect_uri,
['tenant' => $oauth_setting->tenant],
);
return Socialite::driver('azure')->setConfig($azure_config);
}
$config = [ $config = [
'client_id' => $oauth_setting->client_id, 'client_id' => $oauth_setting->client_id,
'client_secret' => $oauth_setting->client_secret, 'client_secret' => $oauth_setting->client_secret,
'redirect' => $oauth_setting->redirect_uri, 'redirect' => $oauth_setting->redirect_uri,
'tenant' => $oauth_setting->tenant,
]; ];
$provider_class_map = [ $provider_class_map = [
'azure' => \SocialiteProviders\Azure\Provider::class,
'bitbucket' => \Laravel\Socialite\Two\BitbucketProvider::class, 'bitbucket' => \Laravel\Socialite\Two\BitbucketProvider::class,
'github' => \Laravel\Socialite\Two\GithubProvider::class, 'github' => \Laravel\Socialite\Two\GithubProvider::class,
'gitlab' => \Laravel\Socialite\Two\GitlabProvider::class, 'gitlab' => \Laravel\Socialite\Two\GitlabProvider::class,
'google' => \Laravel\Socialite\Two\GoogleProvider::class, 'google' => \Laravel\Socialite\Two\GoogleProvider::class,
]; ];
return Socialite::buildProvider( return Socialite::buildProvider(
$provider_class_map[$provider], $provider_class_map[$provider],
$config $config

8
config/services.php
View File

@ -30,4 +30,12 @@ return [
'secret' => env('AWS_SECRET_ACCESS_KEY'), 'secret' => env('AWS_SECRET_ACCESS_KEY'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
], ],
'azure' => [
'client_id' => env('AZURE_CLIENT_ID'),
'client_secret' => env('AZURE_CLIENT_SECRET'),
'redirect' => env('AZURE_REDIRECT_URI'),
'tenant' => env('AZURE_TENANT_ID'),
'proxy' => env('AZURE_PROXY'),
],
]; ];