Skip to content

Commit 110f32a

Browse files
ssddanbrownssddanbrown
committed
Merge branch 'master' of git://github.com/moutonnoireu/BookStack into moutonnoireu-master
Also updated composer deps
2 parents bed7ba7 + addfb96 commit 110f32a

8 files changed

Lines changed: 207 additions & 129 deletions

File tree

‎.env.example‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ GOOGLE_APP_SECRET=false
4949
OKTA_BASE_URL=false
5050
OKTA_APP_ID=false
5151
OKTA_APP_SECRET=false
52-
52+
TWITCH_APP_ID=false
53+
TWITCH_APP_SECRET=false
5354
GITLAB_APP_ID=false
5455
GITLAB_APP_SECRET=false
5556
GITLAB_BASE_URI=false

‎app/Providers/EventServiceProvider.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class EventServiceProvider extends ServiceProvider
1919
'SocialiteProviders\Azure\AzureExtendSocialite@handle',
2020
'SocialiteProviders\Okta\OktaExtendSocialite@handle',
2121
'SocialiteProviders\GitLab\GitLabExtendSocialite@handle',
22+
'SocialiteProviders\Twitch\TwitchExtendSocialite@handle',
2223
],
2324
];
2425

‎app/Services/SocialAuthService.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class SocialAuthService
1616
protected $socialite;
1717
protected $socialAccount;
1818

19-
protected $validSocialDrivers = ['google', 'github', 'facebook', 'slack', 'twitter', 'azure', 'okta', 'gitlab'];
19+
protected $validSocialDrivers = ['google', 'github', 'facebook', 'slack', 'twitter', 'azure', 'okta', 'gitlab', 'twitch'];
2020

2121
/**
2222
* SocialAuthService constructor.

‎composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
"socialiteproviders/slack": "^3.0",
2020
"socialiteproviders/microsoft-azure": "^3.0",
2121
"socialiteproviders/okta": "^1.0",
22-
"socialiteproviders/gitlab": "^3.0"
22+
"socialiteproviders/gitlab": "^3.0",
23+
"socialiteproviders/twitch": "^3.0"
2324
},
2425
"require-dev": {
2526
"filp/whoops": "~2.0",

‎composer.lock‎

Lines changed: 162 additions & 125 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/services.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,13 @@
102102
'name' => 'Gitlab',
103103
],
104104

105+
'twitch' => [
106+
'client_id' => env('TWITCH_APP_ID'),
107+
'client_secret' => env('TWITCH_APP_SECRET'),
108+
'redirect' => env('APP_URL') . '/login/service/twitch/callback',
109+
'name' => 'Twitch',
110+
],
111+
105112
'ldap' => [
106113
'server' => env('LDAP_SERVER', false),
107114
'dn' => env('LDAP_DN', false),

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"babelify": "^7.3.0",
1212
"browserify": "^14.3.0",
1313
"envify": "^4.0.0",
14-
"gulp": "3.9.1",
14+
"gulp": "^3.9.1",
1515
"gulp-autoprefixer": "3.1.1",
1616
"gulp-clean-css": "^3.0.4",
1717
"gulp-livereload": "^3.8.1",

‎resources/assets/icons/twitch.svg‎

Lines changed: 31 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)