diff --git a/services/web/app/src/models/SSOConfig.js b/services/web/app/src/models/SSOConfig.js index a242580c9c..0349d8a651 100644 --- a/services/web/app/src/models/SSOConfig.js +++ b/services/web/app/src/models/SSOConfig.js @@ -6,12 +6,12 @@ const SSOConfigSchema = new Schema( entryPoint: { type: String, required: true }, certificates: { type: Array, default: [''], required: true }, userIdAttribute: { type: String, required: true }, + userEmailAttribute: { type: String }, userFirstNameAttribute: { type: String }, userLastNameAttribute: { type: String }, validated: { type: Boolean, default: false }, enabled: { type: Boolean, default: false }, useSettingsUKAMF: { type: Boolean, default: false }, - emailAttribute: { type: String }, }, { diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index d056f33745..efa4be5f21 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -1646,6 +1646,7 @@ "sso_error_idp_error": "", "sso_error_invalid_external_user_id": "", "sso_error_invalid_signature": "", + "sso_error_missing_email_attribute": "", "sso_error_missing_external_user_id": "", "sso_error_missing_firstname_attribute": "", "sso_error_missing_lastname_attribute": "", diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 1b6f1a11b4..4f4d30b369 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -2128,6 +2128,7 @@ "sso_error_idp_error": "Your identity provider responded with an error.", "sso_error_invalid_external_user_id": "The SAML attribute provided by your IdP that uniquely identifies your user has an invalid format, a string is expected. Attribute: <0>__expecting__", "sso_error_invalid_signature": "Sorry, the information received from your identity provider has an invalid signature.", + "sso_error_missing_email_attribute": "The SAML attribute that specifies the user’s email is either missing or under a different name than the one you configured. Expecting: <0>__expecting__", "sso_error_missing_external_user_id": "The SAML attribute provided by your IdP that uniquely identifies your user is either missing or under a different name than the one you configured. Expecting: <0>__expecting__", "sso_error_missing_firstname_attribute": "The SAML attribute that specifies the user’s first name is either missing or under a different name than the one you configured. Expecting: <0>__expecting__", "sso_error_missing_lastname_attribute": "The SAML attribute that specifies the user’s last name is either missing or under a different name than the one you configured. Expecting: <0>__expecting__", diff --git a/services/web/types/subscription/sso.ts b/services/web/types/subscription/sso.ts index 9188301666..78881c42ce 100644 --- a/services/web/types/subscription/sso.ts +++ b/services/web/types/subscription/sso.ts @@ -9,12 +9,12 @@ export type SSOConfig = { entryPoint?: string certificates: Certificate[] userIdAttribute?: string + userEmailAttribute?: string userFirstNameAttribute?: string userLastNameAttribute?: string validated?: boolean enabled?: boolean useSettingsUKAMF?: boolean - emailAttribute?: string } export type GroupSSOLinkingStatus = {