diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-02-11 20:30:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-11 20:30:01 +0200 |
| commit | 4de9848e34b0a1771747afdf970e9073c50f3e75 (patch) | |
| tree | 1a2adba81a5a38ddda35bf349e049fc787dbb81f | |
| parent | 2d291c8f5ea747c0097879cb0d9fc5e4c317a301 (diff) | |
| parent | bdbbb12f967f7e4f605e6c3310290180f6c8c6d1 (diff) | |
| download | wekan-4de9848e34b0a1771747afdf970e9073c50f3e75.tar.gz wekan-4de9848e34b0a1771747afdf970e9073c50f3e75.tar.bz2 wekan-4de9848e34b0a1771747afdf970e9073c50f3e75.zip | |
Merge pull request #2182 from danpatdav/oidc
Add parameters for OIDC claim mapping
| -rw-r--r-- | .meteor/versions | 2 | ||||
| -rw-r--r-- | Dockerfile | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/.meteor/versions b/.meteor/versions index 5d4c8e1a..15e2f8b9 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -144,7 +144,7 @@ retry@1.0.9 routepolicy@1.0.12 rzymek:fullcalendar@3.8.0 salleman:accounts-oidc@1.0.10 -salleman:oidc@1.0.11 +salleman:oidc@1.0.12 service-configuration@1.0.11 session@1.1.7 sha@1.0.9 @@ -26,6 +26,10 @@ ARG OAUTH2_SERVER_URL ARG OAUTH2_AUTH_ENDPOINT ARG OAUTH2_USERINFO_ENDPOINT ARG OAUTH2_TOKEN_ENDPOINT +ARG OAUTH2_ID_MAP +ARG OAUTH2_USERNAME_MAP +ARG OAUTH2_FULLNAME_MAP +ARG OAUTH2_EMAIL_MAP ARG LDAP_ENABLE ARG LDAP_PORT ARG LDAP_HOST @@ -101,6 +105,10 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth OAUTH2_AUTH_ENDPOINT="" \ OAUTH2_USERINFO_ENDPOINT="" \ OAUTH2_TOKEN_ENDPOINT="" \ + OAUTH2_ID_MAP="" \ + OAUTH2_USERNAME_MAP="" \ + OAUTH2_FULLNAME_MAP="" \ + OAUTH2_EMAIL_MAP="" \ LDAP_ENABLE=false \ LDAP_PORT=389 \ LDAP_HOST="" \ |