From 5e1b85832c0f5361d418cc790b66c29b26c645bb Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 14 Dec 2016 17:14:53 +0100 Subject: [PATCH 1/2] [ongoing] resend sso fusion token --- .../{profile.coffee => profile.coffee.erb} | 26 +++++++++++++++++-- app/assets/templates/profile/_token.html.erb | 1 + .../templates/profile/resend_code_modal.html | 26 +++++++++++++++++++ config/locales/app.logged.en.yml | 3 +++ config/locales/app.logged.fr.yml | 3 +++ 5 files changed, 57 insertions(+), 2 deletions(-) rename app/assets/javascripts/controllers/{profile.coffee => profile.coffee.erb} (87%) create mode 100644 app/assets/templates/profile/resend_code_modal.html diff --git a/app/assets/javascripts/controllers/profile.coffee b/app/assets/javascripts/controllers/profile.coffee.erb similarity index 87% rename from app/assets/javascripts/controllers/profile.coffee rename to app/assets/javascripts/controllers/profile.coffee.erb index f2f542b31..e883d8dfb 100644 --- a/app/assets/javascripts/controllers/profile.coffee +++ b/app/assets/javascripts/controllers/profile.coffee.erb @@ -1,8 +1,8 @@ 'use strict' -Application.Controllers.controller "CompleteProfileController", ["$scope", "$rootScope", "$state", "$window", "_t", "growl", "CSRF", "Auth", "Member", "settingsPromise", "activeProviderPromise", "groupsPromise", "cguFile", "memberPromise", "Session" -, ($scope, $rootScope, $state, $window, _t, growl, CSRF, Auth, Member, settingsPromise, activeProviderPromise, groupsPromise, cguFile, memberPromise, Session) -> +Application.Controllers.controller "CompleteProfileController", ["$scope", "$rootScope", "$state", "$window", "_t", "growl", "CSRF", "Auth", "Member", "settingsPromise", "activeProviderPromise", "groupsPromise", "cguFile", "memberPromise", "Session", "dialogs" +, ($scope, $rootScope, $state, $window, _t, growl, CSRF, Auth, Member, settingsPromise, activeProviderPromise, groupsPromise, cguFile, memberPromise, Session, dialogs) -> @@ -141,6 +141,28 @@ Application.Controllers.controller "CompleteProfileController", ["$scope", "$roo + ## + # Ask for email confirmation and send the SSO merging token again + # @param $event {Object} jQuery event object + ## + $scope.resendCode = (event) -> + event.preventDefault() + event.stopPropagation() + # TODO show modal only IF email is not mapped to sso OR email = null + dialogs.confirm + templateUrl: '<%= asset_path "profile/resend_code_modal.html" %>' + resolve: + object: -> + email: memberPromise.email + , (email) -> + console.log(email) + # TODO update email + # TODO in every cases, resend email + # TODO growl result + + + + ## # Disconnect and re-connect the user to the SSO to force the synchronisation of the profile's data ## diff --git a/app/assets/templates/profile/_token.html.erb b/app/assets/templates/profile/_token.html.erb index f4a8b0404..3017b18ed 100644 --- a/app/assets/templates/profile/_token.html.erb +++ b/app/assets/templates/profile/_token.html.erb @@ -3,6 +3,7 @@

{{ 'do_you_already_have_an_account' }}

{{ 'do_not_fill_the_form_beside_but_specify_here_the_code_you_ve_received_by_email_to_recover_your_access' }}

{{ 'just_specify_code_here_to_recover_access' }}

+

{{ 'i_did_not_receive_the_code' }}

diff --git a/app/assets/templates/profile/resend_code_modal.html b/app/assets/templates/profile/resend_code_modal.html new file mode 100644 index 000000000..427d381ae --- /dev/null +++ b/app/assets/templates/profile/resend_code_modal.html @@ -0,0 +1,26 @@ +
+ +

{{ 'send_code_again' }}

+
+
+ +
+ +
+ + +
+ {{'email_is_required'}} + {{'email_format_is_incorrect'}} +
+ +
+
+ + +
diff --git a/config/locales/app.logged.en.yml b/config/locales/app.logged.en.yml index 533e1bbe7..8a5e26a31 100644 --- a/config/locales/app.logged.en.yml +++ b/config/locales/app.logged.en.yml @@ -18,9 +18,12 @@ en: do_you_already_have_an_account: "Do you already have an account?" do_not_fill_the_form_beside_but_specify_here_the_code_you_ve_received_by_email_to_recover_your_access: "Do not fill the form beside but specify here the code you've received by email, to recover your access." just_specify_code_here_to_recover_access: "Just specify here the code you've received by email to recover your access." + i_did_not_receive_the_code: "I didn't receive the code" authentification_code: "Authentification code" confirm_my_code: "Confirm my code" an_unexpected_error_occurred_check_your_authentication_code: "An unexpected error occurred, please check your authentication code." + send_code_again: "Send the code again" + email_format_is_incorrect: "Email format is incorrect" dashboard: # dashboard: public profile diff --git a/config/locales/app.logged.fr.yml b/config/locales/app.logged.fr.yml index ea0e901dc..b3e8aeab5 100644 --- a/config/locales/app.logged.fr.yml +++ b/config/locales/app.logged.fr.yml @@ -18,9 +18,12 @@ fr: do_you_already_have_an_account: "Vous possédez déjà un compte ?" do_not_fill_the_form_beside_but_specify_here_the_code_you_ve_received_by_email_to_recover_your_access: "Ne remplissez pas le formulaire à gauche mais indiquez ici le code qui vous a été fourni par e-mail, cela vous permettra de récupérer l'accès à votre compte." just_specify_code_here_to_recover_access: "Indiquez simplement ici le code que vous avez reçu par e-mail, cela vous permettra de récupérer l'accès à votre compte." + i_did_not_receive_the_code: "Je n'ai pas reçu le code" authentification_code: "Code d'authentification" confirm_my_code: "Valider mon code" an_unexpected_error_occurred_check_your_authentication_code: "Une erreur inattendue est survenue, vérifiez votre code d'authentification." + send_code_again: "Renvoyer le code" + email_format_is_incorrect: "Le format de l'adresse email est incorrect" dashboard: # tableau de bord: profile publique From 102eecdc8a4d8239a57e92d12e8c259b4ebad304 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 15 Dec 2016 14:16:24 +0100 Subject: [PATCH 2/2] ability to send again auth migration code --- .../controllers/profile.coffee.erb | 15 +++++++------- .../javascripts/services/authProvider.coffee | 3 +++ .../templates/profile/resend_code_modal.html | 2 +- .../api/auth_providers_controller.rb | 20 ++++++++++++++++++- app/policies/auth_provider_policy.rb | 3 +++ config/locales/app.logged.en.yml | 2 ++ config/locales/app.logged.fr.yml | 2 ++ config/locales/en.yml | 2 ++ config/locales/fr.yml | 2 ++ config/routes.rb | 1 + 10 files changed, 42 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/controllers/profile.coffee.erb b/app/assets/javascripts/controllers/profile.coffee.erb index e883d8dfb..781f12995 100644 --- a/app/assets/javascripts/controllers/profile.coffee.erb +++ b/app/assets/javascripts/controllers/profile.coffee.erb @@ -1,8 +1,8 @@ 'use strict' -Application.Controllers.controller "CompleteProfileController", ["$scope", "$rootScope", "$state", "$window", "_t", "growl", "CSRF", "Auth", "Member", "settingsPromise", "activeProviderPromise", "groupsPromise", "cguFile", "memberPromise", "Session", "dialogs" -, ($scope, $rootScope, $state, $window, _t, growl, CSRF, Auth, Member, settingsPromise, activeProviderPromise, groupsPromise, cguFile, memberPromise, Session, dialogs) -> +Application.Controllers.controller "CompleteProfileController", ["$scope", "$rootScope", "$state", "$window", "_t", "growl", "CSRF", "Auth", "Member", "settingsPromise", "activeProviderPromise", "groupsPromise", "cguFile", "memberPromise", "Session", "dialogs", "AuthProvider" +, ($scope, $rootScope, $state, $window, _t, growl, CSRF, Auth, Member, settingsPromise, activeProviderPromise, groupsPromise, cguFile, memberPromise, Session, dialogs, AuthProvider) -> @@ -148,18 +148,17 @@ Application.Controllers.controller "CompleteProfileController", ["$scope", "$roo $scope.resendCode = (event) -> event.preventDefault() event.stopPropagation() - # TODO show modal only IF email is not mapped to sso OR email = null dialogs.confirm templateUrl: '<%= asset_path "profile/resend_code_modal.html" %>' resolve: object: -> email: memberPromise.email , (email) -> - console.log(email) - # TODO update email - # TODO in every cases, resend email - # TODO growl result - + # Request the server to send an auth-migration email to the current user + AuthProvider.send_code {email: email}, (res) -> + growl.info(_t('code_successfully_sent_again')) + , (err) -> + growl.error(err.data.error) diff --git a/app/assets/javascripts/services/authProvider.coffee b/app/assets/javascripts/services/authProvider.coffee index 4acb0b731..e9928ba8f 100644 --- a/app/assets/javascripts/services/authProvider.coffee +++ b/app/assets/javascripts/services/authProvider.coffee @@ -11,4 +11,7 @@ Application.Services.factory 'AuthProvider', ["$resource", ($resource)-> active: method: 'GET' url: '/api/auth_providers/active' + send_code: + method: 'POST' + url: '/api/auth_providers/send_code' ] diff --git a/app/assets/templates/profile/resend_code_modal.html b/app/assets/templates/profile/resend_code_modal.html index 427d381ae..b3e04dd02 100644 --- a/app/assets/templates/profile/resend_code_modal.html +++ b/app/assets/templates/profile/resend_code_modal.html @@ -5,7 +5,7 @@
- +