#{$.i18n.t('subscribe.parent_email_description')}
" + popoverContent += "" + popoverContent += "#{$.i18n.t('subscribe.parent_email_sent')}
" + popoverContent += " " + popoverContent += "" + $.i18n.t('subscribe.parents_blurb1') + "
" popoverContent += "" + $.i18n.t('subscribe.parents_blurb2') + "
" @@ -50,6 +85,26 @@ module.exports = class SubscribeModal extends ModalView ).on 'shown.bs.popover', => application.tracker?.trackEvent 'Subscription parent hover', {} + onClickParentSendButton: (e) -> + # TODO: Popover sometimes dismisses immediately after send + + email = $('#parent-input').val() + unless /[\w\.]+@\w+\.\w+/.test email + $('#parent-input').parent().addClass('has-error') + $('#parent-email-validator').show() + return false + + request = @supermodel.addRequestResource 'send_one_time_email', { + url: '/db/user/-/send_one_time_email' + data: {email: email, type: 'subscribe modal parent'} + method: 'POST' + }, 0 + request.load() + + $('#email-parent-form').hide() + $('#email-parent-complete').show() + false + onClickPurchaseButton: (e) -> @playSound 'menu-button-click' return @openModalView new AuthModal() if me.get('anonymous') diff --git a/server/analytics/AnalyticsLogEvent.coffee b/server/analytics/AnalyticsLogEvent.coffee index be9a5b461..f5a5b3791 100644 --- a/server/analytics/AnalyticsLogEvent.coffee +++ b/server/analytics/AnalyticsLogEvent.coffee @@ -1,5 +1,7 @@ +log = require 'winston' mongoose = require 'mongoose' plugins = require '../plugins/plugins' +utils = require '../lib/utils' AnalyticsLogEventSchema = new mongoose.Schema({ u: mongoose.Schema.Types.ObjectId @@ -14,4 +16,102 @@ AnalyticsLogEventSchema = new mongoose.Schema({ AnalyticsLogEventSchema.index({event: 1, _id: 1}) +AnalyticsLogEventSchema.statics.logEvent = (user, event, properties) -> + unless user? + log.warn 'No user given to analytics logEvent.' + return + + saveDoc = (eventID, slimProperties) -> + doc = new AnalyticsLogEvent + u: user + e: eventID + p: slimProperties + # TODO: Remove these legacy properties after we stop querying for them (probably 30 days, ~2/16/15) + user: user + event: event + properties: properties + doc.save() + + utils.getAnalyticsStringID event, (eventID) -> + if eventID > 0 + # TODO: properties slimming is pretty ugly + slimProperties = _.cloneDeep properties + if event in ['Clicked Level', 'Show problem alert', 'Started Level', 'Saw Victory', 'Problem alert help clicked', 'Spell palette help clicked'] + delete slimProperties.level if event is 'Saw Victory' + properties.ls = mongoose.Types.ObjectId properties.ls if properties.ls + slimProperties.ls = mongoose.Types.ObjectId slimProperties.ls if slimProperties.ls + if slimProperties.levelID? + # levelID: string => l: string ID + utils.getAnalyticsStringID slimProperties.levelID, (levelStringID) -> + if levelStringID > 0 + delete slimProperties.levelID + slimProperties.l = levelStringID + saveDoc eventID, slimProperties + return + else if event in ['Script Started', 'Script Ended'] + properties.ls = mongoose.Types.ObjectId properties.ls if properties.ls + slimProperties.ls = mongoose.Types.ObjectId slimProperties.ls if slimProperties.ls + if slimProperties.levelID? and slimProperties.label? + # levelID: string => l: string ID + # label: string => lb: string ID + utils.getAnalyticsStringID slimProperties.levelID, (levelStringID) -> + if levelStringID > 0 + delete slimProperties.levelID + slimProperties.l = levelStringID + utils.getAnalyticsStringID slimProperties.label, (labelStringID) -> + if labelStringID > 0 + delete slimProperties.label + slimProperties.lb = labelStringID + saveDoc eventID, slimProperties + return + else if event is 'Heard Sprite' + properties.ls = mongoose.Types.ObjectId properties.ls if properties.ls + slimProperties.ls = mongoose.Types.ObjectId slimProperties.ls if slimProperties.ls + if slimProperties.message? + # message: string => m: string ID + utils.getAnalyticsStringID slimProperties.message, (messageStringID) -> + if messageStringID > 0 + delete slimProperties.message + slimProperties.m = messageStringID + saveDoc eventID, slimProperties + return + else if event in ['Start help video', 'Finish help video'] + properties.ls = mongoose.Types.ObjectId properties.ls if properties.ls + slimProperties.ls = mongoose.Types.ObjectId slimProperties.ls if slimProperties.ls + if slimProperties.level and slimProperties.style? + # level: string => l: string ID + # style: string => s: string ID + utils.getAnalyticsStringID slimProperties.level, (levelStringID) -> + if levelStringID > 0 + delete slimProperties.level + slimProperties.l = levelStringID + utils.getAnalyticsStringID slimProperties.style, (styleStringID) -> + if styleStringID > 0 + delete slimProperties.style + slimProperties.s = styleStringID + saveDoc eventID, slimProperties + return + else if event is 'Show subscription modal' + delete properties.category + delete slimProperties.category + if slimProperties.label? + # label: string => lb: string ID + utils.getAnalyticsStringID slimProperties.label, (labelStringID) -> + if labelStringID > 0 + delete slimProperties.label + slimProperties.lb = labelStringID + if slimProperties.level? + # level: string => l: string ID + utils.getAnalyticsStringID slimProperties.level, (levelStringID) -> + if levelStringID > 0 + delete slimProperties.level + slimProperties.l = levelStringID + saveDoc eventID, slimProperties + return + saveDoc eventID, slimProperties + return + saveDoc eventID, slimProperties + else + log.warn "Unable to get analytics string ID for " + event + module.exports = AnalyticsLogEvent = mongoose.model('analytics.log.event', AnalyticsLogEventSchema) diff --git a/server/analytics/analytics_log_event_handler.coffee b/server/analytics/analytics_log_event_handler.coffee index 91039b731..f31a17234 100644 --- a/server/analytics/analytics_log_event_handler.coffee +++ b/server/analytics/analytics_log_event_handler.coffee @@ -39,102 +39,7 @@ class AnalyticsLogEventHandler extends Handler event = req.query.event or req.body.event properties = req.query.properties or req.body.properties @sendSuccess res # Return request immediately - unless user? - log.warn 'No user given to analytics logEvent.' - return - - saveDoc = (eventID, slimProperties) -> - doc = new AnalyticsLogEvent - u: user - e: eventID - p: slimProperties - # TODO: Remove these legacy properties after we stop querying for them (probably 30 days, ~2/16/15) - user: user - event: event - properties: properties - doc.save() - - utils.getAnalyticsStringID event, (eventID) -> - if eventID > 0 - # TODO: properties slimming is pretty ugly - slimProperties = _.cloneDeep properties - if event in ['Clicked Level', 'Show problem alert', 'Started Level', 'Saw Victory', 'Problem alert help clicked', 'Spell palette help clicked'] - delete slimProperties.level if event is 'Saw Victory' - properties.ls = mongoose.Types.ObjectId properties.ls if properties.ls - slimProperties.ls = mongoose.Types.ObjectId slimProperties.ls if slimProperties.ls - if slimProperties.levelID? - # levelID: string => l: string ID - utils.getAnalyticsStringID slimProperties.levelID, (levelStringID) -> - if levelStringID > 0 - delete slimProperties.levelID - slimProperties.l = levelStringID - saveDoc eventID, slimProperties - return - else if event in ['Script Started', 'Script Ended'] - properties.ls = mongoose.Types.ObjectId properties.ls if properties.ls - slimProperties.ls = mongoose.Types.ObjectId slimProperties.ls if slimProperties.ls - if slimProperties.levelID? and slimProperties.label? - # levelID: string => l: string ID - # label: string => lb: string ID - utils.getAnalyticsStringID slimProperties.levelID, (levelStringID) -> - if levelStringID > 0 - delete slimProperties.levelID - slimProperties.l = levelStringID - utils.getAnalyticsStringID slimProperties.label, (labelStringID) -> - if labelStringID > 0 - delete slimProperties.label - slimProperties.lb = labelStringID - saveDoc eventID, slimProperties - return - else if event is 'Heard Sprite' - properties.ls = mongoose.Types.ObjectId properties.ls if properties.ls - slimProperties.ls = mongoose.Types.ObjectId slimProperties.ls if slimProperties.ls - if slimProperties.message? - # message: string => m: string ID - utils.getAnalyticsStringID slimProperties.message, (messageStringID) -> - if messageStringID > 0 - delete slimProperties.message - slimProperties.m = messageStringID - saveDoc eventID, slimProperties - return - else if event in ['Start help video', 'Finish help video'] - properties.ls = mongoose.Types.ObjectId properties.ls if properties.ls - slimProperties.ls = mongoose.Types.ObjectId slimProperties.ls if slimProperties.ls - if slimProperties.level and slimProperties.style? - # level: string => l: string ID - # style: string => s: string ID - utils.getAnalyticsStringID slimProperties.level, (levelStringID) -> - if levelStringID > 0 - delete slimProperties.level - slimProperties.l = levelStringID - utils.getAnalyticsStringID slimProperties.style, (styleStringID) -> - if styleStringID > 0 - delete slimProperties.style - slimProperties.s = styleStringID - saveDoc eventID, slimProperties - return - else if event is 'Show subscription modal' - delete properties.category - delete slimProperties.category - if slimProperties.label? - # label: string => lb: string ID - utils.getAnalyticsStringID slimProperties.label, (labelStringID) -> - if labelStringID > 0 - delete slimProperties.label - slimProperties.lb = labelStringID - if slimProperties.level? - # level: string => l: string ID - utils.getAnalyticsStringID slimProperties.level, (levelStringID) -> - if levelStringID > 0 - delete slimProperties.level - slimProperties.l = levelStringID - saveDoc eventID, slimProperties - return - saveDoc eventID, slimProperties - return - saveDoc eventID, slimProperties - else - log.warn "Unable to get analytics string ID for " + event + AnalyticsLogEvent.logEvent user, event, properties getLevelCompletionsBySlug: (req, res) -> # Returns an array of per-day level starts and finishes @@ -204,7 +109,7 @@ class AnalyticsLogEventHandler extends Handler for level of levelDateMap completions[level] = [] for created, item of levelDateMap[level] - completions[level].push + completions[level].push level: level created: created started: Object.keys(item.started).length @@ -382,7 +287,7 @@ class AnalyticsLogEventHandler extends Handler getUserEventData campaigns getCampaignData = () => - # Get campaign data + # Get campaign data # Output: # campaigns - per-campaign dictionary of ordered levelIDs # campaignLevelIDs - dictionary of all campaign levelIDs diff --git a/server/sendwithus.coffee b/server/sendwithus.coffee index ff9cdf8b4..d8411b622 100644 --- a/server/sendwithus.coffee +++ b/server/sendwithus.coffee @@ -10,6 +10,7 @@ module.exports.api = new sendwithusAPI swuAPIKey, debug if config.unittest module.exports.api.send = -> module.exports.templates = + parent_subscribe_email: 'tem_2APERafogvwKhmcnouigud' welcome_email: 'utnGaBHuSU4Hmsi7qrAypU' ladder_update_email: 'JzaZxf39A4cKMxpPZUfWy4' patch_created: 'tem_xhxuNosLALsizTNojBjNcL' diff --git a/server/users/user_handler.coffee b/server/users/user_handler.coffee index 2dd8d2fd2..c070c395e 100644 --- a/server/users/user_handler.coffee +++ b/server/users/user_handler.coffee @@ -9,6 +9,7 @@ errors = require '../commons/errors' async = require 'async' log = require 'winston' moment = require 'moment' +AnalyticsLogEvent = require '../analytics/AnalyticsLogEvent' LevelSession = require '../levels/sessions/LevelSession' LevelSessionHandler = require '../levels/sessions/level_session_handler' SubscriptionHandler = require '../payments/subscription_handler' @@ -17,6 +18,7 @@ EarnedAchievement = require '../achievements/EarnedAchievement' UserRemark = require './remarks/UserRemark' {isID} = require '../lib/utils' hipchat = require '../hipchat' +sendwithus = require '../sendwithus' serverProperties = ['passwordHash', 'emailLower', 'nameLower', 'passwordReset', 'lastIP'] candidateProperties = [ @@ -232,6 +234,7 @@ UserHandler = class UserHandler extends Handler return @getRemark(req, res, args[0]) if args[1] is 'remark' return @searchForUser(req, res) if args[1] is 'admin_search' return @getStripeInfo(req, res, args[0]) if args[1] is 'stripe' + return @sendOneTimeEmail(req, res, args[0]) if args[1] is 'send_one_time_email' return @sendNotFoundError(res) super(arguments...) @@ -244,6 +247,35 @@ UserHandler = class UserHandler extends Handler return @sendDatabaseError(res, err) if err @sendSuccess(res, JSON.stringify(customer, null, '\t')) + sendOneTimeEmail: (req, res) -> + # TODO: should this API be somewhere else? + # TODO: hipchat tower success message shows up as a misleading PaperTrail error message + return @sendForbiddenError(res) unless req.user + email = req.query.email or req.body.email + type = req.query.type or req.body.type + return @sendBadInputError res, 'No email given.' unless email? + return @sendBadInputError res, 'No type given.' unless type? + + return @sendBadInputError res, "Unknown one-time email type #{type}" unless type is 'subscribe modal parent' + + emailParams = + email_id: sendwithus.templates.parent_subscribe_email + recipient: + address: email + email_data: + name: req.user.get('name') or '' + sendwithus.api.send emailParams, (err, result) => + if err + log.error "sendwithus one-time email error: #{err}, result: #{result}" + return @sendError res, 500, 'send mail failed.' + req.user.update {$push: {"emails.oneTimes": {type: type, email: email, sent: new Date()}}}, (err) => + return @sendDatabaseError(res, err) if err + req.user.save (err) => + return @sendDatabaseError(res, err) if err + @sendSuccess(res, {result: 'success'}) + hipchat.sendTowerHipChatMessage "#{req.user.get('name') or req.user.get('email')} just submitted subscribe modal parent email #{email}." + AnalyticsLogEvent.logEvent req.user, 'Sent one time email', email: email, type: type + agreeToCLA: (req, res) -> return @sendForbiddenError(res) unless req.user doc =