forked from External/greenlight
Add support for roles (#656)
* Add support for ldap roles * Remove debugger * Remove bundled with * Update omniauth-bn-launcher version
This commit is contained in:
parent
0934919e44
commit
79188a6cae
2
Gemfile
2
Gemfile
|
@ -48,7 +48,7 @@ gem 'omniauth'
|
||||||
gem 'omniauth-twitter'
|
gem 'omniauth-twitter'
|
||||||
gem 'omniauth-google-oauth2'
|
gem 'omniauth-google-oauth2'
|
||||||
gem 'omniauth-bn-office365', git: 'https://github.com/blindsidenetworks/omniauth-bn-office365.git', tag: '0.1.0'
|
gem 'omniauth-bn-office365', git: 'https://github.com/blindsidenetworks/omniauth-bn-office365.git', tag: '0.1.0'
|
||||||
gem 'omniauth-bn-launcher', git: 'https://github.com/blindsidenetworks/omniauth-bn-launcher.git', tag: '0.1.1'
|
gem 'omniauth-bn-launcher', git: 'https://github.com/blindsidenetworks/omniauth-bn-launcher.git', tag: '0.1.2'
|
||||||
gem 'bn-ldap-authentication', git: 'https://github.com/blindsidenetworks/bn-ldap-authentication.git'
|
gem 'bn-ldap-authentication', git: 'https://github.com/blindsidenetworks/bn-ldap-authentication.git'
|
||||||
gem 'net-ldap'
|
gem 'net-ldap'
|
||||||
|
|
||||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -1,16 +1,16 @@
|
||||||
GIT
|
GIT
|
||||||
remote: https://github.com/blindsidenetworks/bn-ldap-authentication.git
|
remote: https://github.com/blindsidenetworks/bn-ldap-authentication.git
|
||||||
revision: 538132e0df70dbe470120f7bc7a93968c522031f
|
revision: 9b93c64f106675755577f45d1fe520ca5405d522
|
||||||
specs:
|
specs:
|
||||||
bn-ldap-authentication (1.0.0)
|
bn-ldap-authentication (1.0.1)
|
||||||
net-ldap
|
net-ldap
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: https://github.com/blindsidenetworks/omniauth-bn-launcher.git
|
remote: https://github.com/blindsidenetworks/omniauth-bn-launcher.git
|
||||||
revision: 025785046c3d532ed2252ef4762469c8d08d4839
|
revision: 4f43f9df48f92c209176ab487fc9b45bbb660b9b
|
||||||
tag: 0.1.1
|
tag: 0.1.2
|
||||||
specs:
|
specs:
|
||||||
omniauth-bn-launcher (0.1.1)
|
omniauth-bn-launcher (0.1.2)
|
||||||
omniauth (~> 1.3, >= 1.3.2)
|
omniauth (~> 1.3, >= 1.3.2)
|
||||||
omniauth-oauth2 (= 1.5.0)
|
omniauth-oauth2 (= 1.5.0)
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ class SessionsController < ApplicationController
|
||||||
return redirect_to(ldap_signin_path, alert: I18n.t("invalid_credentials"))
|
return redirect_to(ldap_signin_path, alert: I18n.t("invalid_credentials"))
|
||||||
end
|
end
|
||||||
|
|
||||||
@auth = parse_auth(result)
|
@auth = parse_auth(result, ENV['LDAP_ROLE_FIELD'])
|
||||||
|
|
||||||
process_signin
|
process_signin
|
||||||
end
|
end
|
||||||
|
|
|
@ -59,6 +59,7 @@ OFFICE365_HD=
|
||||||
# LDAP_BASE=dc=example,dc=com
|
# LDAP_BASE=dc=example,dc=com
|
||||||
# LDAP_BIND_DN=cn=admin,dc=example,dc=com
|
# LDAP_BIND_DN=cn=admin,dc=example,dc=com
|
||||||
# LDAP_PASSWORD=password
|
# LDAP_PASSWORD=password
|
||||||
|
# LDAP_ROLE_FIELD=ou
|
||||||
LDAP_SERVER=
|
LDAP_SERVER=
|
||||||
LDAP_PORT=
|
LDAP_PORT=
|
||||||
LDAP_METHOD=
|
LDAP_METHOD=
|
||||||
|
@ -66,6 +67,7 @@ LDAP_UID=
|
||||||
LDAP_BASE=
|
LDAP_BASE=
|
||||||
LDAP_BIND_DN=
|
LDAP_BIND_DN=
|
||||||
LDAP_PASSWORD=
|
LDAP_PASSWORD=
|
||||||
|
LDAP_ROLE_FIELD=
|
||||||
|
|
||||||
# Set this to true if you want GreenLight to support user signup and login without
|
# Set this to true if you want GreenLight to support user signup and login without
|
||||||
# Omniauth. For more information, see:
|
# Omniauth. For more information, see:
|
||||||
|
|
Loading…
Reference in New Issue