Merge branch 'master' of git://github.com/moutonnoireu/BookStack into…

… moutonnoireu-master Also updated composer deps
rosetta-ai · Feb 11, 2018 · 110f32a · 110f32a
2 parents bed7ba7 + addfb96
commit 110f32a
Show file tree

Hide file tree

Showing 8 changed files with 207 additions and 129 deletions.
diff --git a/.env.example b/.env.example
@@ -49,7 +49,8 @@ GOOGLE_APP_SECRET=false
 OKTA_BASE_URL=false
 OKTA_APP_ID=false
 OKTA_APP_SECRET=false
-
+TWITCH_APP_ID=false
+TWITCH_APP_SECRET=false
 GITLAB_APP_ID=false
 GITLAB_APP_SECRET=false
 GITLAB_BASE_URI=false

diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -19,6 +19,7 @@ class EventServiceProvider extends ServiceProvider
             'SocialiteProviders\Azure\AzureExtendSocialite@handle',
             'SocialiteProviders\Okta\OktaExtendSocialite@handle',
             'SocialiteProviders\GitLab\GitLabExtendSocialite@handle',
+            'SocialiteProviders\Twitch\TwitchExtendSocialite@handle',
         ],
     ];
 

diff --git a/app/Services/SocialAuthService.php b/app/Services/SocialAuthService.php
@@ -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.

diff --git a/composer.json b/composer.json
@@ -19,7 +19,8 @@
         "socialiteproviders/slack": "^3.0",
         "socialiteproviders/microsoft-azure": "^3.0",
         "socialiteproviders/okta": "^1.0",
-        "socialiteproviders/gitlab": "^3.0"
+        "socialiteproviders/gitlab": "^3.0",
+        "socialiteproviders/twitch": "^3.0"
     },
     "require-dev": {
         "filp/whoops": "~2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/config/services.php b/config/services.php
@@ -102,6 +102,13 @@
         'name'          => 'Gitlab',
     ],
 
+    'twitch' => [
+        'client_id' => env('TWITCH_APP_ID'),
+        'client_secret' => env('TWITCH_APP_SECRET'),
+        'redirect' => env('APP_URL') . '/login/service/twitch/callback',
+        'name'          => 'Twitch',
+    ],
+
     'ldap' => [
         'server' => env('LDAP_SERVER', false),
         'dn' => env('LDAP_DN', false),

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "babelify": "^7.3.0",
     "browserify": "^14.3.0",
     "envify": "^4.0.0",
-    "gulp": "3.9.1",
+    "gulp": "^3.9.1",
     "gulp-autoprefixer": "3.1.1",
     "gulp-clean-css": "^3.0.4",
     "gulp-livereload": "^3.8.1",

diff --git a/resources/assets/icons/twitch.svg b/resources/assets/icons/twitch.svg