From 352e5c6cb07b1a09ef692af6f6c49c3b1f3e91c1 Mon Sep 17 00:00:00 2001 From: Daniel Davis Date: Mon, 11 Feb 2019 10:41:24 -0600 Subject: [PATCH 1/2] Bump salleman-oidc to 1.0.12 --- .meteor/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.meteor/versions b/.meteor/versions index 5d4c8e1a1..15e2f8b9c 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 From bdbbb12f967f7e4f605e6c3310290180f6c8c6d1 Mon Sep 17 00:00:00 2001 From: Daniel Davis Date: Mon, 11 Feb 2019 10:48:20 -0600 Subject: [PATCH 2/2] Added parameters for OIDC claim mapping These mapping parameters take advantage of new code in salleman-oidc 1.0.12 to override the default claim names provided by the userinfo endpoint. --- Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Dockerfile b/Dockerfile index ff6243d5e..283cc8532 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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="" \