codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-02-17 17:02:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-12-08 08:20:43 -08:00
commit 96cedec946
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
server/users/User.coffee
View file

@ -63,7 +63,7 @@ UserSchema.methods.setEmailSubscription = (newName, enabled) ->
newSubs[newName].enabled = enabled newSubs[newName].enabled = enabled
@set('emails', newSubs) @set('emails', newSubs)
@newsSubsChanged = true if newName in mail.NEWS_GROUPS @newsSubsChanged = true if newName in mail.NEWS_GROUPS
UserSchema.methods.gems = -> UserSchema.methods.gems = ->
gemsEarned = @get('earned')?.gems ? 0 gemsEarned = @get('earned')?.gems ? 0
gemsPurchased = @get('purchased')?.gems ? 0 gemsPurchased = @get('purchased')?.gems ? 0
@ -86,11 +86,13 @@ UserSchema.statics.updateServiceSettings = (doc, callback) ->
return callback?() unless doc.get('email') return callback?() unless doc.get('email')
existingProps = doc.get('mailChimp') existingProps = doc.get('mailChimp')
emailChanged = (not existingProps) or existingProps?.email isnt doc.get('email') emailChanged = (not existingProps) or existingProps?.email isnt doc.get('email')
if emailChanged and customerID = doc.get('stripe')?.customerID if emailChanged and customerID = doc.get('stripe')?.customerID
stripe.customers.update customerID, {email:doc.get('email')}, (err, customer) -> unless stripe?.customers
console.error('Oh my god, Stripe is not imported correctly-how could we have done this (again)?')
stripe?.customers?.update customerID, {email:doc.get('email')}, (err, customer) ->
console.error('Error updating stripe customer...', err) if err console.error('Error updating stripe customer...', err) if err
return callback?() unless emailChanged or doc.newsSubsChanged return callback?() unless emailChanged or doc.newsSubsChanged
newGroups = [] newGroups = []
@ -180,10 +182,10 @@ UserSchema.methods.register = (done) ->
@saveActiveUser 'register' @saveActiveUser 'register'
UserSchema.methods.isPremium = -> UserSchema.methods.isPremium = ->
return false unless stripe = @get('stripe') return false unless stripeObject = @get('stripe')
return true if stripe.subscriptionID return true if stripeObject.subscriptionID
return true if stripe.free is true return true if stripeObject.free is true
return true if _.isString(stripe.free) and new Date() < new Date(stripe.free) return true if _.isString(stripeObject.free) and new Date() < new Date(stripeObject.free)
return false return false
UserSchema.statics.saveActiveUser = (id, event, done=null) -> UserSchema.statics.saveActiveUser = (id, event, done=null) ->
@ -199,7 +201,7 @@ UserSchema.methods.saveActiveUser = (event, done=null) ->
try try
return done?() if @isAdmin() return done?() if @isAdmin()
userID = @get('_id') userID = @get('_id')
# Create if no active user entry for today # Create if no active user entry for today
today = new Date() today = new Date()
minDate = new Date(Date.UTC(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate())) minDate = new Date(Date.UTC(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate()))
@ -236,7 +238,7 @@ UserSchema.post 'save', (doc) ->
UserSchema.post 'init', (doc) -> UserSchema.post 'init', (doc) ->
doc.startingEmails = _.cloneDeep(doc.get('emails')) doc.startingEmails = _.cloneDeep(doc.get('emails'))
UserSchema.statics.hashPassword = (password) -> UserSchema.statics.hashPassword = (password) ->
password = password.toLowerCase() password = password.toLowerCase()
shasum = crypto.createHash('sha512') shasum = crypto.createHash('sha512')