Skip to content

Commit

Permalink
add support for gitlab authentification
Browse files Browse the repository at this point in the history
  • Loading branch information
jozefbalun committed Jan 31, 2018
1 parent 1d54404 commit 44d8f39
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 4 deletions.
6 changes: 5 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ OKTA_BASE_URL=false
OKTA_KEY=false
OKTA_SECRET=false

GITLAB_KEY=false
GITLAB_SECRET=false
GITLAB_INSTANCE_URI=false

# External services such as Gravatar
DISABLE_EXTERNAL_SERVICES=false

Expand All @@ -67,4 +71,4 @@ MAIL_HOST=localhost
MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_ENCRYPTION=null
1 change: 1 addition & 0 deletions app/Providers/EventServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class EventServiceProvider extends ServiceProvider
'SocialiteProviders\Slack\SlackExtendSocialite@handle',
'SocialiteProviders\Azure\AzureExtendSocialite@handle',
'SocialiteProviders\Okta\OktaExtendSocialite@handle',
'SocialiteProviders\GitLab\GitLabExtendSocialite@handle',
],
];

Expand Down
2 changes: 1 addition & 1 deletion app/Services/SocialAuthService.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class SocialAuthService
protected $socialite;
protected $socialAccount;

protected $validSocialDrivers = ['google', 'github', 'facebook', 'slack', 'twitter', 'azure', 'okta'];
protected $validSocialDrivers = ['google', 'github', 'facebook', 'slack', 'twitter', 'azure', 'okta', 'gitlab'];

/**
* SocialAuthService constructor.
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"barryvdh/laravel-snappy": "^0.4.0",
"socialiteproviders/slack": "^3.0",
"socialiteproviders/microsoft-azure": "^3.0",
"socialiteproviders/okta": "^1.0"
"socialiteproviders/okta": "^1.0",
"socialiteproviders/gitlab": "^3.0"
},
"require-dev": {
"filp/whoops": "~2.0",
Expand Down
10 changes: 9 additions & 1 deletion config/services.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,15 @@
'redirect' => env('APP_URL') . '/login/service/okta/callback',
'base_url' => env('OKTA_BASE_URL'),
'name' => 'Okta',
],
],

'gitlab' => [
'client_id' => env('GITLAB_KEY'),
'client_secret' => env('GITLAB_SECRET'),
'redirect' => env('APP_URL') . '/login/service/gitlab/callback',
'instance_uri' => env('GITLAB_INSTANCE_URI'), // needs only for GitLab self hosted
'name' => 'Gitlab',
],

'ldap' => [
'server' => env('LDAP_SERVER', false),
Expand Down

0 comments on commit 44d8f39

Please sign in to comment.