diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsEmailHandler.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsEmailHandler.coffee index f669d85de4..bc7eb90c3f 100644 --- a/services/web/app/coffee/Features/Collaborators/CollaboratorsEmailHandler.coffee +++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsEmailHandler.coffee @@ -11,27 +11,6 @@ module.exports = CollaboratorsEmailHandler = "user_first_name=#{encodeURIComponent(project.owner_ref.first_name)}" ].join("&") - notifyUserOfProjectShare: (project_id, email, callback)-> - Project - .findOne(_id: project_id ) - .select("name owner_ref") - .populate('owner_ref') - .exec (err, project)-> - emailOptions = - to: email - replyTo: project.owner_ref.email - project: - name: project.name - url: "#{Settings.siteUrl}/project/#{project._id}?" + [ - "project_name=#{encodeURIComponent(project.name)}" - "user_first_name=#{encodeURIComponent(project.owner_ref.first_name)}" - "new_email=#{encodeURIComponent(email)}" - "r=#{project.owner_ref.referal_id}" # Referal - "rs=ci" # referral source = collaborator invite - ].join("&") - owner: project.owner_ref - EmailHandler.sendEmail "projectSharedWithYou", emailOptions, callback - notifyUserOfProjectInvite: (project_id, email, invite, callback)-> Project .findOne(_id: project_id ) diff --git a/services/web/app/coffee/Features/Email/EmailBuilder.coffee b/services/web/app/coffee/Features/Email/EmailBuilder.coffee index 6a0cd6aab4..70d11e219b 100644 --- a/services/web/app/coffee/Features/Email/EmailBuilder.coffee +++ b/services/web/app/coffee/Features/Email/EmailBuilder.coffee @@ -105,37 +105,6 @@ If you didn't request a password reset, let us know. """ -templates.projectSharedWithYou = - subject: _.template "<%= owner.email %> wants to share <%= project.name %> with you" - layout: NotificationEmailLayout - type:"notification" - plainTextTemplate: _.template """ -Hi, <%= owner.email %> wants to share '<%= project.name %>' (<%= project.url %>) with you. - -Click this link to view the project: <%= project.url %> - -Thank you - -#{settings.appName} - <%= siteUrl %> -""" - compiledTemplate: _.template """ -
Hi, <%= owner.email %> wants to share '<%= project.name %>' with you
-Thank you
- -""" - - templates.projectInvite = subject: _.template "<%= project.name %> - shared by <%= owner.email %>" layout: NotificationEmailLayout diff --git a/services/web/test/UnitTests/coffee/Email/EmailBuilderTests.coffee b/services/web/test/UnitTests/coffee/Email/EmailBuilderTests.coffee index 18a3096f12..4ee0e0ed05 100644 --- a/services/web/test/UnitTests/coffee/Email/EmailBuilderTests.coffee +++ b/services/web/test/UnitTests/coffee/Email/EmailBuilderTests.coffee @@ -18,30 +18,6 @@ describe "EmailBuilder", -> "settings-sharelatex":@settings "logger-sharelatex": log:-> - describe "projectSharedWithYou", -> - beforeEach -> - @opts = - to:"bob@bob.com" - first_name:"bob" - owner: - email:"sally@hally.com" - project: - url:"http://www.project.com" - name:"standard project" - @email = @EmailBuilder.buildEmail("projectSharedWithYou", @opts) - - it "should insert the owner email into the template", -> - @email.html.indexOf(@opts.owner.email).should.not.equal -1 - @email.subject.indexOf(@opts.owner.email).should.not.equal -1 - - it 'should have html and text properties', -> - expect(@email.html?).to.equal true - expect(@email.text?).to.equal true - - it "should not have undefined in it", -> - @email.html.indexOf("undefined").should.equal -1 - @email.subject.indexOf("undefined").should.equal -1 - describe "projectInvite", -> beforeEach -> @opts =