webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Merge branch 'master' of git://github.com/lommes/BookStack into lommes-master

Browse Source
This commit is contained in:
Dan Brown
2017-12-09 12:48:08 +00:00
parent ac7e3977de 009af9736e
commit d17eb0f54c
7 changed files with 85 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Providers/EventServiceProvider.php
View File

@ -17,6 +17,7 @@ class EventServiceProvider extends ServiceProvider
SocialiteWasCalled::class => [
'SocialiteProviders\Slack\SlackExtendSocialite@handle',
'SocialiteProviders\Azure\AzureExtendSocialite@handle',
'SocialiteProviders\Okta\OktaExtendSocialite@handle',
],
];

2
app/Services/SocialAuthService.php
View File

@ -14,7 +14,7 @@ class SocialAuthService
protected $socialite;
protected $socialAccount;
protected $validSocialDrivers = ['google', 'github', 'facebook', 'slack', 'twitter', 'azure'];
protected $validSocialDrivers = ['google', 'github', 'facebook', 'slack', 'twitter', 'azure', 'okta'];
/**
* SocialAuthService constructor.