Skip to content

Commit 6fb00ae

Browse files
committed
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.
1 parent c5b1a28 commit 6fb00ae

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

assets/runtime/functions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,12 +589,12 @@ gitlab_configure_oauth_bitbucket() {
589589
}
590590

591591
gitlab_configure_oauth_saml_attribute_statements() {
592-
if [[ -n ${OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL} && \
593-
-n ${OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME} ]]; then
592+
if [[ -n ${OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL} ]]; then
594593
echo "Configuring gitlab::oauth::saml::attribute_statements..."
595594
update_template ${GITLAB_CONFIG} \
596595
OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL \
597596
OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME \
597+
OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME \
598598
OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME \
599599
OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME
600600
# Remove undefined optional attributes

0 commit comments

Comments
 (0)