There is nothing wrong with your television set. Do not attempt to adjust the picture. We are controlling transmission. If we wish to make it louder, we will bring up the volume. If we wish to make it softer, we will tune it to a whisper. We will control the horizontal. We will control the vertical. We can roll the image, make it flutter. We can change the focus to a soft blur, or sharpen it to crystal clarity.
For the next hour, sit quietly and we will control all that you see and hear. We repeat: There is nothing wrong with your television set. You are about to participate in a great adventure. You are about to experience the awe and mystery which reaches from the inner mind to... The Outer Limits.
', @@ -70,7 +70,7 @@ 'no_idp_results' => 'Your search did not return any results.', 'no_idp_results_request_access' => 'Can\'t find your %organisationNoun%? Request access or try tweaking your search.', 'more_idp_results' => '%arg1% results not shown. Refine your search to show more specific results.', - 'return_to_sp' => 'Return to Service Provider', + 'return_to_sp' => 'Return to application', // Help page 'help' => 'Help', @@ -90,16 +90,16 @@ 'cookies_removal_confirm' => 'Your cookies have been removed.', // Footer - 'service_by' => 'This is a service connected through', + 'service_by' => 'This is an application connected through', 'serviceprovider_link_text' => '%suiteName%', 'serviceprovider_link_target' => 'https://openconext.org/', 'terms_of_service_link_text' => 'Terms of Service', 'terms_of_service_link_target' => '#', // Form - 'request_access_instructions_head' => 'Unfortunately, you do not have access to the service you are looking for. What can you do?', - 'request_access_instructions_text' => 'If you want to access this service, please fill out the form below. - We will then forward your request to the person responsible for the services + 'request_access_instructions_head' => 'Unfortunately, you do not have access to the application you are looking for. What can you do?', + 'request_access_instructions_text' => 'If you want to access this application, please fill out the form below. + We will then forward your request to the person responsible for the applications portfolio management at your %organisationNoun%.', 'name' => 'Name', 'name_error' => 'Enter your name', @@ -114,20 +114,20 @@ 'close' => 'Close', 'required' => 'Required', 'send_confirm' => 'Your request has been sent', - 'send_confirm_desc' => 'Your request has been forwarded to your %organisationNoun%. Further settlement and decisions on the availability of this service will be taken by the ICT staff of your %organisationNoun%.', + 'send_confirm_desc' => 'Your request has been forwarded to your %organisationNoun%. Further settlement and decisions on the availability of this application will be taken by the ICT staff of your %organisationNoun%.', // Consent 'consent_attributes_screenreader' => 'about %orgName%', 'consent_attributes_show_more' => 'Show more information', 'consent_attributes_show_less' => 'Show less information', - 'consent_no_attributes_text' => 'This service requires no information from your %organisationNoun%.', + 'consent_no_attributes_text' => 'This application requires no information from your %organisationNoun%.', 'consent_buttons_ok_informational' => 'Proceed to %sp%', 'consent_buttons_nok' => 'No, I do not agree', 'consent_buttons_nok_informational' => 'Cancel', - 'consent_explanation_title' => 'Pay attention when using this service', + 'consent_explanation_title' => 'Pay attention when using this application', 'consent_name_id_label' => 'Identifier', 'consent_name_id_support_link' => 'Explanation', - 'consent_name_id_value_tooltip' => 'The identifier for this service is generated by %arg1% en differs amongst each service you use through %arg1%. The service can therefore recognise you as the same user when you return, but services cannot recognise you amongst each other as the same user.', + 'consent_name_id_value_tooltip' => 'The identifier for this application is generated by %arg1% en differs amongst each application you use through %arg1%. The application can therefore recognise you as the same user when you return, but applications cannot recognise you amongst each other as the same user.', 'consent_slidein_details_email' => 'Email', 'consent_slidein_details_phone' => 'Phone', 'consent_slidein_text_contact' => 'If you have any questions about this page, please contact the service desk of your %organisationNoun%. %suiteName% has the following contact information:', @@ -150,7 +150,7 @@ 'error_help-desk-link-text' => 'Service desk', 'error_help-desk-link-text-short' => 'Service desk', 'error_return-sp-link-text' => 'Return to %spName%', - 'error_return-sp-link-text-short' => 'Return to service', + 'error_return-sp-link-text-short' => 'Return to application', 'error_404' => '404 - Page not found', 'error_404_desc' => 'This page has not been found.', @@ -159,16 +159,16 @@ 'error_help_desc' => '', 'error_no_idps' => 'Error - No %organisationNounPlural% found', 'error_no_idps_desc' => 'Logging into %spName% is not possible via %suiteName%. %spName% is not connected to any %organisationNounPlural%.', - 'error_no_idps_desc_no_sp_name' => 'Logging into this service is not possible via %suiteName%. The service is not connected to any %organisationNounPlural%.', + 'error_no_idps_desc_no_sp_name' => 'Logging into this application is not possible via %suiteName%. The application is not connected to any %organisationNounPlural%.', 'error_session_lost' => 'Error - your session was lost', - 'error_session_lost_desc' => 'To continue to the service an active session is required. However, your session expired. Perhaps you waited too long with logging in? Please go back to the service and try again. If that doesn\'t work, close your browser first and then try again.', + 'error_session_lost_desc' => 'To continue to the application an active session is required. However, your session expired. Perhaps you waited too long with logging in? Please go back to the application and try again. If that doesn\'t work, close your browser first and then try again.', 'error_session_not_started' => 'Error - No session found', - 'error_session_not_started_desc' => 'To continue to the service an active session is required. However, no session was found. Your browser must accept cookies. Alternatively, the link you used to get to the service might be wrong. Please go back to the service and try again. If that doesn\'t work, try a different browser.', + 'error_session_not_started_desc' => 'To continue to the application an active session is required. However, no session was found. Your browser must accept cookies. Alternatively, the link you used to get to the application might be wrong. Please go back to the application and try again. If that doesn\'t work, try a different browser.', 'error_authorization_policy_violation' => 'Error - Access denied', - 'error_authorization_policy_violation_desc' => 'You cannot use %spName% because %idpName% limits access to it (the "Service Provider") with an authorization policy. Please contact the service desk of %idpName% if you think you should be allowed access to %spName%.', - 'error_authorization_policy_violation_desc_no_idp_name' => 'You cannot use %spName% because your %organisationNoun% limits access to it (the "Service Provider") with an authorization policy. Please contact the service desk of your %organisationNoun% if you think you should be allowed access to %spName%.', - 'error_authorization_policy_violation_desc_no_sp_name' => 'You cannot use this service because %idpName% limits access to it (the "Service Provider") with an authorization policy. Please contact the service desk of %idpName% if you think you should be allowed access to this service.', - 'error_authorization_policy_violation_desc_no_name' => 'You cannot use this service because your %organisationNoun% limits access to this service (the "Service Provider") with an authorization policy. Please contact the helpdesk of your %organisationNoun% if you think you should be allowed access to this service.', + 'error_authorization_policy_violation_desc' => 'You cannot use application %spName% because %idpName% limits access to it with an authorization policy. Please contact the service desk of %idpName% if you think you should be allowed access to %spName%.', + 'error_authorization_policy_violation_desc_no_idp_name' => 'You cannot use %spName% because your %organisationNoun% limits access with an authorization policy. Please contact the service desk of your %organisationNoun% if you think you should be allowed access to %spName%.', + 'error_authorization_policy_violation_desc_no_sp_name' => 'You cannot use this application because %idpName% limits access with an authorization policy. Please contact the service desk of %idpName% if you think you should be allowed access to this application.', + 'error_authorization_policy_violation_desc_no_name' => 'You cannot use this application because your %organisationNoun% limits access with an authorization policy. Please contact the helpdesk of your %organisationNoun% if you think you should be allowed access to this application.', 'error_authorization_policy_violation_info' => 'Message from %idpName%: ', 'error_authorization_policy_violation_info_no_idp_name' => 'Message from your %organisationNoun%: ', 'error_no_message' => 'Error - No message received', @@ -179,17 +179,17 @@ 'error_unsupported_signature_method' => 'Error - Signature method is not supported', 'error_unsupported_signature_method_desc' => 'The signature method %arg1% is not supported, please upgrade to RSA-SHA256 (http://www.w3.org/2001/04/xmldsig-more#rsa-sha256).', 'error_unknown_keyid' => 'Error - unknown key id', - 'error_unknown_keyid_desc' => 'The requested key-ID is not known to %suiteName%. Perhaps the service provider is using outdated metadata or has a configuration error.', + 'error_unknown_keyid_desc' => 'The requested key-ID is not known to %suiteName%. Perhaps the application is using outdated metadata or has a configuration error.', 'error_unknown_preselected_idp' => 'Error - %spName% not accessible through your %organisationNoun%', - 'error_unknown_preselected_idp_no_sp_name' => 'Error - Service not accessible through your %organisationNoun%', - 'error_unknown_preselected_idp_desc' => 'The %organisationNoun% that you want to use to login to %spName% did not activate access to it. This means you are unable to use %spName% through %suiteName%. Please contact the service desk of your %organisationNoun% to request access. State it is about %spName% and why you need access.', - 'error_unknown_preselected_idp_desc_no_sp_name' => 'The %organisationNoun% that you want to use to login to this service did not activate access to this service. This means you are unable to use this service through %suiteName%. Please contact the helpdesk of your %organisationNoun% to request access to this service. State what service it is about (the "SP") and why you need access.', + 'error_unknown_preselected_idp_no_sp_name' => 'Error - Application not accessible through your %organisationNoun%', + 'error_unknown_preselected_idp_desc' => 'The %organisationNoun% that you want to use to log in to %spName% did not activate access to it. This means you are unable to use %spName% through %suiteName%. Please contact the service desk of your %organisationNoun% to request access. State it is about %spName% and why you need access.', + 'error_unknown_preselected_idp_desc_no_sp_name' => 'The %organisationNoun% that you want to use to log in to this application did not activate access to this application. This means you are unable to use this application through %suiteName%. Please contact the helpdesk of your %organisationNoun% to request access to this application. State what application it is about and why you need access.', 'error_unknown_service_provider' => 'Error - %spName% unknown', - 'error_unknown_service_provider_no_sp_name' => 'Error - Unknown service', + 'error_unknown_service_provider_no_sp_name' => 'Error - Unknown application', 'error_unknown_service_provider_desc' => 'You are trying to log in to %spName%, but this is unknown to %suiteName%. Possibly %idpName% has never enabled access to %spName%. If you would like to use it, please contact the service desk of %idpName%.', - 'error_unknown_service_provider_desc_no_sp_name' => 'The service you are trying to log in to is unknown to %suiteName%. Possibly %idpName% has never enabled access to this service. If you would like to use this service, please contact the helpdesk of %idpName%.', + 'error_unknown_service_provider_desc_no_sp_name' => 'The application you are trying to log in to is unknown to %suiteName%. Possibly %idpName% has never enabled access to this application. If you would like to use this application, please contact the helpdesk of %idpName%.', 'error_unknown_service_provider_desc_no_idp_name' => 'You are trying to log in to %spName%. Possibly your %organisationNoun% has never enabled access to %spName%. If you would like to use it, please contact the helpdesk of your %organisationNoun%.', - 'error_unknown_service_provider_desc_no_names' => 'The service you are trying to log in to is unknown to %suiteName%. Possibly your %organisationNoun% has never enabled access to this service. If you would like to use this service, please contact the helpdesk of your %organisationNoun%.', + 'error_unknown_service_provider_desc_no_names' => 'The application you are trying to log in to is unknown to %suiteName%. Possibly your %organisationNoun% has never enabled access to this application. If you would like to use this application, please contact the helpdesk of your %organisationNoun%.', 'error_unsupported_acs_location_scheme' => 'Error - Unsupported URI scheme in ACS location', @@ -199,20 +199,20 @@ 'error_unknown_identity_provider_desc_no_idp_name' => 'The %organisationNoun% you are trying to log in with is unknown to %suiteName%.', 'error_generic' => 'Error - An error occurred', 'error_generic_desc' => 'Logging in has failed and we don\'t know exactly why. Please try again first by going back to %spName% and logging in again. If this doesn\'t work, please contact the service desk of %idpName%.', - 'error_generic_desc_no_sp_name' => 'Logging in has failed and we don\'t know exactly why. Please try again first by going back to the service and logging in again. If this doesn\'t work, please contact the service desk of %idpName%.', + 'error_generic_desc_no_sp_name' => 'Logging in has failed and we don\'t know exactly why. Please try again first by going back to the application and logging in again. If this doesn\'t work, please contact the service desk of %idpName%.', 'error_generic_desc_no_idp_name' => 'Logging in has failed and we don\'t know exactly why. Please try again first by going back to %spName% and logging in again. If this doesn\'t work, please contact the service desk of your %organisationNoun%.', - 'error_generic_desc_no_names' => 'Logging in has failed and we don\'t know exactly why. Please try again first by going back to the service and logging in again. If this doesn\'t work, please contact the service desk of your %organisationNoun%.', + 'error_generic_desc_no_names' => 'Logging in has failed and we don\'t know exactly why. Please try again first by going back to the application and logging in again. If this doesn\'t work, please contact the service desk of your %organisationNoun%.', 'error_missing_required_fields' => 'Error - Missing required fields', 'error_missing_required_fields_desc'=> '%idpName% does not provide the mandatory information or it has an invalid format. Therefore, you can not use %spName%. Please contact the service desk of %idpName% and tell them one or more of the the following required attributes are not being set correctly for %suiteName%:', 'error_missing_required_fields_desc_no_idp_name'=> 'Your %organisationNoun% does not provide the mandatory information. Therefore, you can not use %spName%. Please contact your %organisationNoun% and tell them one or more of the the following required attribute(s) are missing within %suiteName%:', - 'error_missing_required_fields_desc_no_sp_name'=> '%idpName% does not provide the mandatory information. Therefore, you can not use this service. Please contact the service desk of %idpName% and tell them one or more of the the following required attribute(s) are missing within %suiteName%:', + 'error_missing_required_fields_desc_no_sp_name'=> '%idpName% does not provide the mandatory information. Therefore, you can not use this application. Please contact the service desk of %idpName% and tell them one or more of the the following required attribute(s) are missing within %suiteName%:', 'error_missing_required_fields_desc_no_name'=> ' -Your %organisationNoun% does not provide the mandatory information. Therefore, you can not use this service. Please contact your %organisationNoun% and tell them one or more of the the following required attribute(s) are missing within %suiteName%:', +Your %organisationNoun% does not provide the mandatory information. Therefore, you can not use this application. Please contact your %organisationNoun% and tell them one or more of the the following required attribute(s) are missing within %suiteName%:', 'error_invalid_attribute_value' => 'Error - Attribute value not allowed', 'error_invalid_attribute_value_desc' => '%idpName% sends a value for attribute %attributeName% ("%attributeValue%") which is not allowed for this %organisationNoun%. Therefore you cannot log in. Only %idpName% can resolve this. Please contact the service desk of %idpName% to fix this problem.', 'error_invalid_attribute_value_desc_no_idp_name' => 'Your %organisationNoun% sends a value for attribute %attributeName% ("%attributeValue%") which is not allowed for this %organisationNoun%. Therefore you cannot log in. Only your %organisationNoun% can resolve this. Please contact the service desk of your own %organisationNoun% to fix this problem.', 'error_received_error_status_code' => 'Error - Identity Provider error', - 'error_received_error_status_code_desc'=> 'Your %organisationNoun% has denied you access to this service. You will have to contact your own (IT-)service desk to see if this can be fixed.', + 'error_received_error_status_code_desc'=> 'Your %organisationNoun% has denied you access to this application. You will have to contact your service desk to see if this can be fixed.', 'error_received_invalid_response' => 'Error - Invalid %idpName% SAML response', 'error_received_invalid_response_no_idp_name' => 'Error - Invalid %organisationNoun% SAML response', 'error_received_invalid_signed_response'=> 'Error - Invalid signature on %idpName% response', @@ -220,15 +220,15 @@ 'error_stuck_in_authentication_loop' => 'Error - You got stuck in a black hole', 'error_stuck_in_authentication_loop_desc' => 'You\'ve successfully authenticated at %idpName% but %spName% sends you back again to %suiteName%. Because you are already logged in, %suiteName% then sends you back to %spName%, which results in an infinite black hole. Likely, this is caused by an error at %spName%.', 'error_stuck_in_authentication_loop_desc_no_idp_name' => 'You\'ve successfully authenticated at your %organisationNoun% but %spName% sends you back again to %suiteName%. Because you are already logged in, %suiteName% then sends you back to %spName%, which results in an infinite black hole. Likely, this is caused by an error at %spName%.', - 'error_stuck_in_authentication_loop_desc_no_sp_name' => 'You\'ve successfully authenticated at %idpName% but the service you are trying to access sends you back again to %suiteName%. Because you are already logged in, %suiteName% then sends you back to the service, which results in an infinite black hole. Likely, this is caused by an error at the Service Provider.', - 'error_stuck_in_authentication_loop_desc_no_name' => 'You\'ve successfully authenticated at your %organisationNoun% but the service you are trying to access sends you back again to %suiteName%. Because you are already logged in, %suiteName% then sends you back to the service, which results in an infinite black hole. Likely, this is caused by an error at the Service Provider.', + 'error_stuck_in_authentication_loop_desc_no_sp_name' => 'You\'ve successfully authenticated at %idpName% but the application you are trying to access sends you back again to %suiteName%. Because you are already logged in, %suiteName% then sends you back to the application, which results in an infinite black hole. Likely, this is caused by an error at the application side.', + 'error_stuck_in_authentication_loop_desc_no_name' => 'You\'ve successfully authenticated at your %organisationNoun% but the application you are trying to access sends you back again to %suiteName%. Because you are already logged in, %suiteName% then sends you back to the application, which results in an infinite black hole. Likely, this is caused by an error at the application side.', 'error_no_authentication_request_received' => 'Error - No authentication request received.', 'error_authn_context_class_ref_blacklisted' => 'Error - AuthnContextClassRef value is not allowed', - 'error_authn_context_class_ref_blacklisted_desc' => 'You cannot login because %idpName% sent a value for AuthnContextClassRef that is not allowed. Please contact the service desk of %idpName% to solve this.', - 'error_authn_context_class_ref_blacklisted_desc_no_idp_name' => 'You cannot login because your %organisationNoun% sent a value for AuthnContextClassRef that is not allowed. Please contact the service desk of your %organisationNoun% to solve this.', + 'error_authn_context_class_ref_blacklisted_desc' => 'You cannot log in because %idpName% sent a value for AuthnContextClassRef that is not allowed. Please contact the service desk of %idpName% to solve this.', + 'error_authn_context_class_ref_blacklisted_desc_no_idp_name' => 'You cannot log in because your %organisationNoun% sent a value for AuthnContextClassRef that is not allowed. Please contact the service desk of your %organisationNoun% to solve this.', 'error_invalid_mfa_authn_context_class_ref' => 'Error - Multi factor authentication failed', - 'error_invalid_mfa_authn_context_class_ref_desc' => '%idpName% requires multi-factor authentication for this service. However, your second factor could not be validated. Please contact the service desk of %idpName% to solve this.', - 'error_invalid_mfa_authn_context_class_ref_desc_no_idp_name' => 'Your %organisationNoun% requires multi-factor authentication for this service. However, your second factor could not be validated. Please contact the service desk of your %organisationNoun% to solve this.', + 'error_invalid_mfa_authn_context_class_ref_desc' => '%idpName% requires multi-factor authentication for this application. However, your second factor could not be validated. Please contact the service desk of %idpName% to solve this.', + 'error_invalid_mfa_authn_context_class_ref_desc_no_idp_name' => 'Your %organisationNoun% requires multi-factor authentication for this application. However, your second factor could not be validated. Please contact the service desk of your %organisationNoun% to solve this.', /** * %1 AttributeName * %2 Options @@ -250,19 +250,19 @@ 'error_attribute_validator_availability' => '\'%arg3%\' is a reserved schacHomeOrganization for another Identity Provider', 'allowed_scopes' => 'Allowed scopes', - 'error_unknown_requesterid_in_authnrequest' => 'Error - Unknown service', - 'error_unknown_requesterid_in_authnrequest_desc' => 'Your requested service couldn\'t be found.', + 'error_unknown_requesterid_in_authnrequest' => 'Error - Unknown application', + 'error_unknown_requesterid_in_authnrequest_desc' => 'Your requested application couldn\'t be found.', 'error_clock_issue_title' => 'Error - The Assertion is not yet valid or has expired', 'error_clock_issue_desc' => 'This is likely because the difference in time between %idpName% and %suiteName% it too large. Please verify that the time on the %organisationNoun% is correct.', 'error_clock_issue_desc_no_idp_name' => 'This is likely because the difference in time between %organisationNoun% and %suiteName% it too large. Please verify that the time on the IdP is correct.', 'error_stepup_callout_unknown_title' => 'Error - Unknown strong authentication failure', - 'error_stepup_callout_unknown_desc' => 'Logging in with strong authentication has failed and we don\'t know exactly why . Please try again first by going back to the service and logging in again . If this doesn\'t work, please contact the service desk of your %organisationNoun%.', + 'error_stepup_callout_unknown_desc' => 'Logging in with strong authentication has failed and we don\'t know exactly why . Please try again first by going back to the application and logging in again . If this doesn\'t work, please contact the service desk of your %organisationNoun%.', 'error_stepup_callout_unmet_loa_title' => 'Error - No suitable token found', - 'error_stepup_callout_unmet_loa_desc' => 'To continue to this service, a registered token with a certain level of assurance is required. Currently, you either haven\'t registered a token at all, or the level of assurance of the token you did register is too low. See the link below for more information about the registration process.', + 'error_stepup_callout_unmet_loa_desc' => 'To continue to this application, a registered token with a certain level of assurance is required. Currently, you either haven\'t registered a token at all, or the level of assurance of the token you did register is too low. See the link below for more information about the registration process.', 'error_stepup_callout_unmet_loa_link_text' => 'Read more about the registration process.', 'error_stepup_callout_unmet_loa_link_target' => 'https://support.surfconext.nl/stepup-noauthncontext-en', 'error_stepup_callout_user_cancelled_title' => 'Error - Logging in cancelled', - 'error_stepup_callout_user_cancelled_desc' => 'You have aborted the login process. Go back to the service if you want to try again.', + 'error_stepup_callout_user_cancelled_desc' => 'You have aborted the login process. Go back to the application if you want to try again.', 'error_metadata_entity_id_not_found' => 'Metadata can not be generated', 'error_metadata_entity_id_not_found_desc' => 'The following error occurred: %message%', 'attributes_validation_succeeded' => 'Authentication success', diff --git a/languages/messages.nl.php b/languages/messages.nl.php index aa29bbf6d0..efd6384bd5 100644 --- a/languages/messages.nl.php +++ b/languages/messages.nl.php @@ -37,12 +37,12 @@ // General 'value' => 'Waarde', 'post_data' => 'POST Data', - 'processing' => 'Verbinden met de dienst', - 'processing_waiting' => 'Wachten op een reactie van de dienst.', + 'processing' => 'Verbinden met de applicatie', + 'processing_waiting' => 'Wachten op een reactie van de applicatie.', 'processing_long' => 'Wees a.u.b. geduldig, het kan even duren...', 'go_back' => '<< Ga terug', 'note' => 'Mededeling', - 'note_no_script' => 'Jouw browser ondersteunt geen JavaScript. Je moet op de onderstaande knop drukken om door te gaan.', + 'note_no_script' => 'Jouw browser ondersteunt geen JavaScript. Gebruik de onderstaande knop om door te gaan.', 'unknown_organization_name' => 'Onbekend', 'site_notice' => 'Hallo, mijnheer De Uil
Waar breng je ons naar toe
Naar Fabeltjesland
Eh, ja, naar Fabeltjesland
En lees je ons dan voor
Uit de Fabeltjeskrant
Ja, ja, uit de Fabeltjeskrant
Want daarin staat precies vermeld
Hoe het met de dieren is gesteld
Echt waar? Echt waar
Echt waar mijnheer De Uil.
Esta ação requer uma sessão ativa, no entanto, não conseguimos encontrar a sessão. Está a aguardar há muito tempo? Feche o browser e tente novamente, ou tente um browser diferente.
', 'error_session_not_started' => 'Erro - a sua sessão não foi encontrada', diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Command/DumpServiceRegistryCommand.php b/src/OpenConext/EngineBlockFunctionalTestingBundle/Command/DumpServiceRegistryCommand.php index dc2cffe9e5..9caa7eea00 100644 --- a/src/OpenConext/EngineBlockFunctionalTestingBundle/Command/DumpServiceRegistryCommand.php +++ b/src/OpenConext/EngineBlockFunctionalTestingBundle/Command/DumpServiceRegistryCommand.php @@ -25,7 +25,7 @@ use Symfony\Component\Console\Output\OutputInterface; /** - * Dump the contents of the (fake) Service Registry + * Dump the contents of the (fake) application Registry */ class DumpServiceRegistryCommand extends ContainerAwareCommand { diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeManipulation.feature b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeManipulation.feature index cf7dcb8071..8cf7b473fd 100644 --- a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeManipulation.feature +++ b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeManipulation.feature @@ -15,7 +15,7 @@ Feature: And a Service Provider named "Stepup SelfService" And feature "eb.run_all_manipulations_prior_to_consent" is disabled - Scenario: The Service Provider can have an attribute added + Scenario: The application can have an attribute added Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $attributes['nl:surf:test:something'] = array("arbitrary-value"); @@ -31,7 +31,7 @@ Feature: Then the url should match "functional-testing/SP-with-Attribute-Manipulations/acs" And the response should match xpath '/samlp:Response/saml:Assertion/saml:AttributeStatement/saml:Attribute[@Name="nl:surf:test:something"]/saml:AttributeValue[text()="arbitrary-value"]' - Scenario: The Service Provider can have the attributes manipulated + Scenario: The application can have the attributes manipulated Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $attributes['urn:mace:dir:attribute-def:uid'] = array("the-manipulated-value"); @@ -46,7 +46,7 @@ Feature: Then the url should match "functional-testing/SP-with-Attribute-Manipulations/acs" And the response should match xpath '/samlp:Response/saml:Assertion/saml:AttributeStatement/saml:Attribute[@Name="urn:mace:dir:attribute-def:uid"]/saml:AttributeValue[text()="the-manipulated-value"]' - Scenario: The Service Provider can have the SubjectID manipulated + Scenario: The application can have the SubjectID manipulated Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $subjectId = 'arthur.dent@domain.test'; @@ -63,7 +63,7 @@ Feature: And the response should match xpath '/samlp:Response/saml:Assertion/saml:AttributeStatement/saml:Attribute[@Name="urn:mace:dir:attribute-def:eduPersonTargetedID"]/saml:AttributeValue/saml:NameID[@Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" and text()="arthur.dent@domain.test"]' And the response should match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" and text()="arthur.dent@domain.test"]' - Scenario: The Service Provider cannot have the SubjectID manipulated if using a NameID format other than unspecified + Scenario: The application cannot have the SubjectID manipulated if using a NameID format other than unspecified Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $subjectId = "arthur.dent@domain.test"; @@ -82,7 +82,7 @@ Feature: And the response should not match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" and text()="arthur.dent@domain.test"]' And the response should match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent"]' - Scenario: The Service Provider cannot have the Subject NameID manipulated by setting the IntendedNameId in the reponse as it is overwritten by the subjectId + Scenario: The application cannot have the Subject NameID manipulated by setting the IntendedNameId in the reponse as it is overwritten by the subjectId Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $response['__']['IntendedNameId'] = 'NOOT'; @@ -103,7 +103,7 @@ Feature: And the response should not match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" and text()="NOOT"]' And the response should match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" and text()="AAP"]' - Scenario: The Service Provider can replace the NameID by setting the CustomNameID with an array representation of the NameID + Scenario: The application can replace the NameID by setting the CustomNameID with an array representation of the NameID Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $response['__']['CustomNameId'] = array('Format' => 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient', 'Value' => 'NOOT'); @@ -121,7 +121,7 @@ Feature: And the response should match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" and text()="NOOT"]' # See: https://www.pivotaltracker.com/story/show/159760842 - Scenario: The Service Provider can replace the NameID by setting the CustomNameID with an object representation of the NameID + Scenario: The application can replace the NameID by setting the CustomNameID with an object representation of the NameID Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $nameId = new \SAML2\XML\saml\NameID(); @@ -141,7 +141,7 @@ Feature: And the response should match xpath '/samlp:Response/saml:Assertion/saml:AttributeStatement/saml:Attribute[@Name="urn:mace:dir:attribute-def:eduPersonTargetedID"]/saml:AttributeValue/saml:NameID[@Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" and text()="MIES"]' And the response should match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" and text()="MIES"]' - Scenario: The Service Provider cannot have the SubjectID manipulated by manipulating the responseObj using the unspecified NameID Format + Scenario: The application cannot have the SubjectID manipulated by manipulating the responseObj using the unspecified NameID Format Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $responseObj->setCollabPersonId('NOOT'); @@ -160,7 +160,7 @@ Feature: And the response should not match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" and text()="NOOT"]' And the response should match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"]' - Scenario: The Service Provider cannot have the SubjectID manipulated by manipulating the responseObj when using a NameID Format other than unspecified + Scenario: The application cannot have the SubjectID manipulated by manipulating the responseObj when using a NameID Format other than unspecified Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $responseObj->setCollabPersonId('NOOT'); diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeManipulationException.feature b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeManipulationException.feature index 9cae8f425a..e994c9fe08 100644 --- a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeManipulationException.feature +++ b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeManipulationException.feature @@ -12,15 +12,15 @@ Feature: And a Service Provider named "Dummy-SP" And a Service Provider named "SP-with-Attribute-Manipulations" - Scenario: The Service Provider can have an attribute added + Scenario: The application can have an attribute added Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $e = new EngineBlock_Attributes_Manipulator_CustomException("AM_ERROR Authorization Incorrect _ Affilliation Incorrect", EngineBlock_Attributes_Manipulator_CustomException::CODE_NOTICE); $e->setFeedbackTitle(array("nl" => "Autorisatie Incorrect", "en" => "Authorization Incorrect")); $e->setFeedbackDescription(array( - "en" => 'This user does not have access to desired service. ' . + "en" => 'This user does not have access to desired application. ' . 'Contact the system administrator.', - "nl" => 'Deze gebruikersnaam heeft geen toegang tot de gewenste dienst. ' . + "nl" => 'Deze gebruikersnaam heeft geen toegang tot de gewenste applicatie. ' . 'Neem contact op met de systeem beheerder. ' )); throw $e; @@ -31,7 +31,7 @@ throw $e; And I pass through the IdP And I give my consent Then I should see "Authorization Incorrect" - And I should see "This user does not have access to desired service. Contact the system administrator." + And I should see "This user does not have access to desired application. Contact the system administrator." And I should see "UR ID:" And I should see "IP:" And I should see "EC:" diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeManipulationWithAllManipulationsBeforeConsent.feature b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeManipulationWithAllManipulationsBeforeConsent.feature index 02a29a8e18..fab9c457fb 100644 --- a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeManipulationWithAllManipulationsBeforeConsent.feature +++ b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeManipulationWithAllManipulationsBeforeConsent.feature @@ -13,7 +13,7 @@ Feature: And a Service Provider named "SP-with-Attribute-Manipulations" And feature "eb.run_all_manipulations_prior_to_consent" is enabled - Scenario: The Service Provider can have an attribute added + Scenario: The application can have an attribute added Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $attributes['nl:surf:test:something'] = array("arbitrary-value"); @@ -29,7 +29,7 @@ Feature: Then the url should match "functional-testing/SP-with-Attribute-Manipulations/acs" And the response should match xpath '/samlp:Response/saml:Assertion/saml:AttributeStatement/saml:Attribute[@Name="nl:surf:test:something"]/saml:AttributeValue[text()="arbitrary-value"]' - Scenario: The Service Provider can have the attributes manipulated + Scenario: The application can have the attributes manipulated Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $attributes['urn:mace:dir:attribute-def:uid'] = array("the-manipulated-value"); @@ -44,7 +44,7 @@ Feature: Then the url should match "functional-testing/SP-with-Attribute-Manipulations/acs" And the response should match xpath '/samlp:Response/saml:Assertion/saml:AttributeStatement/saml:Attribute[@Name="urn:mace:dir:attribute-def:uid"]/saml:AttributeValue[text()="the-manipulated-value"]' - Scenario: The Service Provider can have the SubjectID manipulated + Scenario: The application can have the SubjectID manipulated Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $subjectId = 'arthur.dent@domain.test'; @@ -61,7 +61,7 @@ Feature: And the response should match xpath '/samlp:Response/saml:Assertion/saml:AttributeStatement/saml:Attribute[@Name="urn:mace:dir:attribute-def:eduPersonTargetedID"]/saml:AttributeValue/saml:NameID[@Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" and text()="arthur.dent@domain.test"]' And the response should match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" and text()="arthur.dent@domain.test"]' - Scenario: The Service Provider cannot have the SubjectID manipulated if using a NameID format other than unspecified + Scenario: The application cannot have the SubjectID manipulated if using a NameID format other than unspecified Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $subjectId = "arthur.dent@domain.test"; @@ -80,7 +80,7 @@ Feature: And the response should not match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" and text()="arthur.dent@domain.test"]' And the response should match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent"]' - Scenario: The Service Provider cannot have the Subject NameID manipulated by setting the IntendedNameId in the reponse as it is overwritten by the subjectId + Scenario: The application cannot have the Subject NameID manipulated by setting the IntendedNameId in the reponse as it is overwritten by the subjectId Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $response['__']['IntendedNameId'] = 'NOOT'; @@ -101,7 +101,7 @@ Feature: And the response should not match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" and text()="NOOT"]' And the response should match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" and text()="AAP"]' - Scenario: The Service Provider can replace the NameID by setting the CustomNameID with an array representation of the NameID + Scenario: The application can replace the NameID by setting the CustomNameID with an array representation of the NameID Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $response['__']['CustomNameId'] = array('Format' => 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient', 'Value' => 'NOOT'); @@ -118,7 +118,7 @@ Feature: And the response should match xpath '/samlp:Response/saml:Assertion/saml:AttributeStatement/saml:Attribute[@Name="urn:mace:dir:attribute-def:eduPersonTargetedID"]/saml:AttributeValue/saml:NameID[@Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" and text()="NOOT"]' And the response should match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" and text()="NOOT"]' - Scenario: The Service Provider cannot have the SubjectID manipulated by manipulating the responseObj using the unspecified NameID Format + Scenario: The application cannot have the SubjectID manipulated by manipulating the responseObj using the unspecified NameID Format Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $responseObj->setCollabPersonId('NOOT'); @@ -137,7 +137,7 @@ Feature: And the response should not match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" and text()="NOOT"]' And the response should match xpath '/samlp:Response/saml:Assertion/saml:Subject/saml:NameID[@Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"]' - Scenario: The Service Provider cannot have the SubjectID manipulated by manipulating the responseObj when using a NameID Format other than unspecified + Scenario: The application cannot have the SubjectID manipulated by manipulating the responseObj when using a NameID Format other than unspecified Given SP "SP-with-Attribute-Manipulations" has the following Attribute Manipulation: """ $responseObj->setCollabPersonId('NOOT'); diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/ClearErrorMessages.feature b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/ClearErrorMessages.feature index 6783f5e926..bcfec84d71 100644 --- a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/ClearErrorMessages.feature +++ b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/ClearErrorMessages.feature @@ -11,7 +11,7 @@ Feature: And a Service Provider named "Dummy SP" And a Service Provider named "Unconnected SP" And a Service Provider named "Trusted SP" - And an unregistered Service Provider named "Unregistered SP" + And an unregistered application named "Unregistered SP" And SP "Unconnected SP" is not connected to IdP "Dummy Idp" Scenario: I log in at my Identity Provider, but something goes wrong and it returns an error response. @@ -105,7 +105,7 @@ Feature: And I should see "SP Name:" And I should see "IdP:" - Scenario: I want to log on, but this Service Provider may not access any Identity Providers + Scenario: I want to log on, but this application may not access any Identity Providers When I log in at "Unconnected SP" Then I should see "No organisations found" And I should see "UR ID:" @@ -115,7 +115,7 @@ Feature: And I should see "SP Name:" And I should not see "IdP:" - Scenario: I want to log on, but the proxied Service Provider may not access any Identity Providers + Scenario: I want to log on, but the proxied application may not access any Identity Providers Given SP "Trusted SP" is a trusted proxy And SP "Trusted SP" signs its requests And SP "Trusted SP" is authenticating for SP "Unconnected SP" @@ -123,9 +123,9 @@ Feature: Then I should see "Error - No organisations found" And I should see "Proxy SP:" - Scenario: I want to log on but this Service Provider is not yet registered at OpenConext + Scenario: I want to log on but this application is not yet registered at OpenConext When I log in at "Unregistered SP" - Then I should see "Error - Unknown service" + Then I should see "Error - Unknown application" And I should see "UR ID:" And I should see "IP:" And I should see "EC:" @@ -153,7 +153,7 @@ Feature: And SP "Trusted SP" requires a RequesterId And SP "Trusted SP" is authenticating and uses RequesterID "" When I log in at "Trusted SP" - Then I should see "Error - Unknown service" + Then I should see "Error - Unknown application" And I should see "UR ID:" And I should see "IP:" And I should see "EC:" @@ -198,7 +198,7 @@ Feature: Scenario: An SP sends a AuthnRequest transparently for an IdP that doesn't exist When I log in at SP "Dummy SP" which attempts to preselect nonexistent IdP "DoesNotExist" Then the url should match "/authentication/feedback/unknown-preselected-idp" - And I should see "Error - Service not accessible through your organisation" + And I should see "Error - Application not accessible through your organisation" And I should see "UR ID:" And I should see "IP:" And I should see "EC:" @@ -423,8 +423,8 @@ Feature: # Scenario: I try an unsolicited login (at EB) but mess up by not specifying a binding # Scenario: I try an unsolicited login (at EB) but mess up by not specifying an invalid index # -# Scenario: I don't give consent to release my attributes to a Service Provider +# Scenario: I don't give consent to release my attributes to an application # # Scenario: An attribute manipulation determines that a user may not continue # -# Scenario: I want to log in to a service but am not a member of the appropriate VO +# Scenario: I want to log in to an application but am not a member of the appropriate VO diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/Consent.feature b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/Consent.feature index ff6e02c9ac..c57cf198ac 100644 --- a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/Consent.feature +++ b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/Consent.feature @@ -70,7 +70,7 @@ Feature: And I pass through the IdP Then the response should contain "Dummy-SP will receive" - Scenario: The user can read why the service provider requires an attribute + Scenario: The user can read why the application requires an attribute Given I log in at "Dummy-SP" And I pass through EngineBlock And I pass through the IdP @@ -100,14 +100,14 @@ Feature: And I log in at "Dummy-SP" And I pass through EngineBlock And I pass through the IdP - Then the response should contain "The identifier for this service is generated by" + Then the response should contain "The identifier for this application is generated by" Scenario: The user sees the identifier section when nameid is transient Given SP "Dummy-SP" uses the Transient NameID format And I log in at "Dummy-SP" And I pass through EngineBlock And I pass through the IdP - Then the response should not contain "The identifier for this service is generated by" + Then the response should not contain "The identifier for this application is generated by" Scenario: The user does not see the identifier section when nameid is unspecified Given SP "Dummy-SP" uses the Unspecified NameID format @@ -115,7 +115,7 @@ Feature: And I pass through EngineBlock And I pass through the IdP Then the response should contain "urn:collab:person:engine-test-stand.openconext.org:test" - Then the response should not contain "The identifier for this service is generated by" + Then the response should not contain "The identifier for this application is generated by" Scenario: The user is not asked for consent when the consent feature toggle is disabled Given feature "eb.feature_enable_consent" is disabled @@ -134,7 +134,7 @@ Feature: When I log in at "Trusted Proxy" And I pass through EngineBlock And I pass through the IdP - Then the response should contain "The identifier for this service is generated by" + Then the response should contain "The identifier for this application is generated by" Scenario: The user sees the identifier of the end-SP when a trusted proxy is involved, unspecified edition Given SP "Trusted Proxy" is authenticating for SP "Dummy-SP" @@ -146,4 +146,4 @@ Feature: And I pass through EngineBlock And I pass through the IdP Then the response should contain "urn:collab:person:engine-test-stand.openconext.org:test" - Then the response should not contain "The identifier for this service is generated by" + Then the response should not contain "The identifier for this application is generated by" diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/Context/MockSpContext.php b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/Context/MockSpContext.php index 3e2a02d225..ef7f9020fd 100644 --- a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/Context/MockSpContext.php +++ b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/Context/MockSpContext.php @@ -110,7 +110,7 @@ public function iTriggerTheLoginEitherAtOrUnsolicitedAtEb($spName) } /** - * @Given /^a Service Provider named "([^"]*)"$/ + * @Given /^an application named "([^"]*)"$/ */ public function aServiceProviderNamedWithEntityid($name) { @@ -124,7 +124,7 @@ public function aServiceProviderNamedWithEntityid($name) } /** - * @Given /^an unregistered Service Provider named "([^"]*)"$/ + * @Given /^an unregistered application named "([^"]*)"$/ */ public function anUnregisteredServiceProviderNamed($name) { diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/PolicyEnforcement.feature b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/PolicyEnforcement.feature index ccecb2fa9b..622c3d3640 100644 --- a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/PolicyEnforcement.feature +++ b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/PolicyEnforcement.feature @@ -20,7 +20,7 @@ Feature: And I pass through the IdP And I should see "Error - Access denied" And I should see "Message from your organisation:" - And I should see "Students of MyIdP do not have access to this resource" + And I should see "Students of MyIdP do not have access to this application" And the response should contain "idp-logo.jpg" Scenario: Access is denied because of a Deny policy diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/SingleSignOnWithScoping.feature b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/SingleSignOnWithScoping.feature index 41731f7c93..c3035d10df 100644 --- a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/SingleSignOnWithScoping.feature +++ b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/SingleSignOnWithScoping.feature @@ -1,5 +1,5 @@ Feature: - In order for a service provider to pre-select one or more IDPs + In order for an application to pre-select one or more IDPs As EngineBlock I want to limit the available IDPs in the WAYF based on ACLs or elements in the AuthnRequest diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/SpProxy.feature b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/SpProxy.feature index 36d0be3019..065312731f 100644 --- a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/SpProxy.feature +++ b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/SpProxy.feature @@ -16,7 +16,7 @@ Feature: And a Service Provider named "Far SP" And a Service Provider named "Test SP" And a Service Provider named "Second SP" - And an unregistered Service Provider named "Unregistered SP" + And an unregistered application named "Unregistered SP" And SP "Far SP" is not connected to IdP "CombinedAuth" And SP "Far SP" is not connected to IdP "LoaOnlyAuth" And SP "Far SP" is not connected to IdP "StepUpOnlyAuth" @@ -92,7 +92,7 @@ Feature: And SP "Step Up" is a trusted proxy And SP "Step Up" signs its requests When I log in at "Step Up" - Then I should see "Select an account to login to Loa SP" + Then I should see "Select an account to log in to Loa SP" And I select "AlwaysAuth" on the WAYF And I pass through EngineBlock And I pass through the IdP @@ -222,7 +222,7 @@ Feature: And SP "Step Up" does not require consent And SP "Step Up" uses the Unspecified NameID format When I log in at "Step Up" - Then I should see "Error - Unknown service" + Then I should see "Error - Unknown application" And I should see "Proxy SP:" Scenario: User logs in via misconfigured trusted proxy and sees error @@ -230,14 +230,14 @@ Feature: And SP "Step Up" is a trusted proxy And SP "Step Up" signs its requests When I log in at "Step Up" - Then I should see "Error - Unknown service" + Then I should see "Error - Unknown application" Scenario: User logs in via trusted proxy which requests unknown SP and sees error Given SP "Step Up" is authenticating for SP "Unregistered SP" And SP "Step Up" is a trusted proxy And SP "Step Up" signs its requests When I log in at "Step Up" - Then I should see "Error - Unknown service" + Then I should see "Error - Unknown application" And I should see "UR ID:" And I should see "EC:" And I should see "SP:" @@ -261,7 +261,7 @@ Feature: # Bug report: https://www.pivotaltracker.com/story/show/164069793 Then I should not see "Error - No organisations found" # The WAYF should be visible - And I should see "Select an account to login to" + And I should see "Select an account to log in to" Scenario: Trusted proxy not signing requests results in an error Given SP "Step Up" is authenticating for SP "Loa SP" diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Fixtures/FunctionalTestingPdpClient.php b/src/OpenConext/EngineBlockFunctionalTestingBundle/Fixtures/FunctionalTestingPdpClient.php index d1fc16c62d..8f277b2b70 100644 --- a/src/OpenConext/EngineBlockFunctionalTestingBundle/Fixtures/FunctionalTestingPdpClient.php +++ b/src/OpenConext/EngineBlockFunctionalTestingBundle/Fixtures/FunctionalTestingPdpClient.php @@ -75,10 +75,10 @@ public function requestDecisionFor(Request $request) : PolicyDecision $englishDenyMessage = new AttributeAssignment(); $englishDenyMessage->attributeId = 'DenyMessage:en'; - $englishDenyMessage->value = sprintf('Students of %s do not have access to this resource', $idp); + $englishDenyMessage->value = sprintf('Students of %s do not have access to this application', $idp); $dutchDenyMessage = new AttributeAssignment(); $dutchDenyMessage->attributeId = 'DenyMessage:nl'; - $dutchDenyMessage->value = sprintf('Studenten van %s hebben geen toegang tot deze dienst', $idp); + $dutchDenyMessage->value = sprintf('Studenten van %s hebben geen toegang tot deze applicatie', $idp); $idpOnlyMessage = new AttributeAssignment(); $idpOnlyMessage->attributeId = 'IdPOnly'; $idpOnlyMessage->value = true; diff --git a/tests/e2e/cypress/integration/openconext/consent/consent.material.spec.js b/tests/e2e/cypress/integration/openconext/consent/consent.material.spec.js index c2b141fe20..7fc7b5b954 100644 --- a/tests/e2e/cypress/integration/openconext/consent/consent.material.spec.js +++ b/tests/e2e/cypress/integration/openconext/consent/consent.material.spec.js @@ -42,7 +42,7 @@ context('Consent on Material theme', () => { .click() .get('section h1') .should('be.visible') - .and('contain.text', 'You don\'t want to share your data with the service'); + .and('contain.text', 'You don\'t want to share your data with the application'); cy.get('div.slidein.reject') .should('be.visible'); diff --git a/tests/e2e/cypress/integration/openconext/wayf/WayfShowsConnectedIdps.spec.js b/tests/e2e/cypress/integration/openconext/wayf/WayfShowsConnectedIdps.spec.js index 324c55d185..abaa058c9a 100644 --- a/tests/e2e/cypress/integration/openconext/wayf/WayfShowsConnectedIdps.spec.js +++ b/tests/e2e/cypress/integration/openconext/wayf/WayfShowsConnectedIdps.spec.js @@ -14,11 +14,11 @@ context('WayfMouseBehaviour', () => { // After filtering the search results, verify one result is visible cy.countIdps(1).should('have.text', 'Connected IdP 4 en'); - cy.onPage('Select an organisation to login to the service'); + cy.onPage('Select an organisation to log in to the application'); // Ensure some elements are NOT on the page cy.notOnPage('Identity providers without access').should('not.exist'); cy.notOnPage('Remember my choice'); - cy.notOnPage('Return to service provider'); + cy.notOnPage('Return to application'); }); @@ -37,25 +37,25 @@ context('WayfMouseBehaviour', () => { it('Should show the return to service link when configured', () => { cy.visit('https://engine.vm.openconext.org/functional-testing/wayf?connectedIdps=5&backLink=true'); - cy.onPage('Select an organisation to login to the service'); - cy.onPage('Return to service provider'); + cy.onPage('Select an organisation to log in to the application'); + cy.onPage('Return to application'); // Ensure some elements are NOT on the page cy.notOnPage('Identity providers without access'); cy.notOnPage('Remember my choice'); // To be more precise, the links should be in the header and footer - cy.get('.mod-header .comp-links li:nth-child(1) a').should('have.text', 'Return to service provider'); - cy.get('.footer-menu .comp-links li:nth-child(2) a').should('have.text', 'Return to service provider'); + cy.get('.mod-header .comp-links li:nth-child(1) a').should('have.text', 'Return to application'); + cy.get('.footer-menu .comp-links li:nth-child(2) a').should('have.text', 'Return to application'); }); it('Should show the remember my choice option', () => { cy.visit('https://engine.vm.openconext.org/functional-testing/wayf?connectedIdps=5&rememberChoiceFeature=true'); // Ensure some elements are on the page - cy.onPage('Select an organisation to login to the service'); + cy.onPage('Select an organisation to log in to the application'); cy.onPage('Remember my choice'); // Ensure some elements are NOT on the page cy.notOnPage('Identity providers without access'); - cy.notOnPage('Return to service provideraccess'); + cy.notOnPage('Return to applicationaccess'); }); }) diff --git a/tests/e2e/cypress/integration/skeune/index/index.general.spec.js b/tests/e2e/cypress/integration/skeune/index/index.general.spec.js index 8e7ad94fe6..d1c7175e0c 100644 --- a/tests/e2e/cypress/integration/skeune/index/index.general.spec.js +++ b/tests/e2e/cypress/integration/skeune/index/index.general.spec.js @@ -9,7 +9,7 @@ context('Index on Skeune theme', () => { it('Renders the index page and has all relevant data', () => { cy.beVisible(indexPageHeader).should('have.text', 'IdP Certificate and Metadata'); cy.contains('SP Certificate and Metadata').should('be.visible'); - cy.contains('This is a service connected through').should('be.visible'); + cy.contains('This is an application connected through').should('be.visible'); cy.contains('Terms of Service').should('be.visible'); }); diff --git a/tests/e2e/cypress/integration/skeune/wayf/wayf.general.spec.js b/tests/e2e/cypress/integration/skeune/wayf/wayf.general.spec.js index 8cfd1c2f9e..cde85e8939 100644 --- a/tests/e2e/cypress/integration/skeune/wayf/wayf.general.spec.js +++ b/tests/e2e/cypress/integration/skeune/wayf/wayf.general.spec.js @@ -20,7 +20,7 @@ context('WAYF behaviour not tied to mouse / keyboard navigation', () => { cy.visit('https://engine.vm.openconext.org/functional-testing/wayf'); cy.notOnPage('Identity providers without access').should('not.exist'); cy.notOnPage('Remember my choice'); - cy.notOnPage('Return to service provider'); + cy.notOnPage('Return to application'); }); it('Should show ten connected IdPs', () => { @@ -155,7 +155,7 @@ context('WAYF behaviour not tied to mouse / keyboard navigation', () => { cy.get(idpTitle) .should('have.length', 6) .eq(2) - .should('have.text', 'Login with Connected IdP 3 en'); + .should('have.text', 'Log in with Connected IdP 3 en'); }); it('Check if the search field is present', () => { @@ -183,14 +183,14 @@ context('WAYF behaviour not tied to mouse / keyboard navigation', () => { describe('Should show the remember my choice option', () => { it('Ensure some elements are on the page', () => { cy.visit('https://engine.vm.openconext.org/functional-testing/wayf?connectedIdps=5&rememberChoiceFeature=true'); - cy.onPage('Select an account to login'); + cy.onPage('Select an account to log in'); cy.onPage('Remember my choice'); }); it('Ensure some elements are NOT on the page', () => { cy.visit('https://engine.vm.openconext.org/functional-testing/wayf?connectedIdps=5&rememberChoiceFeature=true'); cy.notOnPage('Identity providers without access'); - cy.notOnPage('Return to service provideraccess'); + cy.notOnPage('Return to applicationaccess'); }); }); diff --git a/tests/e2e/cypress/integration/skeune/wayf/wayf.keyboard.spec.js b/tests/e2e/cypress/integration/skeune/wayf/wayf.keyboard.spec.js index 93d9d93cbc..307fe0c8ee 100644 --- a/tests/e2e/cypress/integration/skeune/wayf/wayf.keyboard.spec.js +++ b/tests/e2e/cypress/integration/skeune/wayf/wayf.keyboard.spec.js @@ -28,7 +28,7 @@ import {firstRemainingIdp, firstSelectedIdpDeleteDisable, selectedIdpDataIndex1} */ context('WAYF when using the keyboard', () => { describe('Test logging in', () => { - it('Should login when selecting an idp', () => { + it('Should log in when selecting an idp', () => { cy.visit('https://engine.vm.openconext.org/functional-testing/wayf'); cy.get(remainingIdpSelector) .eq(1) @@ -40,7 +40,7 @@ context('WAYF when using the keyboard', () => { cy.visit('https://engine.vm.openconext.org/functional-testing/wayf'); }); - it('Should login to first IdP when hitting enter', () => { + it('Should log in to first IdP when hitting enter', () => { cy.visit('https://engine.vm.openconext.org/functional-testing/wayf'); cy.get(searchFieldSelector) .type('{enter}'); @@ -49,7 +49,7 @@ context('WAYF when using the keyboard', () => { }); }); - it('Should login to topmost IdP when hitting enter', () => { + it('Should log in to topmost IdP when hitting enter', () => { cy.visit('https://engine.vm.openconext.org/functional-testing/wayf'); cy.get(searchFieldSelector) .type('2') diff --git a/tests/e2e/cypress/integration/skeune/wayf/wayf.mouse.spec.js b/tests/e2e/cypress/integration/skeune/wayf/wayf.mouse.spec.js index a7e10902ff..0f06ff248f 100644 --- a/tests/e2e/cypress/integration/skeune/wayf/wayf.mouse.spec.js +++ b/tests/e2e/cypress/integration/skeune/wayf/wayf.mouse.spec.js @@ -6,7 +6,7 @@ import {firstRemainingIdp, firstSelectedIdpDeleteDisable, selectedIdpDataIndex1} */ context('WAYF when using the mouse', () => { describe('Test logging in', () => { - it('Should login when selecting an idp', () => { + it('Should log in when selecting an idp', () => { cy.visit('https://engine.vm.openconext.org/functional-testing/wayf'); cy.get(remainingIdpSelector) .eq(1) diff --git a/tests/resources/config/attributes-fixture.json b/tests/resources/config/attributes-fixture.json index 5fefba0d64..ee1d4efc77 100644 --- a/tests/resources/config/attributes-fixture.json +++ b/tests/resources/config/attributes-fixture.json @@ -62,7 +62,7 @@ "urn:mace:dir:attribute-def:eduPersonEntitlement": { "Description": { "en": "entitlement which decides upon your authorization within the application", - "nl": "rechtaanduiding; URI (URL of URN) dat een recht op iets aangeeft; wordt bepaald door een contract tussen dienstaanbieder en instelling" + "nl": "rechtaanduiding; URI (URL of URN) dat een recht op iets aangeeft; wordt bepaald door een contract tussen applicatieaanbieder en instelling" }, "Name": { "en": "Entitlement", @@ -343,8 +343,8 @@ }, "urn:nl.surfconext.licenseInfo": { "Description": { - "en": "License information for the current service", - "nl": "Licentieinformatie voor de huidige dienst" + "en": "License information for the current application", + "nl": "Licentieinformatie voor de huidige applicatie" }, "Name": { "en": "License information", diff --git a/tests/unit/OpenConext/EngineBlockBundle/Pdp/Dto/ResponseTest.php b/tests/unit/OpenConext/EngineBlockBundle/Pdp/Dto/ResponseTest.php index efab7b5c33..9004fcf967 100644 --- a/tests/unit/OpenConext/EngineBlockBundle/Pdp/Dto/ResponseTest.php +++ b/tests/unit/OpenConext/EngineBlockBundle/Pdp/Dto/ResponseTest.php @@ -172,12 +172,12 @@ private function buildDenyResponse() $attributeAssignmentEn = new AttributeAssignment(); $attributeAssignmentEn->category = 'urn:oasis:names:tc:xacml:3.0:attribute-category:resource'; $attributeAssignmentEn->attributeId = 'DenyMessage:en'; - $attributeAssignmentEn->value = 'Students do not have access to this resource'; + $attributeAssignmentEn->value = 'Students do not have access to this application'; $attributeAssignmentEn->dataType = 'http://www.w3.org/2001/XMLSchema#string'; $attributeAssignmentNl = new AttributeAssignment(); $attributeAssignmentNl->category = 'urn:oasis:names:tc:xacml:3.0:attribute-category:resource'; $attributeAssignmentNl->attributeId = 'DenyMessage:nl'; - $attributeAssignmentNl->value = 'Studenten hebben geen toegang tot deze dienst'; + $attributeAssignmentNl->value = 'Studenten hebben geen toegang tot deze applicatie'; $attributeAssignmentNl->dataType = 'http://www.w3.org/2001/XMLSchema#string'; $associatedAdvice->attributeAssignments = [$attributeAssignmentEn, $attributeAssignmentNl]; $associatedAdvice->id = 'urn:surfconext:xacml:policy:id:openconext_pdp_test_deny_policy_xml'; diff --git a/tests/unit/OpenConext/EngineBlockBundle/Pdp/PolicyDecisionTest.php b/tests/unit/OpenConext/EngineBlockBundle/Pdp/PolicyDecisionTest.php index 4ed604f5dc..8469cfa7df 100644 --- a/tests/unit/OpenConext/EngineBlockBundle/Pdp/PolicyDecisionTest.php +++ b/tests/unit/OpenConext/EngineBlockBundle/Pdp/PolicyDecisionTest.php @@ -60,8 +60,8 @@ public function a_deny_policys_localized_messages_are_parsed_correctly() $decision = PolicyDecision::fromResponse($response); - $expectedDenyMessageEn = 'Students do not have access to this resource'; - $expectedDenyMessageNl = 'Studenten hebben geen toegang tot deze dienst'; + $expectedDenyMessageEn = 'Students do not have access to this application'; + $expectedDenyMessageNl = 'Studenten hebben geen toegang tot deze applicatie'; $denyMessageEn = $decision->getLocalizedDenyMessage('en'); $denyMessageNl = $decision->getLocalizedDenyMessage('nl'); @@ -81,7 +81,7 @@ public function a_deny_policys_localized_deny_message_correctly_falls_back_to_th $decision = PolicyDecision::fromResponse($response); - $expectedFallbackDenyMessage = 'Students do not have access to this resource'; + $expectedFallbackDenyMessage = 'Students do not have access to this application'; $fallbackDenyMessage = $decision->getLocalizedDenyMessage('de', 'en'); diff --git a/tests/unit/OpenConext/EngineBlockBundle/Pdp/fixture/response_deny.json b/tests/unit/OpenConext/EngineBlockBundle/Pdp/fixture/response_deny.json index 5d8f442f45..6f92100fbe 100644 --- a/tests/unit/OpenConext/EngineBlockBundle/Pdp/fixture/response_deny.json +++ b/tests/unit/OpenConext/EngineBlockBundle/Pdp/fixture/response_deny.json @@ -17,12 +17,12 @@ "AttributeAssignment" : [ { "Category" : "urn:oasis:names:tc:xacml:3.0:attribute-category:resource", "AttributeId" : "DenyMessage:en", - "Value" : "Students do not have access to this resource", + "Value" : "Students do not have access to this application", "DataType" : "http://www.w3.org/2001/XMLSchema#string" }, { "Category" : "urn:oasis:names:tc:xacml:3.0:attribute-category:resource", "AttributeId" : "DenyMessage:nl", - "Value" : "Studenten hebben geen toegang tot deze dienst", + "Value" : "Studenten hebben geen toegang tot deze applicatie", "DataType" : "http://www.w3.org/2001/XMLSchema#string" } ], "Id" : "urn:surfconext:xacml:policy:id:openconext_pdp_test_deny_policy_xml" diff --git a/theme/base/javascripts/wayf/mouseBehaviour.js b/theme/base/javascripts/wayf/mouseBehaviour.js index 38e47c422c..cbdab472bd 100644 --- a/theme/base/javascripts/wayf/mouseBehaviour.js +++ b/theme/base/javascripts/wayf/mouseBehaviour.js @@ -15,7 +15,7 @@ import {checkHover} from './idpFocus/checkHover'; import {isVisibleElement} from '../utility/isVisibleElement'; export const mouseBehaviour = () => { - // allow chosing an idp to login + // allow choosing an idp to log in const idpLists = document .querySelectorAll(idpListSelector); idpLists.forEach(list => { diff --git a/theme/base/templates/modules/Authentication/View/Proxy/Partials/WAYF/idp/idpSubmitButton.html.twig b/theme/base/templates/modules/Authentication/View/Proxy/Partials/WAYF/idp/idpSubmitButton.html.twig index 730d43eeb1..3245f59a6c 100644 --- a/theme/base/templates/modules/Authentication/View/Proxy/Partials/WAYF/idp/idpSubmitButton.html.twig +++ b/theme/base/templates/modules/Authentication/View/Proxy/Partials/WAYF/idp/idpSubmitButton.html.twig @@ -3,5 +3,5 @@ type="submit" {% if hidden is defined %}tabindex="-1"{% endif %} > - Login + Log in diff --git a/theme/base/templates/modules/Default/Partials/LoginBar.html.twig b/theme/base/templates/modules/Default/Partials/LoginBar.html.twig index ca8efc8f0a..f97f30b9ed 100644 --- a/theme/base/templates/modules/Default/Partials/LoginBar.html.twig +++ b/theme/base/templates/modules/Default/Partials/LoginBar.html.twig @@ -1,3 +1,3 @@Login via {{ loginName }}
+Log in via {{ loginName }}
Login via {{ login }}
+Log in via {{ login }}