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/moutonnoireu/BookStack into moutonnoireu-master

Browse Source 
Also updated composer deps
This commit is contained in:
Dan Brown
2018-02-11 11:44:09 +00:00
parent bed7ba78d3 addfb96002
commit 110f32a16d
8 changed files with 207 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Providers/EventServiceProvider.php
View File

@ -19,6 +19,7 @@ class EventServiceProvider extends ServiceProvider
'SocialiteProviders\Azure\AzureExtendSocialite@handle',
'SocialiteProviders\Okta\OktaExtendSocialite@handle',
'SocialiteProviders\GitLab\GitLabExtendSocialite@handle',
'SocialiteProviders\Twitch\TwitchExtendSocialite@handle',
],
];

2
app/Services/SocialAuthService.php
View File

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