From 3517db8348a49c117576a778483d1eb0fb7bf209 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Tue, 3 Jul 2018 15:28:00 +0100 Subject: [PATCH 01/16] SL styling adjustments. --- .../web/public/stylesheets/components/input-suggestions.less | 2 +- services/web/public/stylesheets/components/ui-select.less | 3 +++ services/web/public/stylesheets/core/_common-variables.less | 2 ++ services/web/public/stylesheets/core/ol-variables.less | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/services/web/public/stylesheets/components/input-suggestions.less b/services/web/public/stylesheets/components/input-suggestions.less index bf2fd4a253..2424ad5cdc 100644 --- a/services/web/public/stylesheets/components/input-suggestions.less +++ b/services/web/public/stylesheets/components/input-suggestions.less @@ -10,7 +10,7 @@ .input-suggestions-shadow { background-color: @input-bg; - padding-top: 4px; + padding-top: @input-suggestion-v-offset; } .input-suggestions-shadow-existing { color: transparent; diff --git a/services/web/public/stylesheets/components/ui-select.less b/services/web/public/stylesheets/components/ui-select.less index 5513378629..f78cc2f6a3 100644 --- a/services/web/public/stylesheets/components/ui-select.less +++ b/services/web/public/stylesheets/components/ui-select.less @@ -35,12 +35,14 @@ > .btn { border-color: @input-border-focus; box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 8px fade(@input-border-focus, 60%); + padding-top: @input-suggestion-v-offset; } } > .btn { color: @input-color; background-color: @input-bg; border: 1px solid @input-border; + padding-top: @input-suggestion-v-offset; &[disabled] { cursor: not-allowed; background-color: @input-bg-disabled; @@ -53,6 +55,7 @@ .ui-select-container[tagging] { .ui-select-toggle { cursor: text; + padding-top: @input-suggestion-v-offset; > i.caret.pull-right { display: none; } diff --git a/services/web/public/stylesheets/core/_common-variables.less b/services/web/public/stylesheets/core/_common-variables.less index 8dc3294a15..fefe12da73 100644 --- a/services/web/public/stylesheets/core/_common-variables.less +++ b/services/web/public/stylesheets/core/_common-variables.less @@ -995,3 +995,5 @@ @history-toolbar-bg-color : @toolbar-alt-bg-color; @history-toolbar-color : @text-color; +// Input suggestions +@input-suggestion-v-offset : 6px; diff --git a/services/web/public/stylesheets/core/ol-variables.less b/services/web/public/stylesheets/core/ol-variables.less index 9f4eb29c95..0e05ccdd68 100644 --- a/services/web/public/stylesheets/core/ol-variables.less +++ b/services/web/public/stylesheets/core/ol-variables.less @@ -289,6 +289,8 @@ @sys-msg-color : #FFF; @sys-msg-border : solid 1px lighten(@ol-blue, 10%); +@input-suggestion-v-offset : 4px; + //== Colors // //## Gray and brand colors for use across Bootstrap. From 1514e5e071947ed20c362504351c2937eec2177c Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Tue, 3 Jul 2018 16:47:02 +0100 Subject: [PATCH 02/16] Isolate affiliations form in a component. --- .../views/user/settings/user-affiliations.pug | 143 +++++++++--------- services/web/public/coffee/main.coffee | 1 + .../components/affiliationForm.coffee | 53 +++++++ .../UserAffiliationsController.coffee | 53 +------ 4 files changed, 134 insertions(+), 116 deletions(-) create mode 100644 services/web/public/coffee/main/affiliations/components/affiliationForm.coffee diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug index 6b08b09346..22498fb938 100644 --- a/services/web/app/views/user/settings/user-affiliations.pug +++ b/services/web/app/views/user/settings/user-affiliations.pug @@ -88,74 +88,11 @@ form.row( href ng-click="selectUniversityManually();" ) Let us know - .affiliations-form-group( - ng-if="ui.showManualUniversitySelectionUI" + affiliation-form( + affiliation-data="newAffiliation" + show-university-and-country="ui.showManualUniversitySelectionUI" + show-role-and-department="ui.isValidEmail && newAffiliation.university" ) - ui-select( - ng-model="newAffiliation.country" - ) - ui-select-match( - placeholder="Country" - ) {{ $select.selected.name }} - ui-select-choices( - repeat="country in countries | filter: $select.search" - ) - span( - ng-bind="country.name" - s) - .affiliations-form-group( - ng-if="ui.showManualUniversitySelectionUI" - ) - ui-select( - ng-model="newAffiliation.university" - ng-disabled="!newAffiliation.country" - tagging="addUniversityToSelection" - tagging-label="false" - ) - ui-select-match( - placeholder="Institution" - ) {{ $select.selected.name }} - ui-select-choices( - repeat="university in universities | filter: $select.search" - ) - span( - ng-bind="university.name" - ) - .affiliations-form-group( - ng-if="ui.isValidEmail && newAffiliation.university" - ) - ui-select( - ng-model="newAffiliation.role" - tagging - tagging-label="false" - ) - ui-select-match( - placeholder="Role" - ) {{ $select.selected }} - ui-select-choices( - repeat="role in roles | filter: $select.search" - ) - span( - ng-bind="role" - ) - - .affiliations-form-group( - ng-if="ui.isValidEmail && newAffiliation.university" - ) - ui-select( - ng-model="newAffiliation.department" - tagging - tagging-label="false" - ) - ui-select-match( - placeholder="Department" - ) {{ $select.selected }} - ui-select-choices( - repeat="department in departments | filter: $select.search" - ) - span( - ng-bind="department" - ) td button.btn.btn-primary( ng-disabled="affiliationsForm.$invalid || ui.isAddingNewEmail" @@ -169,4 +106,74 @@ form.row( ) i.fa.fa-fw.fa-spin.fa-refresh |  Adding... - hr \ No newline at end of file + hr + +script(type="text/ng-template", id="affiliationFormTpl") + .affiliations-form-group( + ng-if="$ctrl.showUniversityAndCountry" + ) + ui-select( + ng-model="$ctrl.affiliationData.country" + ) + ui-select-match( + placeholder="Country" + ) {{ $select.selected.name }} + ui-select-choices( + repeat="country in $ctrl.countries | filter: $select.search" + ) + span( + ng-bind="country.name" + ) + .affiliations-form-group( + ng-if="$ctrl.showUniversityAndCountry" + ) + ui-select( + ng-model="$ctrl.affiliationData.university" + ng-disabled="!$ctrl.affiliationData.country" + tagging="$ctrladdUniversityToSelection" + tagging-label="false" + ) + ui-select-match( + placeholder="Institution" + ) {{ $select.selected.name }} + ui-select-choices( + repeat="university in $ctrl.universities | filter: $select.search" + ) + span( + ng-bind="university.name" + ) + .affiliations-form-group( + ng-if="$ctrl.showRoleAndDepartment" + ) + ui-select( + ng-model="$ctrl.affiliationData.role" + tagging + tagging-label="false" + ) + ui-select-match( + placeholder="Role" + ) {{ $select.selected }} + ui-select-choices( + repeat="role in $ctrl.roles | filter: $select.search" + ) + span( + ng-bind="role" + ) + + .affiliations-form-group( + ng-if="$ctrl.showRoleAndDepartment" + ) + ui-select( + ng-model="$ctrl.affiliationData.department" + tagging + tagging-label="false" + ) + ui-select-match( + placeholder="Department" + ) {{ $select.selected }} + ui-select-choices( + repeat="department in $ctrl.departments | filter: $select.search" + ) + span( + ng-bind="department" + ) diff --git a/services/web/public/coffee/main.coffee b/services/web/public/coffee/main.coffee index 80e637d705..abbc59f9e4 100644 --- a/services/web/public/coffee/main.coffee +++ b/services/web/public/coffee/main.coffee @@ -20,6 +20,7 @@ define [ "main/subscription/team-invite-controller" "main/contact-us" "main/learn" + "main/affiliations/components/affiliationForm" "main/affiliations/controllers/UserAffiliationsController" "main/affiliations/factories/UserAffiliationsDataService" "main/keys" diff --git a/services/web/public/coffee/main/affiliations/components/affiliationForm.coffee b/services/web/public/coffee/main/affiliations/components/affiliationForm.coffee new file mode 100644 index 0000000000..faec7b39c0 --- /dev/null +++ b/services/web/public/coffee/main/affiliations/components/affiliationForm.coffee @@ -0,0 +1,53 @@ +define [ + "base" +], (App) -> + affiliationFormController = ($scope, $element, $attrs, UserAffiliationsDataService) -> + ctrl = @ + ctrl.roles = [] + ctrl.departments = [] + ctrl.countries = [] + ctrl.universities = [] + _defaultDepartments = [] + + ctrl.addUniversityToSelection = (universityName) -> + { name: universityName, isUserSuggested: true } + # Populates the countries dropdown + UserAffiliationsDataService + .getCountries() + .then (countries) -> ctrl.countries = countries + # Populates the roles dropdown + UserAffiliationsDataService + .getDefaultRoleHints() + .then (roles) -> ctrl.roles = roles + # Fetches the default department hints + UserAffiliationsDataService + .getDefaultDepartmentHints() + .then (departments) -> + _defaultDepartments = departments + # Populates the universities dropdown (after selecting a country) + $scope.$watch "$ctrl.affiliationData.country", (newSelectedCountry, prevSelectedCountry) -> + if newSelectedCountry? and newSelectedCountry != prevSelectedCountry + ctrl.affiliationData.university = null + ctrl.affiliationData.role = null + ctrl.affiliationData.department = null + UserAffiliationsDataService + .getUniversitiesFromCountry(newSelectedCountry) + .then (universities) -> ctrl.universities = universities + # Populates the departments dropdown (after selecting a university) + $scope.$watch "$ctrl.affiliationData.university", (newSelectedUniversity, prevSelectedUniversity) -> + if newSelectedUniversity? and newSelectedUniversity != prevSelectedUniversity + if newSelectedUniversity.departments?.length > 0 + ctrl.departments = _.uniq newSelectedUniversity.departments + else + ctrl.departments = _defaultDepartments + + return + + App.component "affiliationForm", { + bindings: + affiliationData: "=" + showUniversityAndCountry: "<" + showRoleAndDepartment: "<" + controller: affiliationFormController + templateUrl: "affiliationFormTpl" + } \ No newline at end of file diff --git a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee index a8cf710afc..3ebf25ab50 100644 --- a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee +++ b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee @@ -3,12 +3,6 @@ define [ ], (App) -> App.controller "UserAffiliationsController", ["$scope", "UserAffiliationsDataService", "$q", "_", ($scope, UserAffiliationsDataService, $q, _) -> $scope.userEmails = [] - $scope.countries = [] - $scope.universities = [] - $scope.roles = [] - $scope.departments = [] - - _defaultDepartments = [] LOCAL_AND_DOMAIN_REGEX = /([^@]+)@(.+)/ EMAIL_REGEX = /^([A-Za-z0-9_\-\.]+)@([^\.]+)\.([A-Za-z0-9_\-\.]+)([^\.])$/ @@ -20,9 +14,6 @@ define [ else { local: null, domain: null } - $scope.addUniversityToSelection = (universityName) -> - { name: universityName, isUserSuggested: true } - $scope.getEmailSuggestion = (userInput) -> userInputLocalAndDomain = _matchLocalAndDomain(userInput) $scope.ui.isValidEmail = EMAIL_REGEX.test userInput @@ -97,11 +88,11 @@ define [ .removeUserEmail email .then () -> _getUserEmails() - $scope.getDepartments = () -> - if $scope.newAffiliation.university?.departments.length > 0 - _.uniq $scope.newAffiliation.university.departments - else - UserAffiliationsDataService.getDefaultDepartmentHints() + # $scope.getDepartments = () -> + # if $scope.newAffiliation.university?.departments.length > 0 + # _.uniq $scope.newAffiliation.university.departments + # else + # UserAffiliationsDataService.getDefaultDepartmentHints() _reset = () -> $scope.newAffiliation = @@ -129,38 +120,4 @@ define [ $scope.ui.isLoadingEmails = false _getUserEmails() - # Populates the countries dropdown - UserAffiliationsDataService - .getCountries() - .then (countries) -> $scope.countries = countries - - # Populates the roles dropdown - UserAffiliationsDataService - .getDefaultRoleHints() - .then (roles) -> $scope.roles = roles - - # Fetches the default department hints - UserAffiliationsDataService - .getDefaultDepartmentHints() - .then (departments) -> - _defaultDepartments = departments - - # Populates the universities dropdown (after selecting a country) - $scope.$watch "newAffiliation.country", (newSelectedCountry, prevSelectedCountry) -> - if newSelectedCountry? and newSelectedCountry != prevSelectedCountry - $scope.newAffiliation.university = null - $scope.newAffiliation.role = null - $scope.newAffiliation.department = null - UserAffiliationsDataService - .getUniversitiesFromCountry(newSelectedCountry) - .then (universities) -> $scope.universities = universities - - # Populates the departments dropdown (after selecting a university) - $scope.$watch "newAffiliation.university", (newSelectedUniversity, prevSelectedUniversity) -> - if newSelectedUniversity? and newSelectedUniversity != prevSelectedUniversity - if newSelectedUniversity.departments?.length > 0 - $scope.departments = _.uniq newSelectedUniversity.departments - else - $scope.departments = _defaultDepartments - ] \ No newline at end of file From a64910d4099e456cdfd435eac39109298f39307c Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Wed, 4 Jul 2018 10:56:43 +0100 Subject: [PATCH 03/16] Make sure to specify which email to set as default. --- .../affiliations/factories/UserAffiliationsDataService.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee index ba558eb595..0b026de0e2 100644 --- a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee +++ b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee @@ -82,6 +82,7 @@ define [ setDefaultUserEmail = (email) -> $http.post "/user/emails/default", { + email, _csrf: window.csrfToken } From 19b57571bf1a42a196cd9adc7f15079824471c5e Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Wed, 4 Jul 2018 16:37:40 +0100 Subject: [PATCH 04/16] Basic affiliation change implementation. --- .../views/user/settings/user-affiliations.pug | 43 ++++++++++++++++--- .../components/affiliationForm.coffee | 9 ++-- .../UserAffiliationsController.coffee | 32 +++++++++++--- .../UserAffiliationsDataService.coffee | 10 +++++ 4 files changed, 78 insertions(+), 16 deletions(-) diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug index 22498fb938..3d12c5bfa2 100644 --- a/services/web/app/views/user/settings/user-affiliations.pug +++ b/services/web/app/views/user/settings/user-affiliations.pug @@ -16,12 +16,45 @@ form.row( ng-repeat="userEmail in userEmails" ) td {{ userEmail.email + (userEmail.default ? ' (default)' : '') }} + //- td {{ userEmail | json }} td - div(ng-if="userEmail.affiliation.institution") {{ userEmail.affiliation.institution.name }} - div(ng-if="userEmail.affiliation.role || userEmail.affiliation.department") - span(ng-if="userEmail.affiliation.role") {{ userEmail.affiliation.role }} - span(ng-if="userEmail.affiliation.role && userEmail.affiliation.department") , - span(ng-if="userEmail.affiliation.department") {{ userEmail.affiliation.department }} + div(ng-if="userEmail.affiliation.institution") + div {{ userEmail.affiliation.institution.name }} + a( + href + ng-if="!isChangingAffiliation(userEmail.email) && !userEmail.affiliation.role && !userEmail.affiliation.department" + ng-click="changeAffiliation(userEmail);" + ) Add role and department + div( + ng-if="!isChangingAffiliation(userEmail.email) && (userEmail.affiliation.role || userEmail.affiliation.department)" + ) + span(ng-if="userEmail.affiliation.role") {{ userEmail.affiliation.role }} + span(ng-if="userEmail.affiliation.role && userEmail.affiliation.department") , + span(ng-if="userEmail.affiliation.department") {{ userEmail.affiliation.department }} + | ( + a( + href + ng-click="changeAffiliation(userEmail);" + ) change + | ) + div( + ng-if="isChangingAffiliation(userEmail.email)" + ) + affiliation-form( + affiliation-data="affiliationToChange" + show-university-and-country="false" + show-role-and-department="true" + ) + .pull-right + a( + href + ng-click="saveAffiliationChange();" + ) Save + | or + a( + href + ng-click="cancelAffiliationChange();" + ) Cancel td a( href diff --git a/services/web/public/coffee/main/affiliations/components/affiliationForm.coffee b/services/web/public/coffee/main/affiliations/components/affiliationForm.coffee index faec7b39c0..1c0c7d6229 100644 --- a/services/web/public/coffee/main/affiliations/components/affiliationForm.coffee +++ b/services/web/public/coffee/main/affiliations/components/affiliationForm.coffee @@ -35,11 +35,10 @@ define [ .then (universities) -> ctrl.universities = universities # Populates the departments dropdown (after selecting a university) $scope.$watch "$ctrl.affiliationData.university", (newSelectedUniversity, prevSelectedUniversity) -> - if newSelectedUniversity? and newSelectedUniversity != prevSelectedUniversity - if newSelectedUniversity.departments?.length > 0 - ctrl.departments = _.uniq newSelectedUniversity.departments - else - ctrl.departments = _defaultDepartments + if newSelectedUniversity? and newSelectedUniversity != prevSelectedUniversity and newSelectedUniversity.departments?.length > 0 + ctrl.departments = _.uniq newSelectedUniversity.departments + else + ctrl.departments = _defaultDepartments return diff --git a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee index 3ebf25ab50..f3ceca8e0d 100644 --- a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee +++ b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee @@ -46,6 +46,27 @@ define [ $scope.newAffiliation.department = null $scope.ui.showManualUniversitySelectionUI = true + $scope.changeAffiliation = (userEmail) -> + $scope.affiliationToChange.email = userEmail.email + $scope.affiliationToChange.role = userEmail.affiliation.role + $scope.affiliationToChange.department = userEmail.affiliation.department + + $scope.saveAffiliationChange = () -> + UserAffiliationsDataService + .addRoleAndDepartment( + $scope.affiliationToChange.email, + $scope.affiliationToChange.role, + $scope.affiliationToChange.department + ) + + $scope.cancelAffiliationChange = (email) -> + $scope.affiliationToChange.email = "" + $scope.affiliationToChange.role = null + $scope.affiliationToChange.department = null + + $scope.isChangingAffiliation = (email) -> + $scope.affiliationToChange.email == email + $scope.showAddEmailForm = () -> $scope.ui.showAddEmailUI = true @@ -88,12 +109,6 @@ define [ .removeUserEmail email .then () -> _getUserEmails() - # $scope.getDepartments = () -> - # if $scope.newAffiliation.university?.departments.length > 0 - # _.uniq $scope.newAffiliation.university.departments - # else - # UserAffiliationsDataService.getDefaultDepartmentHints() - _reset = () -> $scope.newAffiliation = email: "" @@ -102,12 +117,17 @@ define [ role: null department: null $scope.ui = + showChangeAffiliationUI: false showManualUniversitySelectionUI: false isLoadingEmails: false isAddingNewEmail: false showAddEmailUI: false isValidEmail: false isBlacklistedEmail: false + $scope.affiliationToChange = + email: "" + role: null + department: null _reset() # Populates the emails table diff --git a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee index 0b026de0e2..6b689f5441 100644 --- a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee +++ b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee @@ -80,6 +80,15 @@ define [ _csrf: window.csrfToken } + addRoleAndDepartment = (email, role, department) -> + $http.post "/endorse", { + email, + role, + department, + _csrf: window.csrfToken + } + + setDefaultUserEmail = (email) -> $http.post "/user/emails/default", { email, @@ -105,6 +114,7 @@ define [ addUserEmail addUserAffiliationWithUnknownUniversity addUserAffiliation + addRoleAndDepartment setDefaultUserEmail removeUserEmail isDomainBlacklisted From c630c5d952f3a363e20352a58bab8a51e9c99953 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Wed, 4 Jul 2018 16:54:04 +0100 Subject: [PATCH 05/16] Preemptively remove front-end data when removing user emails. --- .../web/app/views/user/settings/user-affiliations.pug | 4 ++-- .../controllers/UserAffiliationsController.coffee | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug index 3d12c5bfa2..24424b495c 100644 --- a/services/web/app/views/user/settings/user-affiliations.pug +++ b/services/web/app/views/user/settings/user-affiliations.pug @@ -59,13 +59,13 @@ form.row( a( href ng-if="!userEmail.default" - ng-click="setDefaultUserEmail(userEmail.email)" + ng-click="setDefaultUserEmail(userEmail)" ) Make default br a( href ng-if="!userEmail.default" - ng-click="removeUserEmail(userEmail.email)" + ng-click="removeUserEmail(userEmail)" ) Remove tr.affiliations-table-highlighted-row( ng-if="ui.isLoadingEmails" diff --git a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee index f3ceca8e0d..d88a15e161 100644 --- a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee +++ b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee @@ -97,16 +97,19 @@ define [ _reset() _getUserEmails() - $scope.setDefaultUserEmail = (email) -> + $scope.setDefaultUserEmail = (userEmail) -> $scope.ui.isLoadingEmails = true UserAffiliationsDataService - .setDefaultUserEmail email + .setDefaultUserEmail userEmail.email .then () -> _getUserEmails() - $scope.removeUserEmail = (email) -> + $scope.removeUserEmail = (userEmail) -> $scope.ui.isLoadingEmails = true + userEmailIdx = _.indexOf $scope.userEmails, userEmail + if userEmailIdx > -1 + $scope.userEmails.splice userEmailIdx, 1 UserAffiliationsDataService - .removeUserEmail email + .removeUserEmail userEmail.email .then () -> _getUserEmails() _reset = () -> From 4d1b6c6ba843cb70bcbc23cf7b546353d8d542ae Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Thu, 5 Jul 2018 11:36:02 +0100 Subject: [PATCH 06/16] Add error handling. --- .../views/user/settings/user-affiliations.pug | 23 +++++++++++++++++-- .../UserAffiliationsController.coffee | 22 +++++++++++++++--- .../UserAffiliationsDataService.coffee | 3 +-- .../stylesheets/app/account-settings.less | 12 ++++++++++ 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug index 24424b495c..92f64dcdc3 100644 --- a/services/web/app/views/user/settings/user-affiliations.pug +++ b/services/web/app/views/user/settings/user-affiliations.pug @@ -11,7 +11,9 @@ form.row( th.affiliations-table-email Email th.affiliations-table-institution Institution and role th.affiliations-table-inline-actions - tbody + tbody( + ng-if="!ui.hasError" + ) tr( ng-repeat="userEmail in userEmails" ) @@ -73,7 +75,6 @@ form.row( td.text-center(colspan="3") i.fa.fa-fw.fa-spin.fa-refresh |  Loading... - tr.affiliations-table-highlighted-row( ng-if="!ui.showAddEmailUI && !ui.isLoadingEmails" ) @@ -139,6 +140,24 @@ form.row( ) i.fa.fa-fw.fa-spin.fa-refresh |  Adding... + tbody( + ng-if="ui.hasError" + ) + tr.affiliations-table-error-row( + ng-if="true" + ) + td.text-center(colspan="3") + div + i.fa.fa-fw.fa-exclamation-triangle + |  An error has occurred while performing your request. + div + | Click + a( + href + ng-click="acknowledgeError();" + ) here + | to reload your emails and affiliations. + hr script(type="text/ng-template", id="affiliationFormTpl") diff --git a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee index d88a15e161..8b7a5c926f 100644 --- a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee +++ b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee @@ -52,12 +52,15 @@ define [ $scope.affiliationToChange.department = userEmail.affiliation.department $scope.saveAffiliationChange = () -> + $scope.ui.isLoadingEmails = true UserAffiliationsDataService .addRoleAndDepartment( $scope.affiliationToChange.email, $scope.affiliationToChange.role, $scope.affiliationToChange.department ) + .then () -> _getUserEmails() + .catch () -> $scope.ui.hasError = true $scope.cancelAffiliationChange = (email) -> $scope.affiliationToChange.email = "" @@ -93,15 +96,19 @@ define [ $scope.newAffiliation.role, $scope.newAffiliation.department ) - addEmailPromise.then () -> - _reset() - _getUserEmails() + addEmailPromise + .then () -> + _reset() + _getUserEmails() + .catch () -> + $scope.ui.hasError = true $scope.setDefaultUserEmail = (userEmail) -> $scope.ui.isLoadingEmails = true UserAffiliationsDataService .setDefaultUserEmail userEmail.email .then () -> _getUserEmails() + .catch () -> $scope.ui.hasError = true $scope.removeUserEmail = (userEmail) -> $scope.ui.isLoadingEmails = true @@ -111,6 +118,11 @@ define [ UserAffiliationsDataService .removeUserEmail userEmail.email .then () -> _getUserEmails() + .catch () -> $scope.ui.hasError = true + + $scope.acknowledgeError = () -> + _reset() + _getUserEmails() _reset = () -> $scope.newAffiliation = @@ -120,6 +132,7 @@ define [ role: null department: null $scope.ui = + hasError: false showChangeAffiliationUI: false showManualUniversitySelectionUI: false isLoadingEmails: false @@ -141,6 +154,9 @@ define [ .then (emails) -> $scope.userEmails = emails $scope.ui.isLoadingEmails = false + .catch () -> + $scope.ui.hasError = true + _getUserEmails() ] \ No newline at end of file diff --git a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee index 6b689f5441..2886cf779d 100644 --- a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee +++ b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee @@ -27,7 +27,7 @@ define [ getDefaultDepartmentHints = () -> $q.resolve defaultDepartmentHints - getUserEmails = () -> + getUserEmails = () -> $http.get "/user/emails" .then (response) -> response.data @@ -88,7 +88,6 @@ define [ _csrf: window.csrfToken } - setDefaultUserEmail = (email) -> $http.post "/user/emails/default", { email, diff --git a/services/web/public/stylesheets/app/account-settings.less b/services/web/public/stylesheets/app/account-settings.less index f8663f7b5f..17fecb4110 100644 --- a/services/web/public/stylesheets/app/account-settings.less +++ b/services/web/public/stylesheets/app/account-settings.less @@ -29,6 +29,18 @@ .affiliations-table-highlighted-row { background-color: tint(@content-alt-bg-color, 6%); } + .affiliations-table-error-row { + background-color: @alert-danger-bg; + color: @alert-danger-text; + a { + color: #FFF; + font-weight: bold; + &:hover, + &:focus { + color: #FFF; + } + } + } .affiliations-form-group { margin-top: @table-cell-padding; From c817094a2d0be96e3b9552d721d4c451d5d2dc96 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Thu, 5 Jul 2018 15:31:34 +0100 Subject: [PATCH 07/16] Add i18n keys; minor style adjustments. --- .../views/user/settings/user-affiliations.pug | 52 +++++++++---------- .../stylesheets/app/account-settings.less | 16 +++--- 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug index 92f64dcdc3..3f4378155a 100644 --- a/services/web/app/views/user/settings/user-affiliations.pug +++ b/services/web/app/views/user/settings/user-affiliations.pug @@ -3,13 +3,13 @@ form.row( name="affiliationsForm" ) .col-md-12 - h3 Emails and Affiliations - p.small Add additional email addresses to your account to access any upgrades your university or institution has, to make it easier for collaborators to find you, and to make sure you can recover your account. + h3 #{translate("emails_and_affiliations_title")} + p.small #{translate("emails_and_affiliations_explanation")} table.table.affiliations-table thead tr - th.affiliations-table-email Email - th.affiliations-table-institution Institution and role + th.affiliations-table-email #{translate("email")} + th.affiliations-table-institution #{translate("institution_and_role")} th.affiliations-table-inline-actions tbody( ng-if="!ui.hasError" @@ -18,7 +18,6 @@ form.row( ng-repeat="userEmail in userEmails" ) td {{ userEmail.email + (userEmail.default ? ' (default)' : '') }} - //- td {{ userEmail | json }} td div(ng-if="userEmail.affiliation.institution") div {{ userEmail.affiliation.institution.name }} @@ -26,7 +25,7 @@ form.row( href ng-if="!isChangingAffiliation(userEmail.email) && !userEmail.affiliation.role && !userEmail.affiliation.department" ng-click="changeAffiliation(userEmail);" - ) Add role and department + ) #{translate("add_role_and_department")} div( ng-if="!isChangingAffiliation(userEmail.email) && (userEmail.affiliation.role || userEmail.affiliation.department)" ) @@ -37,9 +36,9 @@ form.row( a( href ng-click="changeAffiliation(userEmail);" - ) change + ) #{translate("change")} | ) - div( + .affiliation-change-container( ng-if="isChangingAffiliation(userEmail.email)" ) affiliation-form( @@ -47,34 +46,34 @@ form.row( show-university-and-country="false" show-role-and-department="true" ) - .pull-right + .affiliation-change-actions a( href ng-click="saveAffiliationChange();" - ) Save - | or + ) #{translate("save_or_cancel-save")} + | #{translate("save_or_cancel-or" )} a( href ng-click="cancelAffiliationChange();" - ) Cancel + ) #{translate("save_or_cancel-cancel")} td a( href ng-if="!userEmail.default" ng-click="setDefaultUserEmail(userEmail)" - ) Make default + ) #{translate("make_default")} br a( href ng-if="!userEmail.default" ng-click="removeUserEmail(userEmail)" - ) Remove + ) #{translate("remove")} tr.affiliations-table-highlighted-row( ng-if="ui.isLoadingEmails" ) td.text-center(colspan="3") i.fa.fa-fw.fa-spin.fa-refresh - |  Loading... + |  #{translate("loading")}... tr.affiliations-table-highlighted-row( ng-if="!ui.showAddEmailUI && !ui.isLoadingEmails" ) @@ -82,7 +81,7 @@ form.row( a( href ng-click="showAddEmailForm()" - ) Add another email + ) #{translate("add_another_email")} tr.affiliations-table-highlighted-row( ng-if="ui.showAddEmailUI" @@ -108,20 +107,20 @@ form.row( a( href ng-click="selectUniversityManually();" - ) change + ) #{translate("change")} | ) .affiliations-table-label( ng-if="!newAffiliation.university && !ui.isValidEmail && !ui.showManualUniversitySelectionUI" - ) Start by adding your email address. + ) #{translate("start_by_adding_your_email")} .affiliations-table-label( ng-if="!newAffiliation.university && ui.isValidEmail && !ui.isBlacklistedEmail && !ui.showManualUniversitySelectionUI" ) - | Is your email affiliated with an institution? + | #{translate("is_email_affiliated")} br a( href ng-click="selectUniversityManually();" - ) Let us know + ) #{translate("let_us_know")} affiliation-form( affiliation-data="newAffiliation" show-university-and-country="ui.showManualUniversitySelectionUI" @@ -134,12 +133,12 @@ form.row( ) span( ng-if="!ui.isAddingNewEmail" - ) Add new email + ) #{translate("add_new_email")} span( ng-if="ui.isAddingNewEmail" ) i.fa.fa-fw.fa-spin.fa-refresh - |  Adding... + |  #{translate("adding")}... tbody( ng-if="ui.hasError" ) @@ -149,14 +148,11 @@ form.row( td.text-center(colspan="3") div i.fa.fa-fw.fa-exclamation-triangle - |  An error has occurred while performing your request. + |  #{translate("error_performing_request")} div - | Click - a( - href + button.btn.btn-xs( ng-click="acknowledgeError();" - ) here - | to reload your emails and affiliations. + ) #{translate("reload_emails_and_affiliations")} hr diff --git a/services/web/public/stylesheets/app/account-settings.less b/services/web/public/stylesheets/app/account-settings.less index 17fecb4110..439cf9c059 100644 --- a/services/web/public/stylesheets/app/account-settings.less +++ b/services/web/public/stylesheets/app/account-settings.less @@ -32,22 +32,22 @@ .affiliations-table-error-row { background-color: @alert-danger-bg; color: @alert-danger-text; - a { - color: #FFF; - font-weight: bold; - &:hover, - &:focus { - color: #FFF; - } + .btn { + margin-top: @table-cell-padding; + .button-variant(@btn-danger-color; darken(@btn-danger-bg, 8%); @btn-danger-border); } } - .affiliations-form-group { margin-top: @table-cell-padding; &:first-child { margin-top: 0; } } + .affiliation-change-container, + .affiliation-change-actions { + margin-top: @table-cell-padding; + } + .affiliations-table-label { padding-top: 4px; } From 85cf518457acee453f2b382ace43648b2b88ecfc Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Thu, 5 Jul 2018 17:26:12 +0100 Subject: [PATCH 08/16] Avoid showing the email input when viewing the full affiliations UI; disable affiliations when using SAML and LDAP authentication strategies. --- .../app/coffee/infrastructure/Features.coffee | 2 + services/web/app/views/user/settings.pug | 41 ++++++++++--------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/services/web/app/coffee/infrastructure/Features.coffee b/services/web/app/coffee/infrastructure/Features.coffee index afb2eefb9f..b17771f6f6 100644 --- a/services/web/app/coffee/infrastructure/Features.coffee +++ b/services/web/app/coffee/infrastructure/Features.coffee @@ -20,5 +20,7 @@ module.exports = Features = return Settings.overleaf? when 'templates' return !Settings.overleaf? + when 'affiliations' + return !(Settings.ldap? or Settings.saml?) else throw new Error("unknown feature: #{feature}") diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug index a781cd708a..a43e81c12c 100644 --- a/services/web/app/views/user/settings.pug +++ b/services/web/app/views/user/settings.pug @@ -9,7 +9,7 @@ block content .page-header h1 #{translate("account_settings")} .account-settings(ng-controller="AccountSettingsController", ng-cloak) - if locals.showAffiliationsUI + if locals.showAffiliationsUI && hasFeature('affiliations') include settings/user-affiliations form-messages(for="settingsForm") @@ -22,25 +22,26 @@ block content h3 #{translate("update_account_info")} form(async-form="settings", name="settingsForm", method="POST", action="/user/settings", novalidate) input(type="hidden", name="_csrf", value=csrfToken) - if !externalAuthenticationSystemUsed() - .form-group - label(for='email') #{translate("email")} - input.form-control( - type='email', - name='email', - placeholder="email@example.com" - required, - ng-model="email", - ng-init="email = "+JSON.stringify(user.email), - ng-model-options="{ updateOn: 'blur' }" - ) - span.small.text-primary(ng-show="settingsForm.email.$invalid && settingsForm.email.$dirty") - | #{translate("must_be_email_address")} - else - // show the email, non-editable - .form-group - label.control-label #{translate("email")} - div.form-control(readonly="true") #{user.email} + if !(locals.showAffiliationsUI && hasFeature('affiliations')) + if !externalAuthenticationSystemUsed() + .form-group + label(for='email') #{translate("email")} + input.form-control( + type='email', + name='email', + placeholder="email@example.com" + required, + ng-model="email", + ng-init="email = "+JSON.stringify(user.email), + ng-model-options="{ updateOn: 'blur' }" + ) + span.small.text-primary(ng-show="settingsForm.email.$invalid && settingsForm.email.$dirty") + | #{translate("must_be_email_address")} + else + // show the email, non-editable + .form-group + label.control-label #{translate("email")} + div.form-control(readonly="true") #{user.email} if shouldAllowEditingDetails .form-group From a759828ece8bf87e41b88ee94178645746301d2c Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Fri, 6 Jul 2018 12:03:26 +0100 Subject: [PATCH 09/16] Update feature flag for affiliations; use it in the router; minor style adjustments. --- services/web/app/coffee/infrastructure/Features.coffee | 2 +- services/web/app/coffee/router.coffee | 2 +- .../web/app/views/user/settings/user-affiliations.pug | 8 ++++---- .../factories/UserAffiliationsDataService.coffee | 2 +- services/web/public/stylesheets/app/account-settings.less | 3 +++ 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/services/web/app/coffee/infrastructure/Features.coffee b/services/web/app/coffee/infrastructure/Features.coffee index b17771f6f6..bf7d37d773 100644 --- a/services/web/app/coffee/infrastructure/Features.coffee +++ b/services/web/app/coffee/infrastructure/Features.coffee @@ -21,6 +21,6 @@ module.exports = Features = when 'templates' return !Settings.overleaf? when 'affiliations' - return !(Settings.ldap? or Settings.saml?) + return settings?.apis?.v1?.url? else throw new Error("unknown feature: #{feature}") diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index 2d9cce105d..4419dddac7 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -116,7 +116,7 @@ module.exports = class Router webRouter.post '/user/emails/confirm', UserEmailsController.confirm - unless Features.externalAuthenticationSystemUsed() + if Features.hasFeature 'affiliations' webRouter.post '/user/emails', AuthenticationController.requireLogin(), UserEmailsController.add diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug index 3f4378155a..ef4c055dc7 100644 --- a/services/web/app/views/user/settings/user-affiliations.pug +++ b/services/web/app/views/user/settings/user-affiliations.pug @@ -36,7 +36,7 @@ form.row( a( href ng-click="changeAffiliation(userEmail);" - ) #{translate("change")} + ) #{translate("change")} | ) .affiliation-change-container( ng-if="isChangingAffiliation(userEmail.email)" @@ -51,19 +51,19 @@ form.row( href ng-click="saveAffiliationChange();" ) #{translate("save_or_cancel-save")} - | #{translate("save_or_cancel-or" )} + |  #{translate("save_or_cancel-or" )}  a( href ng-click="cancelAffiliationChange();" ) #{translate("save_or_cancel-cancel")} td - a( + a.affiliations-table-inline-action( href ng-if="!userEmail.default" ng-click="setDefaultUserEmail(userEmail)" ) #{translate("make_default")} br - a( + a.affiliations-table-inline-action( href ng-if="!userEmail.default" ng-click="removeUserEmail(userEmail)" diff --git a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee index 2886cf779d..ae043bbda9 100644 --- a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee +++ b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee @@ -81,7 +81,7 @@ define [ } addRoleAndDepartment = (email, role, department) -> - $http.post "/endorse", { + $http.post "/user/emails/endorse", { email, role, department, diff --git a/services/web/public/stylesheets/app/account-settings.less b/services/web/public/stylesheets/app/account-settings.less index 439cf9c059..a27f9d6b8f 100644 --- a/services/web/public/stylesheets/app/account-settings.less +++ b/services/web/public/stylesheets/app/account-settings.less @@ -26,6 +26,9 @@ .affiliations-table-inline-actions { width: 20%; } + .affiliations-table-inline-action { + text-transform: capitalize; + } .affiliations-table-highlighted-row { background-color: tint(@content-alt-bg-color, 6%); } From 59008b4a5161ada8f2f2fecca5cd9a830abda343 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Fri, 6 Jul 2018 13:45:34 +0100 Subject: [PATCH 10/16] Show university custom departments when changing affiliations; fix Features typo. --- services/web/app/coffee/infrastructure/Features.coffee | 2 +- .../controllers/UserAffiliationsController.coffee | 6 ++++++ .../factories/UserAffiliationsDataService.coffee | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/services/web/app/coffee/infrastructure/Features.coffee b/services/web/app/coffee/infrastructure/Features.coffee index bf7d37d773..311d8943c9 100644 --- a/services/web/app/coffee/infrastructure/Features.coffee +++ b/services/web/app/coffee/infrastructure/Features.coffee @@ -21,6 +21,6 @@ module.exports = Features = when 'templates' return !Settings.overleaf? when 'affiliations' - return settings?.apis?.v1?.url? + return Settings?.apis?.v1?.url? else throw new Error("unknown feature: #{feature}") diff --git a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee index 8b7a5c926f..dd23f72c0a 100644 --- a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee +++ b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee @@ -47,6 +47,10 @@ define [ $scope.ui.showManualUniversitySelectionUI = true $scope.changeAffiliation = (userEmail) -> + if userEmail.affiliation?.institution?.id? + UserAffiliationsDataService.getUniversityDetails userEmail.affiliation.institution.id + .then (universityDetails) -> $scope.affiliationToChange.university = universityDetails + $scope.affiliationToChange.email = userEmail.email $scope.affiliationToChange.role = userEmail.affiliation.role $scope.affiliationToChange.department = userEmail.affiliation.department @@ -64,6 +68,7 @@ define [ $scope.cancelAffiliationChange = (email) -> $scope.affiliationToChange.email = "" + $scope.affiliationToChange.university = null $scope.affiliationToChange.role = null $scope.affiliationToChange.department = null @@ -142,6 +147,7 @@ define [ isBlacklistedEmail: false $scope.affiliationToChange = email: "" + university: null role: null department: null _reset() diff --git a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee index ae043bbda9..38e5c4e96c 100644 --- a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee +++ b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee @@ -53,6 +53,10 @@ define [ else $q.reject null + getUniversityDetails = (universityId) -> + $http.get "/institutions/list/#{ universityId }" + .then (response) -> response.data + addUserEmail = (email) -> $http.post "/user/emails", { email, @@ -110,6 +114,7 @@ define [ getUserEmails getUniversitiesFromCountry getUniversityDomainFromPartialDomainInput + getUniversityDetails addUserEmail addUserAffiliationWithUnknownUniversity addUserAffiliation From 67e2f6f9428aca78c9b46b8009b6408e6103b624 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Fri, 6 Jul 2018 14:04:38 +0100 Subject: [PATCH 11/16] Better handling of affiliation change submission. --- .../controllers/UserAffiliationsController.coffee | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee index dd23f72c0a..03032c8734 100644 --- a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee +++ b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee @@ -63,8 +63,11 @@ define [ $scope.affiliationToChange.role, $scope.affiliationToChange.department ) - .then () -> _getUserEmails() - .catch () -> $scope.ui.hasError = true + .then () -> + _reset() + _getUserEmails() + .catch () -> + $scope.ui.hasError = true $scope.cancelAffiliationChange = (email) -> $scope.affiliationToChange.email = "" From 33b28db0610e6549b355c0e3987502d818ee5d3c Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 12 Jul 2018 16:39:04 +0100 Subject: [PATCH 12/16] Add backend endpoint for resending confirmation email --- .../Security/OneTimeTokenHandler.coffee | 10 ++ .../User/UserEmailsConfirmationHandler.coffee | 11 ++ .../Features/User/UserEmailsController.coffee | 13 ++ services/web/app/coffee/router.coffee | 3 + .../acceptance/coffee/UserEmailsTests.coffee | 126 ++++++++++++++++-- 5 files changed, 154 insertions(+), 9 deletions(-) diff --git a/services/web/app/coffee/Features/Security/OneTimeTokenHandler.coffee b/services/web/app/coffee/Features/Security/OneTimeTokenHandler.coffee index 69c9f5b0e9..dfae55e7cf 100644 --- a/services/web/app/coffee/Features/Security/OneTimeTokenHandler.coffee +++ b/services/web/app/coffee/Features/Security/OneTimeTokenHandler.coffee @@ -27,6 +27,16 @@ module.exports = return callback(error) if error? callback null, token + findValidTokenFromData: (use, data, callback = (error, token) ->) -> + db.tokens.findOne { + use: use, + data: data, + expiresAt: { $gt: new Date() }, + usedAt: { $exists: false } + }, (error, token) -> + return callback(error) if error? + return callback null, token?.token + getValueFromTokenAndExpire: (use, token, callback = (error, data) ->)-> logger.log token_start: token.slice(0,8), "getting data from #{use} token" now = new Date() diff --git a/services/web/app/coffee/Features/User/UserEmailsConfirmationHandler.coffee b/services/web/app/coffee/Features/User/UserEmailsConfirmationHandler.coffee index dd87570450..53ae1fca2b 100644 --- a/services/web/app/coffee/Features/User/UserEmailsConfirmationHandler.coffee +++ b/services/web/app/coffee/Features/User/UserEmailsConfirmationHandler.coffee @@ -23,6 +23,17 @@ module.exports = UserEmailsConfirmationHandler = confirmEmailUrl: "#{settings.siteUrl}/user/emails/confirm?token=#{token}" EmailHandler.sendEmail emailTemplate, emailOptions, callback + resendConfirmationEmail: (user_id, email, callback = (error) ->) -> + OneTimeTokenHandler.findValidTokenFromData 'email_confirmation', { user_id, email }, (error, token) -> + return callback(error) if error? + if !token? + UserEmailsConfirmationHandler.sendConfirmationEmail user_id, email, callback + else + emailOptions = + to: email + confirmEmailUrl: "#{settings.siteUrl}/user/emails/confirm?token=#{token}" + EmailHandler.sendEmail 'confirmEmail', emailOptions, callback + confirmEmailFromToken: (token, callback = (error) ->) -> logger.log {token_start: token.slice(0,8)}, 'confirming email from token' OneTimeTokenHandler.getValueFromTokenAndExpire 'email_confirmation', token, (error, data) -> diff --git a/services/web/app/coffee/Features/User/UserEmailsController.coffee b/services/web/app/coffee/Features/User/UserEmailsController.coffee index af1a355d6e..5c2fa5f587 100644 --- a/services/web/app/coffee/Features/User/UserEmailsController.coffee +++ b/services/web/app/coffee/Features/User/UserEmailsController.coffee @@ -61,6 +61,19 @@ module.exports = UserEmailsController = return next(error) if error? res.sendStatus 204 + resendConfirmation: (req, res, next) -> + userId = AuthenticationController.getLoggedInUserId(req) + email = EmailHelper.parseEmail(req.body.email) + return res.sendStatus 422 unless email? + UserGetter.getUserByAnyEmail email, {_id:1}, (error, user) -> + return next(error) if error? + if !user? or user?._id?.toString() != userId + logger.log {userId, email, foundUserId: user?._id}, "email doesn't match logged in user" + return res.sendStatus 422 + logger.log {userId, email}, 'resending email confirmation token' + UserEmailsConfirmationHandler.resendConfirmationEmail userId, email, (error) -> + return next(error) if error? + res.sendStatus 200 showConfirm: (req, res, next) -> res.render 'user/confirm_email', { diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index 4419dddac7..72a0ddebc4 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -115,6 +115,9 @@ module.exports = class Router UserEmailsController.showConfirm webRouter.post '/user/emails/confirm', UserEmailsController.confirm + webRouter.post '/user/emails/resend_confirmation', + AuthenticationController.requireLogin(), + UserEmailsController.resendConfirmation if Features.hasFeature 'affiliations' webRouter.post '/user/emails', diff --git a/services/web/test/acceptance/coffee/UserEmailsTests.coffee b/services/web/test/acceptance/coffee/UserEmailsTests.coffee index 256c8a690f..40d0ca2244 100644 --- a/services/web/test/acceptance/coffee/UserEmailsTests.coffee +++ b/services/web/test/acceptance/coffee/UserEmailsTests.coffee @@ -17,7 +17,7 @@ describe "UserEmails", -> token = null async.series [ (cb) => - @user.request { + @user.request { method: 'POST', url: '/user/emails', json: @@ -45,7 +45,7 @@ describe "UserEmails", -> token = tokens[0].token cb() (cb) => - @user.request { + @user.request { method: 'POST', url: '/user/emails/confirm', json: @@ -80,7 +80,7 @@ describe "UserEmails", -> (cb) => @user2.login cb (cb) => # Create email for first user - @user.request { + @user.request { method: 'POST', url: '/user/emails', json: {@email} @@ -99,21 +99,21 @@ describe "UserEmails", -> cb() (cb) => # Delete the email from the first user - @user.request { + @user.request { method: 'POST', url: '/user/emails/delete', json: {@email} }, cb (cb) => # Create email for second user - @user2.request { + @user2.request { method: 'POST', url: '/user/emails', json: {@email} }, cb (cb) => # Original confirmation token should no longer work - @user.request { + @user.request { method: 'POST', url: '/user/emails/confirm', json: @@ -158,7 +158,7 @@ describe "UserEmails", -> token = null async.series [ (cb) => - @user.request { + @user.request { method: 'POST', url: '/user/emails', json: @@ -183,12 +183,12 @@ describe "UserEmails", -> db.tokens.update { token: token }, { - $set: { + $set: { expiresAt: new Date(Date.now() - 1000000) } }, cb (cb) => - @user.request { + @user.request { method: 'POST', url: '/user/emails/confirm', json: @@ -198,3 +198,111 @@ describe "UserEmails", -> expect(response.statusCode).to.equal 404 cb() ], done + + describe 'resending the confirmation', -> + it 'should resend the existing token', (done) -> + token = null + async.series [ + (cb) => + @user.request { + method: 'POST', + url: '/user/emails', + json: + email: 'reconfirmation-email@example.com' + }, (error, response, body) => + return done(error) if error? + expect(response.statusCode).to.equal 204 + cb() + (cb) => + db.tokens.find { + use: 'email_confirmation', + 'data.user_id': @user._id, + usedAt: { $exists: false } + }, (error, tokens) => + # There should only be one confirmation token at the moment + expect(tokens.length).to.equal 1 + expect(tokens[0].data.email).to.equal 'reconfirmation-email@example.com' + expect(tokens[0].data.user_id).to.equal @user._id + token = tokens[0].token + cb() + (cb) => + @user.request { + method: 'POST', + url: '/user/emails/resend_confirmation', + json: + email: 'reconfirmation-email@example.com' + }, (error, response, body) => + return done(error) if error? + expect(response.statusCode).to.equal 200 + cb() + (cb) => + db.tokens.find { + use: 'email_confirmation', + 'data.user_id': @user._id, + usedAt: { $exists: false } + }, (error, tokens) => + # There should still only be one confirmation token + expect(tokens.length).to.equal 1 + expect(tokens[0].data.email).to.equal 'reconfirmation-email@example.com' + expect(tokens[0].data.user_id).to.equal @user._id + token = tokens[0].token + cb() + ], done + + it 'should create a new token if none exists', (done) -> + # This should only be for users that have sign up with their main + # emails before the confirmation system existed + token = null + async.series [ + (cb) => + db.tokens.remove { + use: 'email_confirmation', + 'data.user_id': @user._id, + usedAt: { $exists: false } + }, cb + (cb) => + @user.request { + method: 'POST', + url: '/user/emails/resend_confirmation', + json: + email: @user.email + }, (error, response, body) => + return done(error) if error? + expect(response.statusCode).to.equal 200 + cb() + (cb) => + db.tokens.find { + use: 'email_confirmation', + 'data.user_id': @user._id, + usedAt: { $exists: false } + }, (error, tokens) => + # There should still only be one confirmation token + expect(tokens.length).to.equal 1 + expect(tokens[0].data.email).to.equal @user.email + expect(tokens[0].data.user_id).to.equal @user._id + token = tokens[0].token + cb() + ], done + + it "should not allow reconfirmation if the email doesn't match the user", (done) -> + token = null + async.series [ + (cb) => + @user.request { + method: 'POST', + url: '/user/emails/resend_confirmation', + json: + email: 'non-matching-email@example.com' + }, (error, response, body) => + return done(error) if error? + expect(response.statusCode).to.equal 422 + cb() + (cb) => + db.tokens.find { + use: 'email_confirmation', + 'data.user_id': @user._id, + usedAt: { $exists: false } + }, (error, tokens) => + expect(tokens.length).to.equal 0 + cb() + ], done From d7e0b8c369fe8db986cd210495559ef781460ef9 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 12 Jul 2018 17:13:26 +0100 Subject: [PATCH 13/16] Show unconfirmed email status in UI and add link to resend confirmation --- .../views/user/settings/user-affiliations.pug | 76 ++++++++++++------- .../UserAffiliationsController.coffee | 7 ++ .../UserAffiliationsDataService.coffee | 7 ++ .../stylesheets/app/account-settings.less | 2 +- 4 files changed, 64 insertions(+), 28 deletions(-) diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug index ef4c055dc7..2bbe3be8c4 100644 --- a/services/web/app/views/user/settings/user-affiliations.pug +++ b/services/web/app/views/user/settings/user-affiliations.pug @@ -17,27 +17,37 @@ form.row( tr( ng-repeat="userEmail in userEmails" ) - td {{ userEmail.email + (userEmail.default ? ' (default)' : '') }} + td + | {{ userEmail.email + (userEmail.default ? ' (default)' : '') }} + div(ng-show="!userEmail.confirmedAt").small + strong #{translate('unconfirmed')}. + | + | #{translate('please_check_your_inbox')}. + br + a( + href, + ng-click="resendConfirmationEmail(userEmail)" + ) #{translate('resend_confirmation_email')} td div(ng-if="userEmail.affiliation.institution") div {{ userEmail.affiliation.institution.name }} - a( - href - ng-if="!isChangingAffiliation(userEmail.email) && !userEmail.affiliation.role && !userEmail.affiliation.department" - ng-click="changeAffiliation(userEmail);" - ) #{translate("add_role_and_department")} - div( + span.small + a( + href + ng-if="!isChangingAffiliation(userEmail.email) && !userEmail.affiliation.role && !userEmail.affiliation.department" + ng-click="changeAffiliation(userEmail);" + ) #{translate("add_role_and_department")} + div.small( ng-if="!isChangingAffiliation(userEmail.email) && (userEmail.affiliation.role || userEmail.affiliation.department)" ) span(ng-if="userEmail.affiliation.role") {{ userEmail.affiliation.role }} span(ng-if="userEmail.affiliation.role && userEmail.affiliation.department") , span(ng-if="userEmail.affiliation.department") {{ userEmail.affiliation.department }} - | ( + br a( href ng-click="changeAffiliation(userEmail);" ) #{translate("change")} - | ) .affiliation-change-container( ng-if="isChangingAffiliation(userEmail.email)" ) @@ -46,7 +56,7 @@ form.row( show-university-and-country="false" show-role-and-department="true" ) - .affiliation-change-actions + .affiliation-change-actions.small a( href ng-click="saveAffiliationChange();" @@ -56,18 +66,28 @@ form.row( href ng-click="cancelAffiliationChange();" ) #{translate("save_or_cancel-cancel")} - td - a.affiliations-table-inline-action( - href - ng-if="!userEmail.default" + td.affiliations-table-inline-actions + // Disabled buttons don't work with tooltips, due to pointer-events: none, + // so create a wrapper for the tooltip + div( + style="display: inline-block" + tooltip=translate("please_confirm_your_email_before_making_it_default") + ng-if="!userEmail.default && !userEmail.confirmedAt" + ) + button.btn.btn-sm.btn-success.affiliations-table-inline-action( + disabled + ) #{translate("make_default")} + button.btn.btn-sm.btn-success.affiliations-table-inline-action( + ng-if="!userEmail.default && userEmail.confirmedAt" ng-click="setDefaultUserEmail(userEmail)" - ) #{translate("make_default")} - br - a.affiliations-table-inline-action( - href + ) #{translate("make_default")} + |   + button.btn.btn-sm.btn-danger.affiliations-table-inline-action( ng-if="!userEmail.default" ng-click="removeUserEmail(userEmail)" - ) #{translate("remove")} + tooltip=translate("remove") + ) + i.fa.fa-fw.fa-trash tr.affiliations-table-highlighted-row( ng-if="ui.isLoadingEmails" ) @@ -100,15 +120,17 @@ form.row( input-required="true" ) td - .affiliations-table-label( + p.affiliations-table-label( ng-if="newAffiliation.university && !ui.showManualUniversitySelectionUI" ) - | {{ newAffiliation.university.name }} ( - a( - href - ng-click="selectUniversityManually();" - ) #{translate("change")} - | ) + | {{ newAffiliation.university.name }} + span.small + | ( + a( + href + ng-click="selectUniversityManually();" + ) #{translate("change")} + | ) .affiliations-table-label( ng-if="!newAffiliation.university && !ui.isValidEmail && !ui.showManualUniversitySelectionUI" ) #{translate("start_by_adding_your_email")} @@ -127,7 +149,7 @@ form.row( show-role-and-department="ui.isValidEmail && newAffiliation.university" ) td - button.btn.btn-primary( + button.btn.btn-sm.btn-primary( ng-disabled="affiliationsForm.$invalid || ui.isAddingNewEmail" ng-click="addNewEmail()" ) diff --git a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee index 03032c8734..66162eda86 100644 --- a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee +++ b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee @@ -128,6 +128,13 @@ define [ .then () -> _getUserEmails() .catch () -> $scope.ui.hasError = true + $scope.resendConfirmationEmail = (userEmail) -> + $scope.ui.isLoadingEmails = true + UserAffiliationsDataService + .resendConfirmationEmail userEmail.email + .then () -> _getUserEmails() + .catch () -> $scope.ui.hasError = true + $scope.acknowledgeError = () -> _reset() _getUserEmails() diff --git a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee index 38e5c4e96c..cbcadf7e67 100644 --- a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee +++ b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee @@ -104,6 +104,12 @@ define [ _csrf: window.csrfToken } + resendConfirmationEmail = (email) -> + $http.post "/user/emails/resend_confirmation", { + email, + _csrf: window.csrfToken + } + isDomainBlacklisted = (domain) -> domain.toLowerCase() of domainsBlackList @@ -121,6 +127,7 @@ define [ addRoleAndDepartment setDefaultUserEmail removeUserEmail + resendConfirmationEmail isDomainBlacklisted } ] \ No newline at end of file diff --git a/services/web/public/stylesheets/app/account-settings.less b/services/web/public/stylesheets/app/account-settings.less index a27f9d6b8f..d1b79b0c06 100644 --- a/services/web/public/stylesheets/app/account-settings.less +++ b/services/web/public/stylesheets/app/account-settings.less @@ -24,7 +24,7 @@ width: 40%; } .affiliations-table-inline-actions { - width: 20%; + text-align: right; } .affiliations-table-inline-action { text-transform: capitalize; From 476f4e55c39b0ee571ac2169bbfc200e8cc04b55 Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 13 Jul 2018 10:42:31 +0100 Subject: [PATCH 14/16] Just generate a new token on resending confirmation email --- .../Features/Security/OneTimeTokenHandler.coffee | 10 ---------- .../User/UserEmailsConfirmationHandler.coffee | 11 ----------- .../Features/User/UserEmailsController.coffee | 2 +- .../test/acceptance/coffee/UserEmailsTests.coffee | 14 +++++--------- 4 files changed, 6 insertions(+), 31 deletions(-) diff --git a/services/web/app/coffee/Features/Security/OneTimeTokenHandler.coffee b/services/web/app/coffee/Features/Security/OneTimeTokenHandler.coffee index dfae55e7cf..69c9f5b0e9 100644 --- a/services/web/app/coffee/Features/Security/OneTimeTokenHandler.coffee +++ b/services/web/app/coffee/Features/Security/OneTimeTokenHandler.coffee @@ -27,16 +27,6 @@ module.exports = return callback(error) if error? callback null, token - findValidTokenFromData: (use, data, callback = (error, token) ->) -> - db.tokens.findOne { - use: use, - data: data, - expiresAt: { $gt: new Date() }, - usedAt: { $exists: false } - }, (error, token) -> - return callback(error) if error? - return callback null, token?.token - getValueFromTokenAndExpire: (use, token, callback = (error, data) ->)-> logger.log token_start: token.slice(0,8), "getting data from #{use} token" now = new Date() diff --git a/services/web/app/coffee/Features/User/UserEmailsConfirmationHandler.coffee b/services/web/app/coffee/Features/User/UserEmailsConfirmationHandler.coffee index 53ae1fca2b..dd87570450 100644 --- a/services/web/app/coffee/Features/User/UserEmailsConfirmationHandler.coffee +++ b/services/web/app/coffee/Features/User/UserEmailsConfirmationHandler.coffee @@ -23,17 +23,6 @@ module.exports = UserEmailsConfirmationHandler = confirmEmailUrl: "#{settings.siteUrl}/user/emails/confirm?token=#{token}" EmailHandler.sendEmail emailTemplate, emailOptions, callback - resendConfirmationEmail: (user_id, email, callback = (error) ->) -> - OneTimeTokenHandler.findValidTokenFromData 'email_confirmation', { user_id, email }, (error, token) -> - return callback(error) if error? - if !token? - UserEmailsConfirmationHandler.sendConfirmationEmail user_id, email, callback - else - emailOptions = - to: email - confirmEmailUrl: "#{settings.siteUrl}/user/emails/confirm?token=#{token}" - EmailHandler.sendEmail 'confirmEmail', emailOptions, callback - confirmEmailFromToken: (token, callback = (error) ->) -> logger.log {token_start: token.slice(0,8)}, 'confirming email from token' OneTimeTokenHandler.getValueFromTokenAndExpire 'email_confirmation', token, (error, data) -> diff --git a/services/web/app/coffee/Features/User/UserEmailsController.coffee b/services/web/app/coffee/Features/User/UserEmailsController.coffee index 5c2fa5f587..1afb60b99b 100644 --- a/services/web/app/coffee/Features/User/UserEmailsController.coffee +++ b/services/web/app/coffee/Features/User/UserEmailsController.coffee @@ -71,7 +71,7 @@ module.exports = UserEmailsController = logger.log {userId, email, foundUserId: user?._id}, "email doesn't match logged in user" return res.sendStatus 422 logger.log {userId, email}, 'resending email confirmation token' - UserEmailsConfirmationHandler.resendConfirmationEmail userId, email, (error) -> + UserEmailsConfirmationHandler.sendConfirmationEmail userId, email, (error) -> return next(error) if error? res.sendStatus 200 diff --git a/services/web/test/acceptance/coffee/UserEmailsTests.coffee b/services/web/test/acceptance/coffee/UserEmailsTests.coffee index 40d0ca2244..71837f4633 100644 --- a/services/web/test/acceptance/coffee/UserEmailsTests.coffee +++ b/services/web/test/acceptance/coffee/UserEmailsTests.coffee @@ -200,8 +200,7 @@ describe "UserEmails", -> ], done describe 'resending the confirmation', -> - it 'should resend the existing token', (done) -> - token = null + it 'should generate a new token', (done) -> async.series [ (cb) => @user.request { @@ -223,7 +222,6 @@ describe "UserEmails", -> expect(tokens.length).to.equal 1 expect(tokens[0].data.email).to.equal 'reconfirmation-email@example.com' expect(tokens[0].data.user_id).to.equal @user._id - token = tokens[0].token cb() (cb) => @user.request { @@ -241,18 +239,18 @@ describe "UserEmails", -> 'data.user_id': @user._id, usedAt: { $exists: false } }, (error, tokens) => - # There should still only be one confirmation token - expect(tokens.length).to.equal 1 + # There should be two tokens now + expect(tokens.length).to.equal 2 expect(tokens[0].data.email).to.equal 'reconfirmation-email@example.com' expect(tokens[0].data.user_id).to.equal @user._id - token = tokens[0].token + expect(tokens[1].data.email).to.equal 'reconfirmation-email@example.com' + expect(tokens[1].data.user_id).to.equal @user._id cb() ], done it 'should create a new token if none exists', (done) -> # This should only be for users that have sign up with their main # emails before the confirmation system existed - token = null async.series [ (cb) => db.tokens.remove { @@ -280,12 +278,10 @@ describe "UserEmails", -> expect(tokens.length).to.equal 1 expect(tokens[0].data.email).to.equal @user.email expect(tokens[0].data.user_id).to.equal @user._id - token = tokens[0].token cb() ], done it "should not allow reconfirmation if the email doesn't match the user", (done) -> - token = null async.series [ (cb) => @user.request { From 452d698a47c8ada3ed5dd770790239572885f376 Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 13 Jul 2018 11:17:05 +0100 Subject: [PATCH 15/16] ng-show -> ng-if --- services/web/app/views/user/settings/user-affiliations.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug index 2bbe3be8c4..5f57cf1048 100644 --- a/services/web/app/views/user/settings/user-affiliations.pug +++ b/services/web/app/views/user/settings/user-affiliations.pug @@ -19,7 +19,7 @@ form.row( ) td | {{ userEmail.email + (userEmail.default ? ' (default)' : '') }} - div(ng-show="!userEmail.confirmedAt").small + div(ng-if="!userEmail.confirmedAt").small strong #{translate('unconfirmed')}. | | #{translate('please_check_your_inbox')}. From a238c74440aafa73d175f61bcb58ea77b791cc70 Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 13 Jul 2018 11:19:49 +0100 Subject: [PATCH 16/16] Remove inline style --- services/web/app/views/user/settings/user-affiliations.pug | 3 +-- services/web/public/stylesheets/app/account-settings.less | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug index 5f57cf1048..7333a67a08 100644 --- a/services/web/app/views/user/settings/user-affiliations.pug +++ b/services/web/app/views/user/settings/user-affiliations.pug @@ -69,8 +69,7 @@ form.row( td.affiliations-table-inline-actions // Disabled buttons don't work with tooltips, due to pointer-events: none, // so create a wrapper for the tooltip - div( - style="display: inline-block" + div.affiliations-table-inline-action-disabled-wrapper( tooltip=translate("please_confirm_your_email_before_making_it_default") ng-if="!userEmail.default && !userEmail.confirmedAt" ) diff --git a/services/web/public/stylesheets/app/account-settings.less b/services/web/public/stylesheets/app/account-settings.less index d1b79b0c06..3b6d321925 100644 --- a/services/web/public/stylesheets/app/account-settings.less +++ b/services/web/public/stylesheets/app/account-settings.less @@ -29,6 +29,9 @@ .affiliations-table-inline-action { text-transform: capitalize; } + .affiliations-table-inline-action-disabled-wrapper { + display: inline-block; + } .affiliations-table-highlighted-row { background-color: tint(@content-alt-bg-color, 6%); }