@rpcbase/server 0.192.0 → 0.194.0

package/mailer/index.js

@@ -1,10 +1,13 @@
 /* @flow */
+const debug = require("debug")
 const postmark = require("postmark")
 
+const log = debug("rb:mailer")
+
 const {POSTMARK_API_KEY, IS_PRODUCTION} = process.env
 
 const is_production = IS_PRODUCTION === "yes"
-console.warn("email sender forcing is production")
+log("mailer, is_production:", is_production, "env:", JSON.stringify(IS_PRODUCTION))
 
 let client
 
@@ -13,8 +16,8 @@ if (is_production && typeof POSTMARK_API_KEY === "string" && POSTMARK_API_KEY.tr
 } else {
   client = {
     sendEmail: async(payload) => {
-      console.log("sendEmail disabled when not in production")
-      console.log("From:", payload.From, "To:", payload.To, "Subject:", payload.Subject)
+      log("sendEmail disabled when not in production")
+      log("From:", payload.From, "To:", payload.To, "Subject:", payload.Subject)
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.192.0",
+  "version": "0.194.0",
   "license": "SSPL-1.0",
   "main": "./index.js",
   "bin": {

package/src/auth/reset_password.js

@@ -2,6 +2,7 @@
 const _template = require("lodash/template")
 const fs = require("fs")
 const path = require("path")
+const debug = require("debug")
 const isEmail = require("validator/lib/isEmail")
 
 const {hash_password, compare_hash} = require("@rpcbase/std/crypto/hash")
@@ -11,8 +12,9 @@ const mailer = require("../../mailer")
 const mongoose = require("../../mongoose")
 const ResetPasswordToken = require("../models/ResetPasswordToken")
 
+const log = debug("rb:auth:reset_password")
 
-const {APP_DOMAIN} = process.env
+const {APP_DOMAIN, MAILER_FROM_EMAIL} = process.env
 
 const email_tpl = _template(
   fs.readFileSync(path.join(__dirname, "./forgot_password_email.html"), "utf8")
@@ -29,6 +31,7 @@ const reset_password = async({email}, ctx) => {
   const user = await User.findOne({email}, null, {ctx})
 
   if (!user) {
+    log("attempting to reset password for a user that was not found", email)
     // TODO: add random delay to prevent detecting if account exists based on response time
     return {status: "ok"}
   }
@@ -36,11 +39,6 @@ const reset_password = async({email}, ctx) => {
   const token = get_random_str(32)
   const token_hash = await hash_password(token)
 
-  console.log("WOWOOWOWOW", await compare_hash(token, token_hash))
-
-  console.log("token", token)
-  console.log("token_hash", token_hash)
-
   const reset_token = new ResetPasswordToken({
     user_id: user._id,
     token_hash,
@@ -51,7 +49,7 @@ const reset_password = async({email}, ctx) => {
   const reset_url = `https://${APP_DOMAIN}/set-new-password?id=${user._id}&token=${token}`
 
   const res = await mailer.sendEmail({
-    From: "hello@commit-queue.com",
+    From: MAILER_FROM_EMAIL,
     To: user.email,
     Subject: "Your password reset link",
     HtmlBody: email_tpl({
@@ -59,6 +57,8 @@ const reset_password = async({email}, ctx) => {
     }),
   })
 
+  log("res", res)
+
   // cleanup if email wasn't sent
   if (res.Message !== "OK") {
     await reset_token.delete()