From 6fb00aea11387fd2c0891d3015b79fcb65c24359 Mon Sep 17 00:00:00 2001 From: KOMURA Takaaki Date: Wed, 29 May 2019 16:01:48 +0900 Subject: [PATCH] fix gitlab_configure_oauth_saml_attribute_statements() OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME reflects username: in gitlab.yml OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME is not required. --- assets/runtime/functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index ab3e02d8..099e7140 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -589,12 +589,12 @@ gitlab_configure_oauth_bitbucket() { } gitlab_configure_oauth_saml_attribute_statements() { - if [[ -n ${OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL} && \ - -n ${OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME} ]]; then + if [[ -n ${OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL} ]]; then echo "Configuring gitlab::oauth::saml::attribute_statements..." update_template ${GITLAB_CONFIG} \ OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL \ OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME \ + OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME \ OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME \ OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME # Remove undefined optional attributes