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

…s-master
rosetta-ai · Dec 9, 2017 · d17eb0f · d17eb0f
2 parents ac7e397 + 009af97
commit d17eb0f
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 35 deletions.
diff --git a/.env.example b/.env.example
@@ -46,6 +46,9 @@ GITHUB_APP_ID=false
 GITHUB_APP_SECRET=false
 GOOGLE_APP_ID=false
 GOOGLE_APP_SECRET=false
+OKTA_BASE_URL=false
+OKTA_KEY=false
+OKTA_SECRET=false
 
 # External services such as Gravatar
 DISABLE_EXTERNAL_SERVICES=false

diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -17,6 +17,7 @@ class EventServiceProvider extends ServiceProvider
         SocialiteWasCalled::class => [
             'SocialiteProviders\Slack\SlackExtendSocialite@handle',
             'SocialiteProviders\Azure\AzureExtendSocialite@handle',
+            'SocialiteProviders\Okta\OktaExtendSocialite@handle',
         ],
     ];
 

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

diff --git a/composer.json b/composer.json
@@ -17,7 +17,8 @@
         "gathercontent/htmldiff": "^0.2.1",
         "barryvdh/laravel-snappy": "^0.4.0",
         "socialiteproviders/slack": "^3.0",
-        "socialiteproviders/microsoft-azure": "^3.0"
+        "socialiteproviders/microsoft-azure": "^3.0",
+        "socialiteproviders/okta": "^1.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
@@ -80,6 +80,14 @@
         'name'          => 'Microsoft Azure',
     ],
 
+    'okta' => [
+        'client_id' => env('OKTA_KEY'),
+        'client_secret' => env('OKTA_SECRET'),
+        'redirect' => env('APP_URL') . '/login/service/okta/callback', 
+        'base_url' => env('OKTA_BASE_URL'), 
+        'name'          => 'Okta',
+    ], 
+
     'ldap' => [
         'server' => env('LDAP_SERVER', false),
         'dn' => env('LDAP_DN', false),

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