diff --git a/docs/content/en/customize_dojo/user_management/configure_sso.md b/docs/content/en/customize_dojo/user_management/configure_sso.md index 45bd70c3279..b66fa08dbf7 100644 --- a/docs/content/en/customize_dojo/user_management/configure_sso.md +++ b/docs/content/en/customize_dojo/user_management/configure_sso.md @@ -564,6 +564,7 @@ You can also optionally set the following variables: DD_SOCIAL_AUTH_OIDC_AUTHORIZATION_URL=(str, ''), DD_SOCIAL_AUTH_OIDC_USERINFO_URL=(str, ''), DD_SOCIAL_AUTH_OIDC_JWKS_URI=(str, ''), + DD_SOCIAL_AUTH_OIDC_LOGIN_BUTTON_TEXT=(str, "Login with OIDC"), {{< /highlight >}} Once these variables have been set, restart DefectDojo. Log In With OIDC should now be added to the DefectDojo login page. diff --git a/dojo/context_processors.py b/dojo/context_processors.py index 7a3c84af035..39385ef3440 100644 --- a/dojo/context_processors.py +++ b/dojo/context_processors.py @@ -12,6 +12,7 @@ def globalize_vars(request): "FORGOT_USERNAME": settings.FORGOT_USERNAME, "CLASSIC_AUTH_ENABLED": settings.CLASSIC_AUTH_ENABLED, "OIDC_ENABLED": settings.OIDC_AUTH_ENABLED, + "SOCIAL_AUTH_OIDC_LOGIN_BUTTON_TEXT": settings.SOCIAL_AUTH_OIDC_LOGIN_BUTTON_TEXT, "AUTH0_ENABLED": settings.AUTH0_OAUTH2_ENABLED, "GOOGLE_ENABLED": settings.GOOGLE_OAUTH_ENABLED, "OKTA_ENABLED": settings.OKTA_OAUTH_ENABLED, diff --git a/dojo/settings/settings.dist.py b/dojo/settings/settings.dist.py index b71e4e4520c..45ccc3b06aa 100644 --- a/dojo/settings/settings.dist.py +++ b/dojo/settings/settings.dist.py @@ -120,6 +120,7 @@ DD_SOCIAL_AUTH_OIDC_AUTHORIZATION_URL=(str, ""), DD_SOCIAL_AUTH_OIDC_USERINFO_URL=(str, ""), DD_SOCIAL_AUTH_OIDC_JWKS_URI=(str, ""), + DD_SOCIAL_AUTH_OIDC_LOGIN_BUTTON_TEXT=(str, "Login with OIDC"), DD_SOCIAL_AUTH_AUTH0_OAUTH2_ENABLED=(bool, False), DD_SOCIAL_AUTH_AUTH0_KEY=(str, ""), DD_SOCIAL_AUTH_AUTH0_SECRET=(str, ""), @@ -618,6 +619,8 @@ def generate_url(scheme, double_slashes, user, password, host, port, path, param SOCIAL_AUTH_OIDC_USERINFO_URL = value if value := env("DD_SOCIAL_AUTH_OIDC_JWKS_URI"): SOCIAL_AUTH_OIDC_JWKS_URI = value +if value := env("DD_SOCIAL_AUTH_OIDC_LOGIN_BUTTON_TEXT"): + SOCIAL_AUTH_OIDC_LOGIN_BUTTON_TEXT = value AUTH0_OAUTH2_ENABLED = env("DD_SOCIAL_AUTH_AUTH0_OAUTH2_ENABLED") SOCIAL_AUTH_AUTH0_KEY = env("DD_SOCIAL_AUTH_AUTH0_KEY") diff --git a/dojo/templates/dojo/login.html b/dojo/templates/dojo/login.html index 430539f4930..fe54191f2a6 100644 --- a/dojo/templates/dojo/login.html +++ b/dojo/templates/dojo/login.html @@ -49,7 +49,7 @@