diff --git a/app/Resources/translations/messages.en_GB.xliff b/app/Resources/translations/messages.en_GB.xliff index d8b33ff2..700e6f9e 100644 --- a/app/Resources/translations/messages.en_GB.xliff +++ b/app/Resources/translations/messages.en_GB.xliff @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -20,7 +20,7 @@ footer.documentation Manual - /Resources/views/base.html.twig + /Resources/views/base.html.twig locale.en_GB @@ -161,12 +161,12 @@ ra.create_ra_location.changed RA location successfully updated - /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php ra.create_ra_location.created RA location successfully created - /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php ra.flash.error_while_switching_locale @@ -216,23 +216,28 @@ ra.form.ra_search_ra_candidates.button.search Search - /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php + /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php ra.form.ra_search_ra_candidates.label.email E-mail - /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php + /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php ra.form.ra_search_ra_candidates.label.institution Institution - /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php + /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php ra.form.ra_search_ra_candidates.label.name Name /../src/Surfnet/StepupRa/RaBundle/Form/Type/ChangeRaLocationType.php - /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php + /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php + + + ra.form.ra_search_ra_candidates.label.raInstitution + RA Institution + /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php ra.form.ra_search_ra_listing.button.search @@ -329,16 +334,6 @@ Type /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaSecondFactorsType.php - - ra.form.ra_select_institution.button.select_and_apply - Save - /../src/Surfnet/StepupRa/RaBundle/Form/Type/InstitutionSelectionType.php - - - ra.form.ra_select_institution.label.institution - Institution - /../src/Surfnet/StepupRa/RaBundle/Form/Type/InstitutionSelectionType.php - ra.form.ra_send_sms_challenge.button.send_challenge Send code @@ -418,68 +413,78 @@ ra.institution_configuration.all_second_factors_enabled All enabled tokens are available - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.allowed_second_factors Allowed second factor tokens - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.no No - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.no_entries None - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.number_of_tokens_per_identity Number of tokens per identity - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.select_raa From which other institution(s) can users be assigned the RA(A) role for this institution? - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.show_ra_contact_information Show RAA contact information? - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + + + ra.institution_configuration.subtitle + Configuration of %name% + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + + + ra.institution_configuration.title + Institution configuration + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.use_ra In which other institution(s) are the RAs from this institution an RA? - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.use_ra_locations Use RA locations enabled? - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.use_raa From which other institution(s) the RAAs are also an RAA for this institution? - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.verify_email E-mail verification enabled? - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.yes Yes - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.management.amend_ra_info.error.middleware_command_failed @@ -489,7 +494,7 @@ ra.management.amend_ra_info.info_amended The RA's information has been amended. - /../src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php ra.management.amend_ra_info.ra_listing.email @@ -572,7 +577,7 @@ ra.management.create_ra.identity_accredited The role of this user has been changed. - /../src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php ra.management.create_ra.modal.are_you_sure @@ -793,7 +798,7 @@ ra.management.retract_ra.success The Identity is no longer RA(A) - /../src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php ra.management.retract_registration_authority.are_you_sure @@ -835,11 +840,6 @@ Tokens /Resources/views/base.html.twig - - ra.menu.sraa_change_institution - change - /Resources/views/base.html.twig - ra.profile.overview.authorizations Authorizations @@ -905,16 +905,6 @@ Create a new RA Location /../src/Surfnet/StepupRa/RaBundle/Resources/views/RaLocation/create.html.twig - - ra.institution_configuration.subtitle - Configuration of %name% - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - - - ra.institution_configuration.title - Institution configuration - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - ra.ra_location.manage.add Add an RA Location @@ -999,12 +989,12 @@ ra.ra_location.revocation.could_not_remove Could not remove - /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php ra.ra_location.revocation.removed RA Location removed - /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php ra.registration.sms.text.otp_requests_remaining @@ -1019,7 +1009,7 @@ ra.second_factor.revocation.could_not_revoke The removal of the token failed - /../src/Surfnet/StepupRa/RaBundle/Controller/SecondFactorController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/SecondFactorController.php ra.second_factor.revocation.modal.are_you_sure @@ -1065,7 +1055,7 @@ ra.second_factor.revocation.revoked The token has been successfully removed - /../src/Surfnet/StepupRa/RaBundle/Controller/SecondFactorController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/SecondFactorController.php ra.second_factor.search.column.document_number @@ -1182,11 +1172,6 @@ The sending of the code via SMS failed. /../src/Surfnet/StepupRa/RaBundle/Resources/views/translations.html.twig - - ra.sraa.changed_institution - Your institution has been changed to "%institution%" - /../src/Surfnet/StepupRa/RaBundle/Controller/SraaController.php - ra.verify_identity.identity_verification_failed Identity verification failed diff --git a/app/Resources/translations/messages.nl_NL.xliff b/app/Resources/translations/messages.nl_NL.xliff index e3ddf804..72528a23 100644 --- a/app/Resources/translations/messages.nl_NL.xliff +++ b/app/Resources/translations/messages.nl_NL.xliff @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -20,7 +20,7 @@ footer.documentation Handleiding - /Resources/views/base.html.twig + /Resources/views/base.html.twig locale.en_GB @@ -161,12 +161,12 @@ ra.create_ra_location.changed RA-locatie succesvol bijgewerkt - /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php ra.create_ra_location.created RA-locatie succesvol aangemaakt - /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php ra.flash.error_while_switching_locale @@ -216,23 +216,28 @@ ra.form.ra_search_ra_candidates.button.search Zoeken - /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php + /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php ra.form.ra_search_ra_candidates.label.email E-mail - /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php + /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php ra.form.ra_search_ra_candidates.label.institution Instituut - /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php + /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php ra.form.ra_search_ra_candidates.label.name Naam /../src/Surfnet/StepupRa/RaBundle/Form/Type/ChangeRaLocationType.php - /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php + /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php + + + ra.form.ra_search_ra_candidates.label.raInstitution + RA Instelling + /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php ra.form.ra_search_ra_listing.button.search @@ -329,16 +334,6 @@ Type /../src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaSecondFactorsType.php - - ra.form.ra_select_institution.button.select_and_apply - Opslaan - /../src/Surfnet/StepupRa/RaBundle/Form/Type/InstitutionSelectionType.php - - - ra.form.ra_select_institution.label.institution - Instelling - /../src/Surfnet/StepupRa/RaBundle/Form/Type/InstitutionSelectionType.php - ra.form.ra_send_sms_challenge.button.send_challenge Verstuur code @@ -418,68 +413,78 @@ ra.institution_configuration.all_second_factors_enabled Alle beschikbare tokens zijn toegestaan - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.allowed_second_factors Toegestane tokens - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.no Nee - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.no_entries Geen resultaten gevonden - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.number_of_tokens_per_identity Aantal tokens per identiteit - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.select_raa Van welke andere instelling(en) kunnen de gebruikers ook de RA(A) rol krijgen voor deze instelling? - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.show_ra_contact_information Laat RAA contact informatie zien? - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + + + ra.institution_configuration.subtitle + Configuratie van %name% + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + + + ra.institution_configuration.title + Instellingsconfiguratie + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.use_ra Van welke andere instelling(en) zijn de RA's ook RA voor deze instelling? - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.use_ra_locations Gebruik RA-locaties ingeschakeld? - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.use_raa Van welke andere instelling(en) zijn de RAA's ook RAA voor deze instelling? - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.verify_email E-mail verificatie ingeschakeld? - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.institution_configuration.yes Ja - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig + /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig ra.management.amend_ra_info.error.middleware_command_failed @@ -489,7 +494,7 @@ ra.management.amend_ra_info.info_amended De informatie van de RA is gewijzigd. - /../src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php ra.management.amend_ra_info.ra_listing.email @@ -572,7 +577,7 @@ ra.management.create_ra.identity_accredited De rol van deze gebruiker is gewijzigd. - /../src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php ra.management.create_ra.modal.are_you_sure @@ -793,7 +798,7 @@ ra.management.retract_ra.success De Identiteit is geen RA(A) meer - /../src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php ra.management.retract_registration_authority.are_you_sure @@ -835,11 +840,6 @@ Tokens /Resources/views/base.html.twig - - ra.menu.sraa_change_institution - verander - /Resources/views/base.html.twig - ra.profile.overview.authorizations Rechten @@ -905,16 +905,6 @@ Maak een nieuwe RA-locatie aan /../src/Surfnet/StepupRa/RaBundle/Resources/views/RaLocation/create.html.twig - - ra.institution_configuration.subtitle - Configuratie van %name% - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - - - ra.institution_configuration.title - Instellingsconfiguratie - /../src/Surfnet/StepupRa/RaBundle/Resources/views/InstitutionConfiguration/overview.html.twig - ra.ra_location.manage.add Voeg een RA-locatie toe @@ -999,12 +989,12 @@ ra.ra_location.revocation.could_not_remove Kon de RA-locatie niet verwijderen - /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php ra.ra_location.revocation.removed RA-locatie verwijderd - /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/RaLocationController.php ra.registration.sms.text.otp_requests_remaining @@ -1019,7 +1009,7 @@ ra.second_factor.revocation.could_not_revoke Het token kon niet verwijderd worden. - /../src/Surfnet/StepupRa/RaBundle/Controller/SecondFactorController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/SecondFactorController.php ra.second_factor.revocation.modal.are_you_sure @@ -1065,7 +1055,7 @@ ra.second_factor.revocation.revoked Het token is verwijderd - /../src/Surfnet/StepupRa/RaBundle/Controller/SecondFactorController.php + /../src/Surfnet/StepupRa/RaBundle/Controller/SecondFactorController.php ra.second_factor.search.column.document_number @@ -1182,11 +1172,6 @@ Het versturen van de SMS-code is mislukt. /../src/Surfnet/StepupRa/RaBundle/Resources/views/translations.html.twig - - ra.sraa.changed_institution - Je instelling is veranderd naar "%institution%" - /../src/Surfnet/StepupRa/RaBundle/Controller/SraaController.php - ra.verify_identity.identity_verification_failed De verificatie van de identiteit is mislukt diff --git a/app/Resources/translations/validators.en_GB.xliff b/app/Resources/translations/validators.en_GB.xliff index f2b14585..ce84ce0c 100644 --- a/app/Resources/translations/validators.en_GB.xliff +++ b/app/Resources/translations/validators.en_GB.xliff @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -386,14 +386,6 @@ ra.search_ra_candidates.actor_id.type ra.search_ra_candidates.actor_id.type - - ra.search_ra_candidates.actor_institution.blank - ra.search_ra_candidates.actor_institution.blank - - - ra.search_ra_candidates.actor_institution.type - ra.search_ra_candidates.actor_institution.type - ra.search_ra_candidates.order_by.invalid_choice Invalid choice for ordering column diff --git a/app/Resources/translations/validators.nl_NL.xliff b/app/Resources/translations/validators.nl_NL.xliff index 76aab4c3..4d6b9b19 100644 --- a/app/Resources/translations/validators.nl_NL.xliff +++ b/app/Resources/translations/validators.nl_NL.xliff @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -387,14 +387,6 @@ ra.search_ra_candidates.actor_id.type ra.search_ra_candidates.actor_id.type - - ra.search_ra_candidates.actor_institution.blank - ra.search_ra_candidates.actor_institution.blank - - - ra.search_ra_candidates.actor_institution.type - ra.search_ra_candidates.actor_institution.type - ra.search_ra_candidates.order_by.invalid_choice Ongeldige keuze voor de sorteringskolom diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 3021e985..55b73ef6 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -70,15 +70,6 @@ {{ form_widget(locale_switcher.locale) }} {{ form_widget(locale_switcher.switch) }} {{ form_end(locale_switcher) }} - {% if is_granted('ROLE_SRAA') %} - - {% endif %}
diff --git a/composer.lock b/composer.lock index 19cba704..e0d90df0 100644 --- a/composer.lock +++ b/composer.lock @@ -2367,16 +2367,16 @@ }, { "name": "surfnet/stepup-middleware-client-bundle", - "version": "3.0.17", + "version": "3.0.18", "source": { "type": "git", "url": "https://github.com/OpenConext/Stepup-Middleware-clientbundle.git", - "reference": "c141e98c105845c50d47053a23d6ee2f34458de5" + "reference": "2a3f609a90370bc68ae49e827270dcc6411709d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OpenConext/Stepup-Middleware-clientbundle/zipball/c141e98c105845c50d47053a23d6ee2f34458de5", - "reference": "c141e98c105845c50d47053a23d6ee2f34458de5", + "url": "https://api.github.com/repos/OpenConext/Stepup-Middleware-clientbundle/zipball/2a3f609a90370bc68ae49e827270dcc6411709d6", + "reference": "2a3f609a90370bc68ae49e827270dcc6411709d6", "shasum": "" }, "require": { @@ -2417,7 +2417,7 @@ "Apache-2.0" ], "description": "Symfony2 bundle for consuming the Step-up Middleware API.", - "time": "2019-05-07T14:03:59+00:00" + "time": "2019-05-09T13:24:49+00:00" }, { "name": "surfnet/stepup-saml-bundle", diff --git a/src/Surfnet/StepupRa/RaBundle/Command/SearchRaCandidatesCommand.php b/src/Surfnet/StepupRa/RaBundle/Command/SearchRaCandidatesCommand.php index 7679fdde..63e2732c 100644 --- a/src/Surfnet/StepupRa/RaBundle/Command/SearchRaCandidatesCommand.php +++ b/src/Surfnet/StepupRa/RaBundle/Command/SearchRaCandidatesCommand.php @@ -30,14 +30,6 @@ class SearchRaCandidatesCommand */ public $actorId; - /** - * @Assert\NotBlank(message="ra.search_ra_candidates.actor_institution.blank") - * @Assert\Type("string", message="ra.search_ra_candidates.actor_institution.type") - * - * @var string - */ - public $actorInstitution; - /** * @var string */ @@ -53,6 +45,11 @@ class SearchRaCandidatesCommand */ public $email; + /** + * @var string + */ + public $raInstitution; + /** * @Assert\Choice( * {"name", "email"}, @@ -82,4 +79,9 @@ class SearchRaCandidatesCommand * @var array */ public $institutionFilterOptions; + + /** + * @var array + */ + public $raInstitutionFilterOptions; } diff --git a/src/Surfnet/StepupRa/RaBundle/Command/SearchRaListingCommand.php b/src/Surfnet/StepupRa/RaBundle/Command/SearchRaListingCommand.php index f369c1f5..d1e84e1c 100644 --- a/src/Surfnet/StepupRa/RaBundle/Command/SearchRaListingCommand.php +++ b/src/Surfnet/StepupRa/RaBundle/Command/SearchRaListingCommand.php @@ -31,14 +31,6 @@ class SearchRaListingCommand */ public $actorId; - /** - * @Assert\NotBlank(message="ra.search_ra_candidates.actor_institution.blank") - * @Assert\Type("string", message="ra.search_ra_candidates.actor_institution.type") - * - * @var string - */ - public $actorInstitution; - /** * @var string */ diff --git a/src/Surfnet/StepupRa/RaBundle/Command/SearchRaSecondFactorsCommand.php b/src/Surfnet/StepupRa/RaBundle/Command/SearchRaSecondFactorsCommand.php index 4388c5b5..5853317d 100644 --- a/src/Surfnet/StepupRa/RaBundle/Command/SearchRaSecondFactorsCommand.php +++ b/src/Surfnet/StepupRa/RaBundle/Command/SearchRaSecondFactorsCommand.php @@ -27,14 +27,6 @@ final class SearchRaSecondFactorsCommand const STATUS_VETTED = 'vetted'; const STATUS_REVOKED = 'revoked'; - /** - * @Assert\NotBlank(message="ra.search_ra_second_factors.institution.blank") - * @Assert\Type("string", message="ra.search_ra_second_factors.institution.type") - * - * @var string - */ - public $actorInstitution; - /** * @Assert\NotBlank(message="ra.search_ra_second_factors.actor.blank") * @Assert\Type("string", message="ra.search_ra_second_factors.actor.type") diff --git a/src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php b/src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php index b0700b05..254b208f 100644 --- a/src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php +++ b/src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php @@ -57,7 +57,6 @@ public function manageAction(Request $request) $service = $this->getRaListingService(); $command = new SearchRaListingCommand(); - $command->actorInstitution = $identity->institution; $command->actorId = $identity->id; $command->pageNumber = (int) $request->get('p', 1); $command->orderBy = $request->get('orderBy'); @@ -116,8 +115,9 @@ public function raCandidateSearchAction(Request $request) $service = $this->getRaCandidateService(); $command = new SearchRaCandidatesCommand(); - $command->actorId = $this->getUser()->id; + $command->actorId = $identity->id; $command->actorInstitution = $institution; + $command->raInstitution = null; $command->pageNumber = (int) $request->get('p', 1); $command->orderBy = $request->get('orderBy'); $command->orderDirection = $request->get('orderDirection'); @@ -126,6 +126,7 @@ public function raCandidateSearchAction(Request $request) // The options that will populate the institution filter choice list. $command->institutionFilterOptions = $raCandidateList->getFilterOption('institution'); + $command->raInstitutionFilterOptions = $raCandidateList->getFilterOption('raInstitution'); $form = $this->createForm(SearchRaCandidatesType::class, $command, ['method' => 'get']); $form->handleRequest($request); @@ -167,7 +168,7 @@ public function createRaAction(Request $request) $logger->notice('Page for Accreditation of Identity to Ra or Raa requested'); $identityId = $request->get('identityId'); - $raCandidate = $this->getRaCandidateService()->getRaCandidate($identityId, $this->getUser()->institution, $this->getUser()->id); + $raCandidate = $this->getRaCandidateService()->getRaCandidate($identityId, $this->getUser()->id); if (!$raCandidate->raCandidate) { $logger->warning(sprintf('RaCandidate based on identity "%s" not found', $identityId)); @@ -225,7 +226,7 @@ public function amendRaInformationAction(Request $request, $identityId, $raInsti $logger = $this->get('logger'); $logger->notice(sprintf("Loading information amendment form for RA(A) '%s'", $identityId)); - $raListing = $this->getRaListingService()->get($identityId, $raInstitution, $this->getUser()->institution, $this->getUser()->id); + $raListing = $this->getRaListingService()->get($identityId, $raInstitution, $this->getUser()->id); if (!$raListing) { $logger->warning(sprintf("RA listing for identity ID '%s' not found", $identityId)); @@ -272,7 +273,7 @@ public function retractRegistrationAuthorityAction(Request $request, $identityId $logger->notice(sprintf("Loading retract registration authority form for RA(A) '%s'", $identityId)); - $raListing = $this->getRaListingService()->get($identityId, $raInstitution, $this->getUser()->institution, $this->getUser()->id); + $raListing = $this->getRaListingService()->get($identityId, $raInstitution, $this->getUser()->id); if (!$raListing) { $logger->warning(sprintf("RA listing for identity ID '%s@%s' not found", $identityId, $this->getUser()->institution)); throw new NotFoundHttpException(sprintf("RA listing for identity ID '%s' not found", $identityId)); diff --git a/src/Surfnet/StepupRa/RaBundle/Controller/SecondFactorController.php b/src/Surfnet/StepupRa/RaBundle/Controller/SecondFactorController.php index 7e74c69e..6d7ae09c 100644 --- a/src/Surfnet/StepupRa/RaBundle/Controller/SecondFactorController.php +++ b/src/Surfnet/StepupRa/RaBundle/Controller/SecondFactorController.php @@ -26,9 +26,6 @@ use Surfnet\StepupRa\RaBundle\Command\SearchSecondFactorAuditLogCommand; use Surfnet\StepupRa\RaBundle\Form\Type\RevokeSecondFactorType; use Surfnet\StepupRa\RaBundle\Form\Type\SearchRaSecondFactorsType; -use Surfnet\StepupRa\RaBundle\Security\Authorization\Context\InstitutionContext; -use Surfnet\StepupRa\RaBundle\Security\Authorization\Voter\AllowedInOtherInstitutionVoter; -use Surfnet\StepupRa\RaBundle\Service\InstitutionConfigurationOptionsService; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -53,7 +50,6 @@ public function searchAction(Request $request) $this->get('logger')->notice('Starting search for second factors'); $command = new SearchRaSecondFactorsCommand(); - $command->actorInstitution = $identity->institution; $command->actorId = $identity->id; $command->pageNumber = (int) $request->get('p', 1); $command->orderBy = $request->get('orderBy'); diff --git a/src/Surfnet/StepupRa/RaBundle/Controller/SraaController.php b/src/Surfnet/StepupRa/RaBundle/Controller/SraaController.php deleted file mode 100644 index 6a2ce27c..00000000 --- a/src/Surfnet/StepupRa/RaBundle/Controller/SraaController.php +++ /dev/null @@ -1,72 +0,0 @@ -denyAccessUnlessGranted(['ROLE_SRAA']); - - /** @var SamlToken $token */ - $token = $this->get('security.token_storage')->getToken(); - $logger = $this->get('logger'); - - /** @var Identity $identity */ - $identity = $token->getUser(); - - $logger->notice(sprintf('Select Institution for SRAA "%s"', $identity->id)); - - $command = new SelectInstitutionCommand(); - $command->institution = $identity->institution; - - $form = $this->createForm(InstitutionSelectionType::class, $command); - $form->handleRequest($request); - - if ($form->isSubmitted() && $form->isValid()) { - $token->changeInstitutionScope($command->institution); - - $flashMessage = $this->get('translator') - ->trans('ra.sraa.changed_institution', ['%institution%' => $command->institution]); - $this->get('session')->getFlashBag()->add('success', $flashMessage); - - $logger->notice(sprintf( - 'SRAA "%s" successfully switched to institution "%s"', - $identity->id, - $command->institution - )); - - return $this->redirect($this->generateUrl('ra_vetting_search')); - } - - $logger->notice(sprintf('Showing select institution form for SRAA "%s"', $identity->id)); - - return $this->render( - 'SurfnetStepupRaRaBundle:Sraa:selectInstitution.html.twig', - ['form' => $form->createView()] - ); - } -} diff --git a/src/Surfnet/StepupRa/RaBundle/Controller/VettingController.php b/src/Surfnet/StepupRa/RaBundle/Controller/VettingController.php index a7370e07..d5f957a3 100644 --- a/src/Surfnet/StepupRa/RaBundle/Controller/VettingController.php +++ b/src/Surfnet/StepupRa/RaBundle/Controller/VettingController.php @@ -70,7 +70,7 @@ public function startProcedureAction(Request $request) } $secondFactor = $this->getSecondFactorService() - ->findVerifiedSecondFactorByRegistrationCode($command->registrationCode, $identity->institution, $identity->id); + ->findVerifiedSecondFactorByRegistrationCode($command->registrationCode, $identity->id); if ($secondFactor === null) { $this->addFlash('error', 'ra.form.start_vetting_procedure.unknown_registration_code'); diff --git a/src/Surfnet/StepupRa/RaBundle/Form/Extension/InstitutionListingChoiceList.php b/src/Surfnet/StepupRa/RaBundle/Form/Extension/InstitutionListingChoiceList.php deleted file mode 100644 index 3e1fdd4c..00000000 --- a/src/Surfnet/StepupRa/RaBundle/Form/Extension/InstitutionListingChoiceList.php +++ /dev/null @@ -1,55 +0,0 @@ -institutionListingService = $institutionListingService; - } - - /** - * @return array - */ - public function create() - { - $collection = $this->institutionListingService->getAll(); - $listings = $collection->getElements(); - - $options = array_map(function (InstitutionListing $listing) { - return $listing->institution; - }, $listings); - - $selectOptions = array_combine($options, $options); - - return $selectOptions; - } -} diff --git a/src/Surfnet/StepupRa/RaBundle/Form/Type/InstitutionSelectionType.php b/src/Surfnet/StepupRa/RaBundle/Form/Type/InstitutionSelectionType.php deleted file mode 100644 index c3f65aec..00000000 --- a/src/Surfnet/StepupRa/RaBundle/Form/Type/InstitutionSelectionType.php +++ /dev/null @@ -1,67 +0,0 @@ -institutionListingChoiceList = $institutionListingChoiceList; - } - - public function buildForm(FormBuilderInterface $builder, array $options) - { - $builder - ->add('institution', ChoiceType::class, [ - 'choices' => $this->institutionListingChoiceList->create(), - 'choices_as_values' => true, - 'label' => 'ra.form.ra_select_institution.label.institution', - ]) - ->add('select_and_apply', SubmitType::class, [ - 'label' => 'ra.form.ra_select_institution.button.select_and_apply', - 'attr' => ['class' => 'btn btn-primary pull-right'], - ]); - } - - public function configureOptions(OptionsResolver $resolver) - { - $resolver->setDefaults([ - 'data_class' => 'Surfnet\StepupRa\RaBundle\Command\SelectInstitutionCommand' - ]); - } - - /** - * Returns the name of this type. - * - * @return string The name of this type - */ - public function getBlockPrefix() - { - return 'sraa_institution_select'; - } -} diff --git a/src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php b/src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php index abca33a9..bead20c5 100644 --- a/src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php +++ b/src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php @@ -18,6 +18,7 @@ namespace Surfnet\StepupRa\RaBundle\Form\Type; +use Surfnet\StepupRa\RaBundle\Command\SearchRaCandidatesCommand; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; @@ -28,10 +29,10 @@ class SearchRaCandidatesType extends AbstractType { public function buildForm(FormBuilderInterface $builder, array $options) { - $options = array_combine( - $builder->getData()->institutionFilterOptions, - $builder->getData()->institutionFilterOptions - ); + /** @var $command SearchRaCandidatesCommand */ + $command = $builder->getData(); + $institutions = $command->institutionFilterOptions; + $raInstitutions = $command->raInstitutionFilterOptions; $builder ->add('name', null, [ @@ -42,7 +43,12 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('institution', ChoiceType::class, [ 'label' => 'ra.form.ra_search_ra_candidates.label.institution', - 'choices' => $options, + 'choices' => $institutions, + 'required' => false, + ]) + ->add('raInstitution', ChoiceType::class, [ + 'label' => 'ra.form.ra_search_ra_candidates.label.raInstitution', + 'choices' => $raInstitutions, 'required' => false, ]) ->add('search', SubmitType::class, [ diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/config/routing.yml b/src/Surfnet/StepupRa/RaBundle/Resources/config/routing.yml index f9419686..d2267c3f 100644 --- a/src/Surfnet/StepupRa/RaBundle/Resources/config/routing.yml +++ b/src/Surfnet/StepupRa/RaBundle/Resources/config/routing.yml @@ -138,11 +138,6 @@ ra_management_retract_registration_authority: methods: [GET, POST] defaults: { _controller: SurfnetStepupRaRaBundle:RaManagement:retractRegistrationAuthority } -sraa_select_institution: - path: /sraa/select-institution - methods: [GET, POST] - defaults: { _controller: SurfnetStepupRaRaBundle:Sraa:selectInstitution } - institution-configuration: path: /institution-configuration methods: [GET, POST] diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/public/less/style.less b/src/Surfnet/StepupRa/RaBundle/Resources/public/less/style.less index 6348d177..28f80fb5 100644 --- a/src/Surfnet/StepupRa/RaBundle/Resources/public/less/style.less +++ b/src/Surfnet/StepupRa/RaBundle/Resources/public/less/style.less @@ -83,7 +83,7 @@ div.form-ra-verify-identity { } table tbody tr th.half-width, table tbody tr td.half-width { - width: 50%; + width: 50%; } .form-group-verify-identity { @@ -222,7 +222,7 @@ form[name="ra_search_ra_listing"] button.search-button { } form[name="stepup_switch_locale"] { - .pull-right(); + .pull-right(); } form[name="select_institution"] { margin-left: 15px; @@ -253,6 +253,20 @@ select[name="stepup_switch_locale[locale]"] { min-width: 150px; } +//.role-at-institution { +// position: relative; +// .form-group { +// float: left; +// @media (max-width: @screen-sm-min) { +// float: none; +// } +// min-width: 175px; +// select { +// min-width: 175px; +// } +// } +//} + .role-at-institution { display: flex; .form-group { diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/SecondFactor/auditLog.html.twig b/src/Surfnet/StepupRa/RaBundle/Resources/views/SecondFactor/auditLog.html.twig index 52db591a..7ea002ab 100644 --- a/src/Surfnet/StepupRa/RaBundle/Resources/views/SecondFactor/auditLog.html.twig +++ b/src/Surfnet/StepupRa/RaBundle/Resources/views/SecondFactor/auditLog.html.twig @@ -25,7 +25,7 @@ {{ knp_pagination_sortable(pagination, 'ra.auditlog.second_factor_identifier'|trans, 'secondFactorIdentifier') }} {{ knp_pagination_sortable(pagination, 'ra.auditlog.second_factor_type'|trans, 'secondFactorType') }} - {{ knp_pagination_sortable(pagination, 'ra.auditlog.event'|trans, 'event') }} + {{ 'ra.auditlog.event'|trans }} {{ knp_pagination_sortable(pagination, 'ra.auditlog.when'|trans, 'recordedOn') }} {{ knp_pagination_sortable(pagination, 'ra.auditlog.actor'|trans, 'actorCommonName') }} {{ knp_pagination_sortable(pagination, 'ra.auditlog.institution'|trans, 'actorInstitution') }} diff --git a/src/Surfnet/StepupRa/RaBundle/Resources/views/Sraa/selectInstitution.html.twig b/src/Surfnet/StepupRa/RaBundle/Resources/views/Sraa/selectInstitution.html.twig deleted file mode 100644 index 1f86ed5d..00000000 --- a/src/Surfnet/StepupRa/RaBundle/Resources/views/Sraa/selectInstitution.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% extends '::base.html.twig' %} - -{% block content %} -
-
- {{ form(form) }} -
-
-{% endblock content %} diff --git a/src/Surfnet/StepupRa/RaBundle/Security/Authentication/Token/SamlToken.php b/src/Surfnet/StepupRa/RaBundle/Security/Authentication/Token/SamlToken.php index fe5c94d5..79afd2f9 100644 --- a/src/Surfnet/StepupRa/RaBundle/Security/Authentication/Token/SamlToken.php +++ b/src/Surfnet/StepupRa/RaBundle/Security/Authentication/Token/SamlToken.php @@ -44,30 +44,6 @@ public function __construct(Loa $loa, array $roles = []) $this->setAuthenticated(count($roles)); } - /** - * @param string $institution - */ - public function changeInstitutionScope($institution) - { - if ($this->getUser() === null) { - throw new LogicException('Cannot change institution scope: token does not contain a user'); - } - - $roles = array_map(function (RoleInterface $role) { - return $role->getRole(); - }, $this->getRoles()); - - if (!in_array('ROLE_SRAA', $roles)) { - throw new RuntimeException(sprintf( - 'Unauthorized to change institution scope to "%s": role SRAA required, found roles "%s"', - $institution, - implode(', ', $roles) - )); - } - - $this->getUser()->institution = $institution; - } - /** * Returns the user credentials. * diff --git a/src/Surfnet/StepupRa/RaBundle/Service/RaCandidateService.php b/src/Surfnet/StepupRa/RaBundle/Service/RaCandidateService.php index 110f1dce..5ab7fef8 100644 --- a/src/Surfnet/StepupRa/RaBundle/Service/RaCandidateService.php +++ b/src/Surfnet/StepupRa/RaBundle/Service/RaCandidateService.php @@ -72,7 +72,7 @@ public function __construct( */ public function search(SearchRaCandidatesCommand $command) { - $query = new RaCandidateSearchQuery($command->actorId, $command->actorInstitution, $command->pageNumber); + $query = new RaCandidateSearchQuery($command->actorId, $command->pageNumber); if ($command->name) { $query->setCommonName($command->name); @@ -90,6 +90,10 @@ public function search(SearchRaCandidatesCommand $command) $query->setInstitution($command->institution); } + if ($command->raInstitution) { + $query->setRaInstitution($command->raInstitution); + } + if ($command->orderDirection) { $query->setOrderDirection($command->orderDirection); } @@ -101,25 +105,20 @@ public function search(SearchRaCandidatesCommand $command) /** * @param string $identityId - * @param string $institution * @param string $actorId * @return null|\Surfnet\StepupMiddlewareClientBundle\Identity\Dto\RaCandidateInstitutions */ - public function getRaCandidate($identityId, $institution, $actorId) + public function getRaCandidate($identityId, $actorId) { if (!is_string($identityId)) { throw InvalidArgumentException::invalidType('string', 'identityId', $identityId); } - if (!is_string($institution)) { - throw InvalidArgumentException::invalidType('string', 'institution', $institution); - } - if (!is_string($actorId)) { throw InvalidArgumentException::invalidType('string', 'actorId', $actorId); } - return $this->apiRaCandidateService->get($identityId, $institution, $actorId); + return $this->apiRaCandidateService->get($identityId, $actorId); } public function accreditCandidate(AccreditCandidateCommand $command) diff --git a/src/Surfnet/StepupRa/RaBundle/Service/RaListingService.php b/src/Surfnet/StepupRa/RaBundle/Service/RaListingService.php index c6a973fa..a6a59a97 100644 --- a/src/Surfnet/StepupRa/RaBundle/Service/RaListingService.php +++ b/src/Surfnet/StepupRa/RaBundle/Service/RaListingService.php @@ -53,7 +53,7 @@ public function __construct(ApiRaListingService $raListingService, LoggerInterfa */ public function search(SearchRaListingCommand $command) { - $query = new RaListingSearchQuery($command->actorId, $command->actorInstitution, $command->pageNumber); + $query = new RaListingSearchQuery($command->actorId, $command->pageNumber); if ($command->name) { $query->setName($command->name); @@ -89,11 +89,10 @@ public function search(SearchRaListingCommand $command) /** * @param string $identityId * @param string $institution - * @param string $actorInstitution * @param string $actorId * @return null|RaListing */ - public function get($identityId, $institution, $actorInstitution, $actorId) + public function get($identityId, $institution, $actorId) { if (!is_string($identityId)) { throw InvalidArgumentException::invalidType('string', 'identityId', $identityId); @@ -103,14 +102,10 @@ public function get($identityId, $institution, $actorInstitution, $actorId) throw InvalidArgumentException::invalidType('string', 'institution', $institution); } - if (!is_string($actorInstitution)) { - throw InvalidArgumentException::invalidType('string', 'actorInstitution', $actorInstitution); - } - if (!is_string($actorId)) { throw InvalidArgumentException::invalidType('string', 'actorId', $actorId); } - return $this->apiRaListingService->get($identityId, $institution, $actorInstitution, $actorId); + return $this->apiRaListingService->get($identityId, $institution, $actorId); } } diff --git a/src/Surfnet/StepupRa/RaBundle/Service/RaSecondFactorService.php b/src/Surfnet/StepupRa/RaBundle/Service/RaSecondFactorService.php index 71116598..5f2a66a7 100644 --- a/src/Surfnet/StepupRa/RaBundle/Service/RaSecondFactorService.php +++ b/src/Surfnet/StepupRa/RaBundle/Service/RaSecondFactorService.php @@ -100,7 +100,7 @@ public function revoke(RevokeSecondFactorCommand $command) */ public function search(SearchRaSecondFactorsCommand $command) { - $query = new RaSecondFactorSearchQuery($command->actorInstitution, $command->pageNumber, $command->actorId); + $query = new RaSecondFactorSearchQuery($command->pageNumber, $command->actorId); if ($command->name) { $query->setName($command->name); diff --git a/src/Surfnet/StepupRa/RaBundle/Service/SecondFactorService.php b/src/Surfnet/StepupRa/RaBundle/Service/SecondFactorService.php index 35369fdd..188ffbe8 100644 --- a/src/Surfnet/StepupRa/RaBundle/Service/SecondFactorService.php +++ b/src/Surfnet/StepupRa/RaBundle/Service/SecondFactorService.php @@ -55,10 +55,9 @@ public function __construct( * @param string $actorId * @return null|VerifiedSecondFactor */ - public function findVerifiedSecondFactorByRegistrationCode($registrationCode, $actorInstitution, $actorId) + public function findVerifiedSecondFactorByRegistrationCode($registrationCode, $actorId) { $query = new VerifiedSecondFactorSearchQuery(); - $query->setActorInstitution($actorInstitution); $query->setActorId($actorId); $query->setRegistrationCode($registrationCode); diff --git a/src/Surfnet/StepupRa/RaBundle/Tests/Security/Authentication/Token/SamlTokenTest.php b/src/Surfnet/StepupRa/RaBundle/Tests/Security/Authentication/Token/SamlTokenTest.php index 11797009..a0cb8cc2 100644 --- a/src/Surfnet/StepupRa/RaBundle/Tests/Security/Authentication/Token/SamlTokenTest.php +++ b/src/Surfnet/StepupRa/RaBundle/Tests/Security/Authentication/Token/SamlTokenTest.php @@ -53,71 +53,4 @@ public function saml_token_is_correctly_serialized_and_unserialized() $this->assertEquals($samlToken, $deserialized); } - - /** - * @test - * @group authorization - * @group security - * @group sraa - */ - public function institution_scope_of_saml_token_cannot_be_changed_when_not_sraa() - { - $this->setExpectedException(RuntimeException::class, 'Unauthorized to change institution scope'); - - $identity = new Identity(); - - $samlToken = new SamlToken( - new Loa(Loa::LOA_1, 'http://some.url.tld/authentication/loa1'), - ['ROLE_RAA', 'ROLE_RA'] - ); - $samlToken->setUser($identity); - - $samlToken->changeInstitutionScope('surfnet.nl'); - } - - /** - * @test - * @group authorization - * @group security - * @group sraa - */ - public function institution_scope_of_saml_token_can_be_changed_when_sraa() - { - $expectedInstitution = 'surfnet.nl'; - - $oldInstitutionConfigurationOptions = new InstitutionConfigurationOptions(); - $oldInstitutionConfigurationOptions->useRaLocations = true; - $oldInstitutionConfigurationOptions->showRaaContactInformation = true; - - $identity = new Identity(); - $identity->institution = 'old-institution.nl'; - - $samlToken = new SamlToken( - new Loa(Loa::LOA_1, 'http://some.url.tld/authentication/loa1'), - ['ROLE_SRAA'], - $oldInstitutionConfigurationOptions - ); - $samlToken->setUser($identity); - - $samlToken->changeInstitutionScope($expectedInstitution); - - $this->assertSame($expectedInstitution, $samlToken->getUser()->institution); - } - - /** - * @test - * @group authorization - * @group security - */ - public function institution_scope_of_saml_token_cannot_be_changed_if_it_has_no_user() - { - $this->setExpectedException(LogicException::class, 'token does not contain a user'); - - $samlToken = new SamlToken( - new Loa(Loa::LOA_1, 'http://some.url.tld/authentication/loa1'), - ['ROLE_SRAA'] - ); - - $samlToken->changeInstitutionScope('surfnet.nl'); - } }