Fix SMTP integration and clean up unused code

Author: Irae Hueck Costa

backend/endpoints/recover.go

@@ -24,7 +24,7 @@ func init() {
 			ctx.NoAutoCleanup()
 			go func(){
 				defer ctx.Cleanup()
-				err = claimedUser.PasswordRecovery(ctx.App.Config.MailgunSecretApiKey)
+				err = claimedUser.PasswordRecovery(ctx.App.Config.SMTPSecret)
 				if err != nil {
 					ctx.App.Logger.Printf("password recovery: %s\n", err)
 				}

backend/endpoints/register.go

@@ -35,7 +35,6 @@ func init() {
 				ctx.CatchError(err)
 			}
 
-      user.SendSurvey(ctx.App.Config.SMTPSecret)
 			ctx.SetSessionUser(userId)
 			ctx.ReturnUser()
 

backend/models/user.go

@@ -6,17 +6,14 @@ import (
 	"encoding/base64"
 	"fmt"
 	"strings"
-	"time"
-	"context"
 
 	"github.com/gomodule/redigo/redis"
+	uuidLib "github.com/google/uuid"
 	"github.com/ihucos/counter.dev/utils"
+	"gopkg.in/gomail.v2"
 	"gorm.io/gorm"
-	uuidLib "github.com/google/uuid"
-	"github.com/mailgun/mailgun-go/v4"
 )
 
-
 var surveySender string = "hey@counter.dev"
 var surveySubject string = "Is counter.dev useful?"
 var surveyText string = `Hello %s,
@@ -30,9 +27,6 @@ Thank you. Your feedback is appreciated!
 
 Your counter.dev team`
 
-
-
-
 var passwordRecoverySender string = "hey@counter.dev"
 var passwordRecoverSubject string = "Forgot your password?"
 var passwordRecoveryContent string = `Hello %s,
@@ -51,13 +45,12 @@ Cheers,
 
 The counter.dev team`
 
-
 var uuid2id = map[string]string{}
 
 type User struct {
-	redis redis.Conn
-	db    *gorm.DB
-	Id    string
+	redis        redis.Conn
+	db           *gorm.DB
+	Id           string
 	passwordSalt string
 }
 
@@ -93,13 +86,13 @@ func NewUser(conn redis.Conn, userId string, db *gorm.DB, passwordSalt []byte) U
 	return User{redis: conn, Id: truncate(userId), passwordSalt: string(passwordSalt), db: db}
 }
 
-func NewUserByCachedUUID(conn redis.Conn, uuid string, db *gorm.DB, passwordSalt []byte) (User, error){
+func NewUserByCachedUUID(conn redis.Conn, uuid string, db *gorm.DB, passwordSalt []byte) (User, error) {
 	var err error
 	// Basically we must 'id' here so it can be set inside the if clause
 	var id string
 	var ok bool
 	id, ok = uuid2id[uuid]
-	if ! ok {
+	if !ok {
 		// hit the redis db
 		id, err = redis.String(conn.Do("HGET", "uuid2id", uuid))
 		if err == redis.ErrNil {
@@ -150,10 +143,9 @@ func (user User) ReadToken() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return  base64.URLEncoding.EncodeToString([]byte(token)), nil
+	return base64.URLEncoding.EncodeToString([]byte(token)), nil
 }
 
-
 func (user User) ReadUUID() (string, error) {
 	return redis.String(user.redis.Do("HGET", "id2uuid", user.Id))
 }
@@ -253,7 +245,6 @@ func (user User) VerifyTmpPassword(tmpPassword string) (bool, error) {
 	return hashedTmpPassword != "" && hashedTmpPassword == user.hashPassword(tmpPassword), nil
 }
 
-
 func (user User) VerifyPasswordOrTmpPassword(password string) (bool, error) {
 
 	// validate as password
@@ -277,7 +268,7 @@ func (user User) VerifyPasswordOrTmpPassword(password string) (bool, error) {
 }
 
 func (user User) NewTmpPassword() (string, error) {
-	expire := 60 * 15  // 15 minutes
+	expire := 60 * 15 // 15 minutes
 	tmpPassword := base64.URLEncoding.EncodeToString([]byte(randToken()[:8]))
 	_, err := user.redis.Do("SETEX",
 		fmt.Sprintf("tmppwd:%s", user.Id), expire, user.hashPassword(tmpPassword))
@@ -400,8 +391,7 @@ func (user User) HandleSignals(conn redis.Conn, cb func(error)) {
 	}
 }
 
-
-func (user User) PasswordRecovery(mailgunSecretApiKey string) error {
+func (user User) PasswordRecovery(SMTPSecret string) error {
 	mail, err := user.GetPref("mail")
 	if err != nil {
 		return err
@@ -410,57 +400,31 @@ func (user User) PasswordRecovery(mailgunSecretApiKey string) error {
 	if err != nil {
 		return err
 	}
-	mg := mailgun.NewMailgun("counter.dev", mailgunSecretApiKey)
 
 	body := fmt.Sprintf(passwordRecoveryContent, user.Id, user.Id, tmppwd)
-	message := mg.NewMessage(passwordRecoverySender, passwordRecoverSubject, body, mail)
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
-	defer cancel()
 
-	_, _, err = mg.Send(ctx, message)
+	m := gomail.NewMessage()
+	m.SetHeader("From", passwordRecoverySender)
+	m.SetHeader("To", mail)
+	m.SetHeader("Subject", passwordRecoverSubject)
+	m.SetBody("text/plain", body)
 
+	d := gomail.NewDialer("smtp.protonmail.ch", 587, "hey@counter.dev", SMTPSecret)
+	err = d.DialAndSend(m)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func (user User) SendSurvey(mailgunSecretApiKey string) error {
-	mail, err := user.GetPref("mail")
-	if err != nil {
-		return err
-	}
-  if mail == "" {
-    return nil
-  }
-	mg := mailgun.NewMailgun("counter.dev", mailgunSecretApiKey)
-
-	body := fmt.Sprintf(surveyText, user.Id)
-	message := mg.NewMessage(surveySender, surveySubject, body, mail)
-  message.SetDeliveryTime(time.Now().Add(24 * 2 * time.Second))
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
-	defer cancel()
-
-	_, _, err = mg.Send(ctx, message)
-
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-
-func (user User) RegisterSubscriptionID(subscriptionID string) error{
+func (user User) RegisterSubscriptionID(subscriptionID string) error {
 	_, err := user.redis.Do("HSET", "subscription", user.Id, subscriptionID)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-
 func (user User) ReadSubscriptionID() (string, error) {
 	val, err := redis.String(user.redis.Do("HGET", "subscription", user.Id))
 	if err == redis.ErrNil {

static/js/dashboard.js

@@ -353,6 +353,13 @@ function dGroupDates(dates) {
         return acc;
     }, {});
 
+
+    let groupedByYear = Object.entries(dates).reduce((acc, val) => {
+        let group = moment(val[0]).format("YYYY");
+        acc[group] = (acc[group] || 0) + val[1];
+        return acc;
+    }, {});
+
     var groupedDates = dates;
     if (Object.keys(groupedDates).length > 31) {
         groupedDates = groupedByWeek;
@@ -362,6 +369,8 @@ function dGroupDates(dates) {
         }
     }
 
+    groupedDates = groupedByYear
+
     return [Object.keys(groupedDates), Object.values(groupedDates)];
 }