From 6169ba55e574aa826006902e55807e0146c077a9 Mon Sep 17 00:00:00 2001 From: Mathias Jakobsen Date: Tue, 30 Aug 2022 08:36:56 +0100 Subject: [PATCH] Merge pull request #9389 from overleaf/mj-angular-settings-cleanup [web] Angular settings removal GitOrigin-RevId: a7efdf31d488aa782e0ad400f05169645e1731d0 --- .../src/Features/User/UserPagesController.js | 115 +++---- .../web/app/views/user/settings-react.pug | 28 -- services/web/app/views/user/settings.pug | 310 ++---------------- .../unit/src/User/UserPagesControllerTests.js | 23 +- 4 files changed, 66 insertions(+), 410 deletions(-) delete mode 100644 services/web/app/views/user/settings-react.pug diff --git a/services/web/app/src/Features/User/UserPagesController.js b/services/web/app/src/Features/User/UserPagesController.js index be17d1c65f..39fe4e494f 100644 --- a/services/web/app/src/Features/User/UserPagesController.js +++ b/services/web/app/src/Features/User/UserPagesController.js @@ -8,7 +8,6 @@ const SessionManager = require('../Authentication/SessionManager') const NewsletterManager = require('../Newsletter/NewsletterManager') const _ = require('lodash') const { expressify } = require('../../util/promises') -const SplitTestHandler = require('../SplitTests/SplitTestHandler') async function settingsPage(req, res) { const userId = SessionManager.getLoggedInUserId(req.session) @@ -63,80 +62,48 @@ async function settingsPage(req, res) { // The user has just deleted their account. return res.redirect('/logout') } - const assignment = await SplitTestHandler.promises.getAssignment( - req, - res, - 'settings-page' - ) - if (assignment.variant === 'react') { - res.render('user/settings-react', { - title: 'account_settings', - user: { - id: user._id, - isAdmin: user.isAdmin, - email: user.email, - allowedFreeTrial: user.allowedFreeTrial, - first_name: user.first_name, - last_name: user.last_name, - alphaProgram: user.alphaProgram, - betaProgram: user.betaProgram, - features: { - dropbox: user.features.dropbox, - github: user.features.github, - mendeley: user.features.mendeley, - zotero: user.features.zotero, - references: user.features.references, - }, - refProviders: { - mendeley: user.refProviders?.mendeley, - zotero: user.refProviders?.zotero, - }, + res.render('user/settings', { + title: 'account_settings', + user: { + id: user._id, + isAdmin: user.isAdmin, + email: user.email, + allowedFreeTrial: user.allowedFreeTrial, + first_name: user.first_name, + last_name: user.last_name, + alphaProgram: user.alphaProgram, + betaProgram: user.betaProgram, + features: { + dropbox: user.features.dropbox, + github: user.features.github, + mendeley: user.features.mendeley, + zotero: user.features.zotero, + references: user.features.references, }, - hasPassword: !!user.hashedPassword, - shouldAllowEditingDetails, - oauthProviders: UserPagesController._translateProviderDescriptions( - oauthProviders, - req - ), - institutionLinked, - samlError, - institutionEmailNonCanonical: - institutionEmailNonCanonical && institutionRequestedEmail - ? institutionEmailNonCanonical - : undefined, - reconfirmedViaSAML, - reconfirmationRemoveEmail, - samlBeta: req.session.samlBeta, - ssoErrorMessage, - thirdPartyIds: UserPagesController._restructureThirdPartyIds(user), - projectSyncSuccessMessage, - }) - } else { - res.render('user/settings', { - title: 'account_settings', - user, - hasPassword: !!user.hashedPassword, - shouldAllowEditingDetails, - languages: Settings.languages, - accountSettingsTabActive: true, - oauthProviders: UserPagesController._translateProviderDescriptions( - oauthProviders, - req - ), - oauthUseV2: Settings.oauthUseV2 || false, - institutionLinked, - samlError, - institutionEmailNonCanonical: - institutionEmailNonCanonical && institutionRequestedEmail - ? institutionEmailNonCanonical - : undefined, - reconfirmedViaSAML, - reconfirmationRemoveEmail, - samlBeta: req.session.samlBeta, - ssoError, - thirdPartyIds: UserPagesController._restructureThirdPartyIds(user), - }) - } + refProviders: { + mendeley: user.refProviders?.mendeley, + zotero: user.refProviders?.zotero, + }, + }, + hasPassword: !!user.hashedPassword, + shouldAllowEditingDetails, + oauthProviders: UserPagesController._translateProviderDescriptions( + oauthProviders, + req + ), + institutionLinked, + samlError, + institutionEmailNonCanonical: + institutionEmailNonCanonical && institutionRequestedEmail + ? institutionEmailNonCanonical + : undefined, + reconfirmedViaSAML, + reconfirmationRemoveEmail, + samlBeta: req.session.samlBeta, + ssoErrorMessage, + thirdPartyIds: UserPagesController._restructureThirdPartyIds(user), + projectSyncSuccessMessage, + }) } const UserPagesController = { diff --git a/services/web/app/views/user/settings-react.pug b/services/web/app/views/user/settings-react.pug deleted file mode 100644 index dd5617b100..0000000000 --- a/services/web/app/views/user/settings-react.pug +++ /dev/null @@ -1,28 +0,0 @@ -extends ../layout-marketing - -block entrypointVar - - entrypoint = 'pages/user/settings' - -block append meta - meta(name="ol-hasPassword" data-type="boolean" content=hasPassword) - meta(name="ol-shouldAllowEditingDetails" data-type="boolean" content=shouldAllowEditingDetails) - meta(name="ol-oauthProviders", data-type="json", content=oauthProviders) - meta(name="ol-institutionLinked", data-type="json", content=institutionLinked) - meta(name="ol-samlError", data-type="json", content=samlError) - meta(name="ol-institutionEmailNonCanonical", content=institutionEmailNonCanonical) - - meta(name="ol-reconfirmedViaSAML", content=reconfirmedViaSAML) - meta(name="ol-reconfirmationRemoveEmail", content=reconfirmationRemoveEmail) - meta(name="ol-samlBeta", content=samlBeta) - meta(name="ol-ssoErrorMessage", content=ssoErrorMessage) - meta(name="ol-thirdPartyIds", data-type="json", content=thirdPartyIds || {}) - meta(name="ol-passwordStrengthOptions", data-type="json", content=settings.passwordStrengthOptions || {}) - meta(name="ol-isExternalAuthenticationSystemUsed" data-type="boolean" content=externalAuthenticationSystemUsed()) - meta(name="ol-user" data-type="json" content=user) - meta(name="ol-dropbox" data-type="json" content=dropbox) - meta(name="ol-github" data-type="json" content=github) - meta(name="ol-projectSyncSuccessMessage", content=projectSyncSuccessMessage) - - -block content - main.content.content-alt#settings-page-root diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug index ada45d908d..dd5617b100 100644 --- a/services/web/app/views/user/settings.pug +++ b/services/web/app/views/user/settings.pug @@ -1,292 +1,28 @@ -extends ../layout +extends ../layout-marketing + +block entrypointVar + - entrypoint = 'pages/user/settings' block append meta - meta(name="ol-reconfirmationRemoveEmail", content=reconfirmationRemoveEmail) - meta(name="ol-reconfirmedViaSAML", content=reconfirmedViaSAML) - meta(name="ol-passwordStrengthOptions", data-type="json", content=settings.passwordStrengthOptions || {}) + meta(name="ol-hasPassword" data-type="boolean" content=hasPassword) + meta(name="ol-shouldAllowEditingDetails" data-type="boolean" content=shouldAllowEditingDetails) meta(name="ol-oauthProviders", data-type="json", content=oauthProviders) - meta(name="ol-thirdPartyIds", data-type="json", content=thirdPartyIds) + meta(name="ol-institutionLinked", data-type="json", content=institutionLinked) + meta(name="ol-samlError", data-type="json", content=samlError) + meta(name="ol-institutionEmailNonCanonical", content=institutionEmailNonCanonical) + + meta(name="ol-reconfirmedViaSAML", content=reconfirmedViaSAML) + meta(name="ol-reconfirmationRemoveEmail", content=reconfirmationRemoveEmail) + meta(name="ol-samlBeta", content=samlBeta) + meta(name="ol-ssoErrorMessage", content=ssoErrorMessage) + meta(name="ol-thirdPartyIds", data-type="json", content=thirdPartyIds || {}) + meta(name="ol-passwordStrengthOptions", data-type="json", content=settings.passwordStrengthOptions || {}) + meta(name="ol-isExternalAuthenticationSystemUsed" data-type="boolean" content=externalAuthenticationSystemUsed()) + meta(name="ol-user" data-type="json" content=user) + meta(name="ol-dropbox" data-type="json" content=dropbox) + meta(name="ol-github" data-type="json" content=github) + meta(name="ol-projectSyncSuccessMessage", content=projectSyncSuccessMessage) + block content - main.content.content-alt#main-content( - event-tracking-mb="true" - event-tracking="settings-view" - event-tracking-trigger="load" - ) - .container - .row - .col-md-12.col-lg-10.col-lg-offset-1 - if ssoError - .alert.alert-danger - | #{translate('sso_link_error')}: #{translate(ssoError)} - .card - .page-header - h1 #{translate("account_settings")} - .account-settings(ng-controller="AccountSettingsController", ng-cloak) - - if hasFeature('affiliations') - include settings/user-affiliations - - .row - .col-md-5 - 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 !hasFeature('affiliations') - if !externalAuthenticationSystemUsed() - .form-group - label(for='email') #{translate("email")} - input.form-control( - id="email" - type='email', - name='email', - placeholder="email@example.com" - required, - ng-model="email", - ng-model-options="{ updateOn: 'blur' }" - ) - span.small.text-danger(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", - ng-non-bindable - ) #{user.email} - - if shouldAllowEditingDetails - .form-group - label(for='firstName').control-label #{translate("first_name")} - input.form-control( - id="firstName" - type='text', - name='first_name', - value=user.first_name - ng-non-bindable - ) - .form-group - label(for='lastName').control-label #{translate("last_name")} - input.form-control( - id="lastName" - type='text', - name='last_name', - value=user.last_name - ng-non-bindable - ) - .form-group - form-messages(aria-live="polite" for="settingsForm") - .alert.alert-success(ng-show="settingsForm.response.success") - | #{translate("thanks_settings_updated")} - .actions - button.btn.btn-primary( - type='submit', - ng-disabled="settingsForm.$invalid" - ) #{translate("update")} - else - .form-group - label.control-label #{translate("first_name")} - div.form-control( - readonly="true", - ng-non-bindable - ) #{user.first_name} - .form-group - label.control-label #{translate("last_name")} - div.form-control( - readonly="true", - ng-non-bindable - ) #{user.last_name} - - .col-md-5.col-md-offset-1 - h3 #{translate("change_password")} - if externalAuthenticationSystemUsed() && !settings.overleaf - p - | Password settings are managed externally - else if !hasPassword - p - | #[a(href="/user/password/reset", target='_blank') #{translate("no_existing_password")}] - else - - var submitAction - - submitAction = '/user/password/update' - form( - async-form="changepassword" - name="changePasswordForm" - action=submitAction - method="POST" - novalidate - ) - input(type="hidden", name="_csrf", value=csrfToken) - .form-group - label(for='currentPassword') #{translate("current_password")} - input.form-control( - id="currentPassword" - type='password', - name='currentPassword', - placeholder='*********', - ng-model="currentPassword", - required - ) - span.small.text-danger(ng-show="changePasswordForm.currentPassword.$invalid && changePasswordForm.currentPassword.$dirty" aria-live="polite") - | #{translate("required")} - .form-group - label(for='passwordField') #{translate("new_password")} - input.form-control( - id='passwordField', - type='password', - name='newPassword1', - placeholder='*********', - ng-model="newPassword1", - required, - complex-password - ) - span.small.text-danger(ng-show="changePasswordForm.newPassword1.$error.complexPassword && changePasswordForm.newPassword1.$dirty", ng-bind-html="complexPasswordErrorMessage" aria-live="polite") - .form-group - label(for='newPassword2') #{translate("confirm_new_password")} - input.form-control( - id="newPassword2" - type='password', - name='newPassword2', - placeholder='*********', - ng-model="newPassword2", - equals="passwordField" - ) - span.small.text-danger(ng-show="changePasswordForm.newPassword2.$error.areEqual && changePasswordForm.newPassword2.$dirty" aria-live="polite") - | #{translate("doesnt_match")} - span.small.text-danger(ng-show="!changePasswordForm.newPassword2.$error.areEqual && changePasswordForm.newPassword2.$invalid && changePasswordForm.newPassword2.$dirty" aria-live="polite") - | #{translate("invalid_password")} - .form-group - form-messages(aria-live="polite" for="changePasswordForm") - .actions - button.btn.btn-primary( - type='submit', - ng-disabled="changePasswordForm.$invalid" - ) #{translate("change")} - - | !{moduleIncludes("userSettings", locals)} - hr - - if hasFeature('saas') - h3 - | #{translate("sharelatex_beta_program")} - - if (user.betaProgram) - p.small - | #{translate("beta_program_already_participating")} - - div - a(id="beta-program-participate-link" href="/beta/participate") #{translate("manage_beta_program_membership")} - - hr - - h3 - | #{translate("sessions")} - - div - a(id="sessions-link", href="/user/sessions") #{translate("manage_sessions")} - - if hasFeature('oauth') - hr - include settings/user-oauth - - if hasFeature('saas') && (!externalAuthenticationSystemUsed() || (settings.createV1AccountOnLogin && settings.overleaf)) - hr - p.small - | #{translate("newsletter_info_and_unsubscribe")} - a( - href, - ng-click="unsubscribe()", - ng-show="subscribed && !unsubscribing" - ) #{translate("unsubscribe")} - span( - ng-show="unsubscribing" - ) - i.fa.fa-spin.fa-refresh(aria-hidden="true") - | #{translate("unsubscribing")} - span.text-success( - ng-show="!subscribed" - ) - i.fa.fa-check(aria-hidden="true") - | #{translate("unsubscribed")} - - if !settings.overleaf && user.overleaf - p - | Please note: If you have linked your account with Overleaf - | v2, then deleting your ShareLaTeX account will also delete - | account and all of it's associated projects and data. - p #{translate("need_to_leave")} - a(href, ng-click="deleteAccount()") #{translate("delete_your_account")} - - - script(type='text/ng-template', id='deleteAccountModalTemplate') - .modal-header - h3 #{translate("delete_account")} - div.modal-body#delete-account-modal - p !{translate("delete_account_warning_message_3", {}, ['strong'])} - if settings.createV1AccountOnLogin && settings.overleaf - p - strong - | Your Overleaf v2 projects will be deleted if you delete your account. - | If you want to remove any remaining Overleaf v1 projects in your account, - | please first make sure they are imported to Overleaf v2. - - if settings.overleaf && !hasPassword - p - b - | #[a(href="/user/password/reset", target='_blank') #{translate("delete_acct_no_existing_pw")}]. - else - form(novalidate, name="deleteAccountForm") - label #{translate('email')} - input.form-control( - type="text", - autocomplete="off", - placeholder="", - ng-model="state.deleteText", - focus-on="open", - ng-keyup="checkValidation()" - ) - - label #{translate('password')} - input.form-control( - type="password", - autocomplete="off", - placeholder="", - ng-model="state.password", - ng-keyup="checkValidation()" - ) - - div.confirmation-checkbox-wrapper - input( - type="checkbox" - ng-model="state.confirmSharelatexDelete" - ng-change="checkValidation()" - ).pull-left - label(style="display: inline")  I understand this will delete all projects in my Overleaf account with email address #[em {{ userDefaultEmail }}] - - div(ng-if="state.error") - div.alert.alert-danger(ng-switch="state.error.code") - span(ng-switch-when="InvalidCredentialsError") - | #{translate('email_or_password_wrong_try_again')} - span(ng-switch-when="SubscriptionAdminDeletionError") - | #{translate('subscription_admins_cannot_be_deleted')} - span(ng-switch-when="UserDeletionError") - | #{translate('user_deletion_error')} - span(ng-switch-default) - | #{translate('generic_something_went_wrong')} - if settings.createV1AccountOnLogin && settings.overleaf - div(ng-if="state.error && state.error.code == 'InvalidCredentialsError'") - div.alert.alert-info - | If you can't remember your password, or if you are using Single-Sign-On with another provider - | to sign in (such as Twitter or Google), please - | #[a(href="/user/password/reset", target='_blank') reset your password], - | and try again. - .modal-footer - button.btn.btn-default( - ng-click="cancel()" - ) #{translate("cancel")} - button.btn.btn-danger( - ng-disabled="!state.isValid || state.inflight" - ng-click="delete()" - ) - span(ng-hide="state.inflight") #{translate("delete")} - span(ng-show="state.inflight") #{translate("deleting")}… + main.content.content-alt#settings-page-root diff --git a/services/web/test/unit/src/User/UserPagesControllerTests.js b/services/web/test/unit/src/User/UserPagesControllerTests.js index 41afcbde3e..2c94b3fb4a 100644 --- a/services/web/test/unit/src/User/UserPagesControllerTests.js +++ b/services/web/test/unit/src/User/UserPagesControllerTests.js @@ -67,11 +67,6 @@ describe('UserPagesController', function () { _getRedirectFromSession: sinon.stub(), setRedirectInSession: sinon.stub(), } - this.SplitTestHandler = { - promises: { - getAssignment: sinon.stub().resolves({ variant: 'default' }), - }, - } this.UserPagesController = SandboxedModule.require(modulePath, { requires: { '@overleaf/settings': this.settings, @@ -83,7 +78,6 @@ describe('UserPagesController', function () { this.AuthenticationController, '../Authentication/SessionManager': this.SessionManager, request: (this.request = sinon.stub()), - '../SplitTests/SplitTestHandler': this.SplitTestHandler, }, }) this.req = { @@ -273,20 +267,10 @@ describe('UserPagesController', function () { return this.UserPagesController.settingsPage(this.req, this.res) }) - it('should render user/settings-react', function (done) { - this.SplitTestHandler.promises.getAssignment = sinon - .stub() - .resolves({ variant: 'react' }) - this.res.render = function (page) { - page.should.equal('user/settings-react') - return done() - } - return this.UserPagesController.settingsPage(this.req, this.res) - }) - it('should send user', function (done) { this.res.render = (page, opts) => { - opts.user.should.equal(this.user) + opts.user.id.should.equal(this.user._id) + opts.user.email.should.equal(this.user.email) return done() } return this.UserPagesController.settingsPage(this.req, this.res) @@ -312,9 +296,6 @@ describe('UserPagesController', function () { }) it("should set and clear 'projectSyncSuccessMessage'", function (done) { - this.SplitTestHandler.promises.getAssignment = sinon - .stub() - .resolves({ variant: 'react' }) this.req.session.projectSyncSuccessMessage = 'Some Sync Success' this.res.render = (page, opts) => { opts.projectSyncSuccessMessage.should.equal('Some Sync Success')