chore: send notification on successful import

fix: throttle wakatime api requests (attempt to fix #152 )
chore: version
2023-08-10 21:12:56 +03:00 · 2021-04-10 10:48:06 +02:00 · 2021-04-10 10:18:09 +02:00 · 2021-04-10 00:34:37 +02:00 · 2021-04-10 00:34:20 +02:00 · 2021-04-10 00:27:01 +02:00
67 changed files with 2560 additions and 631 deletions
--- a/README.md
+++ b/README.md
@ -49,6 +49,8 @@
 * [Support](#-support)
 * [FAQs](#-faqs)

+Further instructions can be found in the [Wiki](https://github.com/muety/wakapi/wiki).
+
 ## 📬 **User Survey**
 I'd love to get some community feedback from active Wakapi users. If you want, please participate in the recent [user survey](https://github.com/muety/wakapi/issues/82). Thanks a lot!

@ -149,7 +151,7 @@ api_url = http://localhost:3000/api/heartbeat
 api_key = 406fe41f-6d69-4183-a4cc-121e0c524c2b
 ```

-Optionally, you can set up a [client-side proxy](docs/advanced_setup.md) in addition.
+Optionally, you can set up a [client-side proxy](https://github.com/muety/wakapi/wiki/Advanced-Setup:-Client-side-proxy) in addition.

 ## 🔧 Configuration Options
 You can specify configuration options either via a config file (default: `config.yml`, customziable through the `-c` argument) or via environment variables. Here is an overview of all options.
@ -178,6 +180,14 @@ You can specify configuration options either via a config file (default: `config
 | `db.charset`                | `WAKAPI_DB_CHARSET`         | `utf8mb4`      | Database connection charset (for MySQL only)                        |
 | `db.max_conn`               | `WAKAPI_DB_MAX_CONNECTIONS` | `2`            | Maximum number of database connections                              |
 | `db.ssl`                    | `WAKAPI_DB_SSL`             | `false`        | Whether to use TLS encryption for database connection (Postgres and CockroachDB only) |
+| `mail.enabled`              | `WAKAPI_MAIL_ENABLED`       | `true`         | Whether to allow Wakapi to send e-mail (e.g. for password resets) |
+| `mail.provider`             | `WAKAPI_MAIL_PROVIDER`      | `smtp`         | Implementation to use for sending mails (one of [`smtp`, `mailwhale`]) |
+| `mail.smtp.*`               | `WAKAPI_MAIL_SMTP_*`        | `-`            | Various options to configure SMTP. See [default config](config.default.yaml) for details |
+| `mail.mailwhale.*`          | `WAKAPI_MAIL_MAILWHALE_*`   | `-`            | Various options to configure [MailWhale](https://mailwhale.dev) sending service. See [default config](config.default.yaml) for details |
+| `sentry.dsn`                | `WAKAPI_SENTRY_DSN`         | –              | DSN for to integrate [Sentry](https://sentry.io) for error logging and tracing (leave empty to disable) |
+| `sentry.enable_tracing`     | `WAKAPI_SENTRY_TRACING`     | `false`        | Whether to enable Sentry request tracing                           |
+| `sentry.sample_rate`        | `WAKAPI_SENTRY_SAMPLE_RATE` | `0.75`         | Probability of tracing a request in Sentry                         |
+| `sentry.sample_rate_heartbats` | `WAKAPI_SENTRY_SAMPLE_RATE_HEARTBEATS` | `0.1` | Probability of tracing a heartbeats request in Sentry         |

 ### Supported databases
 Wakapi uses [GORM](https://gorm.io) as an ORM. As a consequence, a set of different relational databases is supported.
--- a/config.default.yml
+++ b/config.default.yml
@ -1,12 +1,13 @@
 env: development

 server:
-  listen_ipv4: 127.0.0.1    # leave blank to disable ipv4
-  listen_ipv6: ::1          # leave blank to disable ipv6
-  tls_cert_path:            # leave blank to not use https
-  tls_key_path:             # leave blank to not use https
+  listen_ipv4: 127.0.0.1            # leave blank to disable ipv4
+  listen_ipv6: ::1                  # leave blank to disable ipv6
+  tls_cert_path:                    # leave blank to not use https
+  tls_key_path:                     # leave blank to not use https
  port: 3000
  base_path: /
+  public_url: http://localhost:3000 # required for links (e.g. password reset) in e-mail

 app:
  aggregation_time: '02:15' # time at which to run daily aggregation batch jobs
@ -14,6 +15,7 @@ app:
  custom_languages:
    vue: Vue
    jsx: JSX
+    svelte: Svelte

 db:
  host:                     # leave blank when using sqlite3
@ -31,4 +33,25 @@ security:
  insecure_cookies: false   # You need to set this to 'true' when on localhost
  cookie_max_age: 172800
  allow_signup: true
-  expose_metrics: false
+  expose_metrics: false
+
+sentry:
+  dsn:                        # leave blank to disable sentry integration
+  enable_tracing: true        # whether to use performance monitoring
+  sample_rate: 0.75           # probability of tracing a request
+  sample_rate_heartbeats: 0.1 # probability of tracing a heartbeat request
+
+mail:
+  enabled: true                         # whether to enable mails (used for password resets, reports, etc.)
+  provider: smtp                        # method for sending mails, currently one of ['smtp', 'mailwhale']
+  smtp:                                 # smtp settings when sending mails via smtp
+    host:
+    port:
+    username:
+    password:
+    tls:
+    sender: Wakapi <noreply@wakapi.dev>
+  mailwhale:                            # mailwhale.dev settings when using mailwhale as sending service
+    url:
+    client_id:
+    client_secret:
--- a/config/config.go
+++ b/config/config.go
@ -5,6 +5,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/emvi/logbuch"
+	"github.com/getsentry/sentry-go"
 	"github.com/gorilla/securecookie"
 	"github.com/jinzhu/configor"
 	"github.com/markbates/pkger"
@ -48,6 +49,16 @@ const (
 	WakatimeApiMachineNamesUrl   = "/users/current/machine_names"
 )

+const (
+	MailProviderSmtp      = "smtp"
+	MailProviderMailWhale = "mailwhale"
+)
+
+var emailProviders = []string{
+	MailProviderSmtp,
+	MailProviderMailWhale,
+}
+
 var cfg *Config
 var cFlag = flag.String("config", defaultConfigPath, "config file location")

@ -88,10 +99,40 @@ type serverConfig struct {
 	ListenIpV4  string `yaml:"listen_ipv4" default:"127.0.0.1" env:"WAKAPI_LISTEN_IPV4"`
 	ListenIpV6  string `yaml:"listen_ipv6" default:"::1" env:"WAKAPI_LISTEN_IPV6"`
 	BasePath    string `yaml:"base_path" default:"/" env:"WAKAPI_BASE_PATH"`
+	PublicUrl   string `yaml:"public_url" default:"http://localhost:3000" env:"WAKAPI_PUBLIC_URL"`
 	TlsCertPath string `yaml:"tls_cert_path" default:"" env:"WAKAPI_TLS_CERT_PATH"`
 	TlsKeyPath  string `yaml:"tls_key_path" default:"" env:"WAKAPI_TLS_KEY_PATH"`
 }

+type sentryConfig struct {
+	Dsn                  string  `env:"WAKAPI_SENTRY_DSN"`
+	EnableTracing        bool    `yaml:"enable_tracing" env:"WAKAPI_SENTRY_TRACING"`
+	SampleRate           float32 `yaml:"sample_rate" default:"0.75" env:"WAKAPI_SENTRY_SAMPLE_RATE"`
+	SampleRateHeartbeats float32 `yaml:"sample_rate_heartbeats" default:"0.1" env:"WAKAPI_SENTRY_SAMPLE_RATE_HEARTBEATS"`
+}
+
+type mailConfig struct {
+	Enabled   bool                 `env:"WAKAPI_MAIL_ENABLED" default:"true"`
+	Provider  string               `env:"WAKAPI_MAIL_PROVIDER" default:"smtp"`
+	MailWhale *MailwhaleMailConfig `yaml:"mailwhale"`
+	Smtp      *SMTPMailConfig      `yaml:"smtp"`
+}
+
+type MailwhaleMailConfig struct {
+	Url          string `env:"WAKAPI_MAIL_MAILWHALE_URL"`
+	ClientId     string `yaml:"client_id" env:"WAKAPI_MAIL_MAILWHALE_CLIENT_ID"`
+	ClientSecret string `yaml:"client_secret" env:"WAKAPI_MAIL_MAILWHALE_CLIENT_SECRET"`
+}
+
+type SMTPMailConfig struct {
+	Host     string `env:"WAKAPI_MAIL_SMTP_HOST"`
+	Port     uint   `env:"WAKAPI_MAIL_SMTP_PORT"`
+	Username string `env:"WAKAPI_MAIL_SMTP_USER"`
+	Password string `env:"WAKAPI_MAIL_SMTP_PASS"`
+	TLS      bool   `env:"WAKAPI_MAIL_SMTP_TLS"`
+	Sender   string `env:"WAKAPI_MAIL_SMTP_SENDER"`
+}
+
 type Config struct {
 	Env      string `default:"dev" env:"ENVIRONMENT"`
 	Version  string `yaml:"-"`
@ -99,6 +140,8 @@ type Config struct {
 	Security securityConfig
 	Db       dbConfig
 	Server   serverConfig
+	Sentry   sentryConfig
+	Mail     mailConfig
 }

 func (c *Config) CreateCookie(name, value, path string) *http.Cookie {
@ -229,6 +272,14 @@ func (c *appConfig) GetOSColors() map[string]string {
 	return cloneStringMap(c.Colors["operating_systems"], true)
 }

+func (c *serverConfig) GetPublicUrl() string {
+	return strings.TrimSuffix(c.PublicUrl, "/")
+}
+
+func (c *SMTPMailConfig) ConnStr() string {
+	return fmt.Sprintf("%s:%d", c.Host, c.Port)
+}
+
 func IsDev(env string) bool {
 	return env == "dev" || env == "development"
 }
@ -290,6 +341,53 @@ func resolveDbDialect(dbType string) string {
 	return dbType
 }

+func initSentry(config sentryConfig, debug bool) {
+	if err := sentry.Init(sentry.ClientOptions{
+		Dsn:   config.Dsn,
+		Debug: debug,
+		TracesSampler: sentry.TracesSamplerFunc(func(ctx sentry.SamplingContext) sentry.Sampled {
+			if !config.EnableTracing {
+				return sentry.SampledFalse
+			}
+
+			hub := sentry.GetHubFromContext(ctx.Span.Context())
+			txName := hub.Scope().Transaction()
+
+			if strings.HasPrefix(txName, "GET /assets") || strings.HasPrefix(txName, "GET /api/health") {
+				return sentry.SampledFalse
+			}
+			if txName == "POST /api/heartbeat" {
+				return sentry.UniformTracesSampler(config.SampleRateHeartbeats).Sample(ctx)
+			}
+			return sentry.UniformTracesSampler(config.SampleRate).Sample(ctx)
+		}),
+		BeforeSend: func(event *sentry.Event, hint *sentry.EventHint) *sentry.Event {
+			type principalGetter interface {
+				GetPrincipal() *models.User
+			}
+			if hint.Context != nil {
+				if req, ok := hint.Context.Value(sentry.RequestContextKey).(*http.Request); ok {
+					if p := req.Context().Value("principal"); p != nil {
+						event.User.ID = p.(principalGetter).GetPrincipal().ID
+					}
+				}
+			}
+			return event
+		},
+	}); err != nil {
+		logbuch.Fatal("failed to initialized sentry – %v", err)
+	}
+}
+
+func findString(needle string, haystack []string, defaultVal string) string {
+	for _, s := range haystack {
+		if s == needle {
+			return s
+		}
+	}
+	return defaultVal
+}
+
 func Set(config *Config) {
 	cfg = config
 }
@ -333,6 +431,15 @@ func Load() *Config {
 		logbuch.Fatal("you must allow at least one database connection")
 	}

+	if config.Sentry.Dsn != "" {
+		logbuch.Info("enabling sentry integration")
+		initSentry(config.Sentry, config.IsDev())
+	}
+
+	if config.Mail.Provider != "" && findString(config.Mail.Provider, emailProviders, "") == "" {
+		logbuch.Fatal("unknown mail provider '%s'", config.Mail.Provider)
+	}
+
 	Set(config)
 	return Get()
 }
--- a/config/templates.go
+++ b/config/templates.go
@ -1,10 +1,12 @@
 package config

 const (
-	IndexTemplate    = "index.tpl.html"
-	LoginTemplate    = "login.tpl.html"
-	ImprintTemplate  = "imprint.tpl.html"
-	SignupTemplate   = "signup.tpl.html"
-	SettingsTemplate = "settings.tpl.html"
-	SummaryTemplate  = "summary.tpl.html"
+	IndexTemplate         = "index.tpl.html"
+	LoginTemplate         = "login.tpl.html"
+	ImprintTemplate       = "imprint.tpl.html"
+	SignupTemplate        = "signup.tpl.html"
+	SetPasswordTemplate   = "set-password.tpl.html"
+	ResetPasswordTemplate = "reset-password.tpl.html"
+	SettingsTemplate      = "settings.tpl.html"
+	SummaryTemplate       = "summary.tpl.html"
 )
--- a/coverage/coverage.out
+++ b/coverage/coverage.out
@ -1,4 +1,39 @@
 mode: set
+github.com/muety/wakapi/models/user.go:13.13,15.2 1 1
+github.com/muety/wakapi/models/user.go:78.43,81.2 1 0
+github.com/muety/wakapi/models/user.go:83.45,86.2 1 0
+github.com/muety/wakapi/models/user.go:88.33,93.2 1 0
+github.com/muety/wakapi/models/user.go:95.41,97.2 1 0
+github.com/muety/wakapi/models/user.go:99.45,101.2 1 0
+github.com/muety/wakapi/models/user.go:103.45,105.2 1 0
+github.com/muety/wakapi/models/user.go:107.39,109.2 1 0
+github.com/muety/wakapi/models/heartbeat.go:32.34,34.2 1 1
+github.com/muety/wakapi/models/heartbeat.go:36.65,37.46 1 1
+github.com/muety/wakapi/models/heartbeat.go:37.46,38.46 1 1
+github.com/muety/wakapi/models/heartbeat.go:38.46,41.4 2 1
+github.com/muety/wakapi/models/heartbeat.go:45.50,46.11 1 1
+github.com/muety/wakapi/models/heartbeat.go:59.2,59.15 1 1
+github.com/muety/wakapi/models/heartbeat.go:63.2,63.12 1 1
+github.com/muety/wakapi/models/heartbeat.go:47.22,48.18 1 1
+github.com/muety/wakapi/models/heartbeat.go:49.21,50.17 1 1
+github.com/muety/wakapi/models/heartbeat.go:51.23,52.19 1 1
+github.com/muety/wakapi/models/heartbeat.go:53.17,54.26 1 1
+github.com/muety/wakapi/models/heartbeat.go:55.22,56.18 1 1
+github.com/muety/wakapi/models/heartbeat.go:59.15,61.3 1 1
+github.com/muety/wakapi/models/heartbeat.go:66.37,82.2 1 0
+github.com/muety/wakapi/models/heartbeat.go:90.41,92.16 2 0
+github.com/muety/wakapi/models/heartbeat.go:95.2,96.10 2 0
+github.com/muety/wakapi/models/heartbeat.go:92.16,94.3 1 0
+github.com/muety/wakapi/models/heartbeats.go:7.31,9.2 1 0
+github.com/muety/wakapi/models/heartbeats.go:11.41,13.2 1 0
+github.com/muety/wakapi/models/heartbeats.go:15.36,17.2 1 0
+github.com/muety/wakapi/models/heartbeats.go:19.43,22.2 2 0
+github.com/muety/wakapi/models/heartbeats.go:24.41,26.18 1 0
+github.com/muety/wakapi/models/heartbeats.go:29.2,29.16 1 0
+github.com/muety/wakapi/models/heartbeats.go:26.18,28.3 1 0
+github.com/muety/wakapi/models/heartbeats.go:32.40,34.18 1 0
+github.com/muety/wakapi/models/heartbeats.go:37.2,37.24 1 0
+github.com/muety/wakapi/models/heartbeats.go:34.18,36.3 1 0
 github.com/muety/wakapi/models/shared.go:35.52,37.2 1 0
 github.com/muety/wakapi/models/shared.go:39.52,42.16 3 0
 github.com/muety/wakapi/models/shared.go:45.2,47.12 3 0
@ -15,42 +50,6 @@ github.com/muety/wakapi/models/shared.go:83.51,86.2 2 0
 github.com/muety/wakapi/models/shared.go:88.37,91.2 2 0
 github.com/muety/wakapi/models/shared.go:93.35,95.2 1 0
 github.com/muety/wakapi/models/shared.go:97.34,99.2 1 0
-github.com/muety/wakapi/models/filters.go:16.56,17.16 1 0
-github.com/muety/wakapi/models/filters.go:29.2,29.19 1 0
-github.com/muety/wakapi/models/filters.go:18.22,19.32 1 0
-github.com/muety/wakapi/models/filters.go:20.17,21.27 1 0
-github.com/muety/wakapi/models/filters.go:22.23,23.33 1 0
-github.com/muety/wakapi/models/filters.go:24.21,25.31 1 0
-github.com/muety/wakapi/models/filters.go:26.22,27.32 1 0
-github.com/muety/wakapi/models/filters.go:32.47,33.21 1 1
-github.com/muety/wakapi/models/filters.go:44.2,44.21 1 1
-github.com/muety/wakapi/models/filters.go:33.21,35.3 1 1
-github.com/muety/wakapi/models/filters.go:35.8,35.23 1 1
-github.com/muety/wakapi/models/filters.go:35.23,37.3 1 0
-github.com/muety/wakapi/models/filters.go:37.8,37.29 1 1
-github.com/muety/wakapi/models/filters.go:37.29,39.3 1 1
-github.com/muety/wakapi/models/filters.go:39.8,39.27 1 1
-github.com/muety/wakapi/models/filters.go:39.27,41.3 1 0
-github.com/muety/wakapi/models/filters.go:41.8,41.28 1 1
-github.com/muety/wakapi/models/filters.go:41.28,43.3 1 0
-github.com/muety/wakapi/models/interval.go:39.47,40.23 1 0
-github.com/muety/wakapi/models/interval.go:45.2,45.14 1 0
-github.com/muety/wakapi/models/interval.go:40.23,41.13 1 0
-github.com/muety/wakapi/models/interval.go:41.13,43.4 1 0
-github.com/muety/wakapi/models/heartbeats.go:7.31,9.2 1 0
-github.com/muety/wakapi/models/heartbeats.go:11.41,13.2 1 0
-github.com/muety/wakapi/models/heartbeats.go:15.36,17.2 1 0
-github.com/muety/wakapi/models/heartbeats.go:19.43,22.2 2 0
-github.com/muety/wakapi/models/heartbeats.go:24.41,26.18 1 0
-github.com/muety/wakapi/models/heartbeats.go:29.2,29.16 1 0
-github.com/muety/wakapi/models/heartbeats.go:26.18,28.3 1 0
-github.com/muety/wakapi/models/heartbeats.go:32.40,34.18 1 0
-github.com/muety/wakapi/models/heartbeats.go:37.2,37.24 1 0
-github.com/muety/wakapi/models/heartbeats.go:34.18,36.3 1 0
-github.com/muety/wakapi/models/language_mapping.go:11.42,13.2 1 0
-github.com/muety/wakapi/models/language_mapping.go:15.51,17.2 1 0
-github.com/muety/wakapi/models/language_mapping.go:19.52,21.2 1 0
-github.com/muety/wakapi/models/models.go:3.14,5.2 0 1
 github.com/muety/wakapi/models/summary.go:69.29,71.2 1 1
 github.com/muety/wakapi/models/summary.go:73.37,80.2 6 1
 github.com/muety/wakapi/models/summary.go:82.35,84.2 1 1
@ -101,37 +100,142 @@ github.com/muety/wakapi/models/summary.go:212.11,220.6 1 1
 github.com/muety/wakapi/models/summary.go:237.33,239.2 1 1
 github.com/muety/wakapi/models/summary.go:241.43,243.2 1 1
 github.com/muety/wakapi/models/summary.go:245.38,247.2 1 1
-github.com/muety/wakapi/models/user.go:13.13,15.2 1 1
-github.com/muety/wakapi/models/user.go:63.43,66.2 1 0
-github.com/muety/wakapi/models/user.go:68.33,73.2 1 0
-github.com/muety/wakapi/models/user.go:75.45,77.2 1 0
-github.com/muety/wakapi/models/user.go:79.45,81.2 1 0
-github.com/muety/wakapi/models/user.go:83.39,85.2 1 0
+github.com/muety/wakapi/models/models.go:3.14,5.2 0 1
 github.com/muety/wakapi/models/alias.go:12.32,14.2 1 0
 github.com/muety/wakapi/models/alias.go:16.37,17.35 1 0
 github.com/muety/wakapi/models/alias.go:22.2,22.14 1 0
 github.com/muety/wakapi/models/alias.go:17.35,18.18 1 0
 github.com/muety/wakapi/models/alias.go:18.18,20.4 1 0
-github.com/muety/wakapi/models/heartbeat.go:13.13,15.2 1 1
-github.com/muety/wakapi/models/heartbeat.go:38.34,40.2 1 1
-github.com/muety/wakapi/models/heartbeat.go:42.65,44.45 2 1
-github.com/muety/wakapi/models/heartbeat.go:47.2,48.44 2 1
-github.com/muety/wakapi/models/heartbeat.go:51.2,51.42 1 1
-github.com/muety/wakapi/models/heartbeat.go:44.45,46.3 1 0
-github.com/muety/wakapi/models/heartbeat.go:48.44,50.3 1 0
-github.com/muety/wakapi/models/heartbeat.go:54.50,55.11 1 1
-github.com/muety/wakapi/models/heartbeat.go:68.2,68.15 1 1
-github.com/muety/wakapi/models/heartbeat.go:72.2,72.12 1 1
-github.com/muety/wakapi/models/heartbeat.go:56.22,57.18 1 1
-github.com/muety/wakapi/models/heartbeat.go:58.21,59.17 1 1
-github.com/muety/wakapi/models/heartbeat.go:60.23,61.19 1 1
-github.com/muety/wakapi/models/heartbeat.go:62.17,63.26 1 1
-github.com/muety/wakapi/models/heartbeat.go:64.22,65.18 1 1
-github.com/muety/wakapi/models/heartbeat.go:68.15,70.3 1 1
-github.com/muety/wakapi/models/heartbeat.go:75.37,91.2 1 0
-github.com/muety/wakapi/models/heartbeat.go:99.41,101.16 2 0
-github.com/muety/wakapi/models/heartbeat.go:104.2,105.10 2 0
-github.com/muety/wakapi/models/heartbeat.go:101.16,103.3 1 0
+github.com/muety/wakapi/models/filters.go:16.56,17.16 1 0
+github.com/muety/wakapi/models/filters.go:29.2,29.19 1 0
+github.com/muety/wakapi/models/filters.go:18.22,19.32 1 0
+github.com/muety/wakapi/models/filters.go:20.17,21.27 1 0
+github.com/muety/wakapi/models/filters.go:22.23,23.33 1 0
+github.com/muety/wakapi/models/filters.go:24.21,25.31 1 0
+github.com/muety/wakapi/models/filters.go:26.22,27.32 1 0
+github.com/muety/wakapi/models/filters.go:32.47,33.21 1 1
+github.com/muety/wakapi/models/filters.go:44.2,44.21 1 1
+github.com/muety/wakapi/models/filters.go:33.21,35.3 1 1
+github.com/muety/wakapi/models/filters.go:35.8,35.23 1 1
+github.com/muety/wakapi/models/filters.go:35.23,37.3 1 0
+github.com/muety/wakapi/models/filters.go:37.8,37.29 1 1
+github.com/muety/wakapi/models/filters.go:37.29,39.3 1 1
+github.com/muety/wakapi/models/filters.go:39.8,39.27 1 1
+github.com/muety/wakapi/models/filters.go:39.27,41.3 1 0
+github.com/muety/wakapi/models/filters.go:41.8,41.28 1 1
+github.com/muety/wakapi/models/filters.go:41.28,43.3 1 0
+github.com/muety/wakapi/models/interval.go:39.47,40.23 1 0
+github.com/muety/wakapi/models/interval.go:45.2,45.14 1 0
+github.com/muety/wakapi/models/interval.go:40.23,41.13 1 0
+github.com/muety/wakapi/models/interval.go:41.13,43.4 1 0
+github.com/muety/wakapi/models/language_mapping.go:11.42,13.2 1 0
+github.com/muety/wakapi/models/language_mapping.go:15.51,17.2 1 0
+github.com/muety/wakapi/models/language_mapping.go:19.52,21.2 1 0
+github.com/muety/wakapi/config/config.go:134.70,136.2 1 0
+github.com/muety/wakapi/config/config.go:138.65,140.2 1 0
+github.com/muety/wakapi/config/config.go:142.82,152.2 1 0
+github.com/muety/wakapi/config/config.go:154.31,156.2 1 0
+github.com/muety/wakapi/config/config.go:158.32,160.2 1 0
+github.com/muety/wakapi/config/config.go:162.74,163.19 1 0
+github.com/muety/wakapi/config/config.go:164.10,165.34 1 0
+github.com/muety/wakapi/config/config.go:165.34,174.4 8 0
+github.com/muety/wakapi/config/config.go:178.73,179.33 1 0
+github.com/muety/wakapi/config/config.go:179.33,187.17 5 0
+github.com/muety/wakapi/config/config.go:191.3,192.13 2 0
+github.com/muety/wakapi/config/config.go:187.17,189.4 1 0
+github.com/muety/wakapi/config/config.go:196.50,197.19 1 0
+github.com/muety/wakapi/config/config.go:210.2,210.12 1 0
+github.com/muety/wakapi/config/config.go:198.23,202.5 1 0
+github.com/muety/wakapi/config/config.go:203.26,206.5 1 0
+github.com/muety/wakapi/config/config.go:207.24,208.48 1 0
+github.com/muety/wakapi/config/config.go:213.53,224.2 1 1
+github.com/muety/wakapi/config/config.go:226.56,228.16 2 1
+github.com/muety/wakapi/config/config.go:232.2,239.3 1 1
+github.com/muety/wakapi/config/config.go:228.16,230.3 1 0
+github.com/muety/wakapi/config/config.go:242.54,244.2 1 1
+github.com/muety/wakapi/config/config.go:246.60,248.2 1 0
+github.com/muety/wakapi/config/config.go:250.59,252.2 1 0
+github.com/muety/wakapi/config/config.go:254.57,256.2 1 0
+github.com/muety/wakapi/config/config.go:258.53,260.2 1 0
+github.com/muety/wakapi/config/config.go:262.46,264.2 1 0
+github.com/muety/wakapi/config/config.go:266.29,268.2 1 1
+github.com/muety/wakapi/config/config.go:270.27,272.16 2 0
+github.com/muety/wakapi/config/config.go:275.2,278.16 3 0
+github.com/muety/wakapi/config/config.go:282.2,282.41 1 0
+github.com/muety/wakapi/config/config.go:272.16,274.3 1 0
+github.com/muety/wakapi/config/config.go:278.16,280.3 1 0
+github.com/muety/wakapi/config/config.go:285.48,297.16 3 0
+github.com/muety/wakapi/config/config.go:300.2,302.16 3 0
+github.com/muety/wakapi/config/config.go:306.2,306.55 1 0
+github.com/muety/wakapi/config/config.go:310.2,310.15 1 0
+github.com/muety/wakapi/config/config.go:297.16,299.3 1 0
+github.com/muety/wakapi/config/config.go:302.16,304.3 1 0
+github.com/muety/wakapi/config/config.go:306.55,308.3 1 0
+github.com/muety/wakapi/config/config.go:313.38,314.43 1 0
+github.com/muety/wakapi/config/config.go:317.2,317.15 1 0
+github.com/muety/wakapi/config/config.go:314.43,316.3 1 0
+github.com/muety/wakapi/config/config.go:320.45,321.27 1 0
+github.com/muety/wakapi/config/config.go:324.2,324.15 1 0
+github.com/muety/wakapi/config/config.go:321.27,323.3 1 0
+github.com/muety/wakapi/config/config.go:327.50,331.91 1 0
+github.com/muety/wakapi/config/config.go:331.91,332.29 1 0
+github.com/muety/wakapi/config/config.go:336.4,339.48 3 0
+github.com/muety/wakapi/config/config.go:342.4,342.39 1 0
+github.com/muety/wakapi/config/config.go:345.4,345.69 1 0
+github.com/muety/wakapi/config/config.go:332.29,334.5 1 0
+github.com/muety/wakapi/config/config.go:339.48,341.5 1 0
+github.com/muety/wakapi/config/config.go:342.39,344.5 1 0
+github.com/muety/wakapi/config/config.go:347.79,351.27 2 0
+github.com/muety/wakapi/config/config.go:358.4,358.16 1 0
+github.com/muety/wakapi/config/config.go:351.27,352.84 1 0
+github.com/muety/wakapi/config/config.go:352.84,353.57 1 0
+github.com/muety/wakapi/config/config.go:353.57,355.7 1 0
+github.com/muety/wakapi/config/config.go:360.17,362.3 1 0
+github.com/muety/wakapi/config/config.go:365.77,366.29 1 0
+github.com/muety/wakapi/config/config.go:371.2,371.19 1 0
+github.com/muety/wakapi/config/config.go:366.29,367.18 1 0
+github.com/muety/wakapi/config/config.go:367.18,369.4 1 0
+github.com/muety/wakapi/config/config.go:374.26,376.2 1 0
+github.com/muety/wakapi/config/config.go:378.20,380.2 1 0
+github.com/muety/wakapi/config/config.go:382.21,387.96 3 0
+github.com/muety/wakapi/config/config.go:391.2,399.52 5 0
+github.com/muety/wakapi/config/config.go:403.2,403.47 1 0
+github.com/muety/wakapi/config/config.go:409.2,409.70 1 0
+github.com/muety/wakapi/config/config.go:413.2,413.28 1 0
+github.com/muety/wakapi/config/config.go:417.2,417.29 1 0
+github.com/muety/wakapi/config/config.go:422.2,422.94 1 0
+github.com/muety/wakapi/config/config.go:426.2,427.14 2 0
+github.com/muety/wakapi/config/config.go:387.96,389.3 1 0
+github.com/muety/wakapi/config/config.go:399.52,401.3 1 0
+github.com/muety/wakapi/config/config.go:403.47,404.14 1 0
+github.com/muety/wakapi/config/config.go:404.14,406.4 1 0
+github.com/muety/wakapi/config/config.go:409.70,411.3 1 0
+github.com/muety/wakapi/config/config.go:413.28,415.3 1 0
+github.com/muety/wakapi/config/config.go:417.29,420.3 2 0
+github.com/muety/wakapi/config/config.go:422.94,424.3 1 0
+github.com/muety/wakapi/config/utils.go:5.78,7.22 2 0
+github.com/muety/wakapi/config/utils.go:13.2,13.11 1 0
+github.com/muety/wakapi/config/utils.go:7.22,8.18 1 0
+github.com/muety/wakapi/config/utils.go:11.3,11.12 1 0
+github.com/muety/wakapi/config/utils.go:8.18,10.4 1 0
+github.com/muety/wakapi/utils/template.go:8.41,10.16 2 0
+github.com/muety/wakapi/utils/template.go:13.2,13.23 1 0
+github.com/muety/wakapi/utils/template.go:10.16,12.3 1 0
+github.com/muety/wakapi/utils/template.go:16.37,17.30 1 0
+github.com/muety/wakapi/utils/template.go:20.2,20.10 1 0
+github.com/muety/wakapi/utils/template.go:17.30,19.3 1 0
+github.com/muety/wakapi/utils/filesystem.go:14.68,16.16 2 0
+github.com/muety/wakapi/utils/filesystem.go:20.2,21.15 2 0
+github.com/muety/wakapi/utils/filesystem.go:33.2,33.15 1 0
+github.com/muety/wakapi/utils/filesystem.go:16.16,18.3 1 0
+github.com/muety/wakapi/utils/filesystem.go:21.15,23.47 2 0
+github.com/muety/wakapi/utils/filesystem.go:23.47,25.23 2 0
+github.com/muety/wakapi/utils/filesystem.go:29.4,29.19 1 0
+github.com/muety/wakapi/utils/filesystem.go:25.23,27.5 1 0
+github.com/muety/wakapi/utils/color.go:8.90,10.32 2 0
+github.com/muety/wakapi/utils/color.go:15.2,15.15 1 0
+github.com/muety/wakapi/utils/color.go:10.32,11.50 1 0
+github.com/muety/wakapi/utils/color.go:11.50,13.4 1 0
 github.com/muety/wakapi/utils/common.go:10.48,12.2 1 0
 github.com/muety/wakapi/utils/common.go:14.52,16.2 1 0
 github.com/muety/wakapi/utils/common.go:18.40,20.2 1 0
@ -159,16 +263,13 @@ github.com/muety/wakapi/utils/date.go:71.2,71.13 1 0
 github.com/muety/wakapi/utils/date.go:59.36,62.3 2 0
 github.com/muety/wakapi/utils/date.go:63.21,66.3 2 0
 github.com/muety/wakapi/utils/date.go:67.21,70.3 2 0
-github.com/muety/wakapi/utils/filesystem.go:14.68,16.16 2 0
-github.com/muety/wakapi/utils/filesystem.go:20.2,21.15 2 0
-github.com/muety/wakapi/utils/filesystem.go:33.2,33.15 1 0
-github.com/muety/wakapi/utils/filesystem.go:16.16,18.3 1 0
-github.com/muety/wakapi/utils/filesystem.go:21.15,23.47 2 0
-github.com/muety/wakapi/utils/filesystem.go:23.47,25.23 2 0
-github.com/muety/wakapi/utils/filesystem.go:29.4,29.19 1 0
-github.com/muety/wakapi/utils/filesystem.go:25.23,27.5 1 0
 github.com/muety/wakapi/utils/http.go:9.73,12.58 3 0
 github.com/muety/wakapi/utils/http.go:12.58,14.3 1 0
+github.com/muety/wakapi/utils/strings.go:8.34,10.2 1 0
+github.com/muety/wakapi/utils/strings.go:12.77,13.29 1 0
+github.com/muety/wakapi/utils/strings.go:18.2,18.19 1 0
+github.com/muety/wakapi/utils/strings.go:13.29,14.18 1 0
+github.com/muety/wakapi/utils/strings.go:14.18,16.4 1 0
 github.com/muety/wakapi/utils/summary.go:10.66,11.40 1 0
 github.com/muety/wakapi/utils/summary.go:16.2,16.48 1 0
 github.com/muety/wakapi/utils/summary.go:11.40,12.27 1 0
@ -204,6 +305,9 @@ github.com/muety/wakapi/utils/summary.go:86.17,88.18 2 0
 github.com/muety/wakapi/utils/summary.go:88.18,90.5 1 0
 github.com/muety/wakapi/utils/summary.go:94.17,96.18 2 0
 github.com/muety/wakapi/utils/summary.go:96.18,98.5 1 0
+github.com/muety/wakapi/utils/summary.go:112.48,116.51 2 0
+github.com/muety/wakapi/utils/summary.go:119.2,119.12 1 0
+github.com/muety/wakapi/utils/summary.go:116.51,118.3 1 0
 github.com/muety/wakapi/utils/auth.go:16.79,18.54 2 0
 github.com/muety/wakapi/utils/auth.go:22.2,24.16 3 0
 github.com/muety/wakapi/utils/auth.go:28.2,30.45 3 0
@ -223,85 +327,6 @@ github.com/muety/wakapi/utils/auth.go:60.56,64.2 3 0
 github.com/muety/wakapi/utils/auth.go:66.55,69.16 3 0
 github.com/muety/wakapi/utils/auth.go:72.2,72.16 1 0
 github.com/muety/wakapi/utils/auth.go:69.16,71.3 1 0
-github.com/muety/wakapi/utils/color.go:8.90,10.32 2 0
-github.com/muety/wakapi/utils/color.go:15.2,15.15 1 0
-github.com/muety/wakapi/utils/color.go:10.32,11.50 1 0
-github.com/muety/wakapi/utils/color.go:11.50,13.4 1 0
-github.com/muety/wakapi/utils/strings.go:8.34,10.2 1 0
-github.com/muety/wakapi/utils/strings.go:12.77,13.29 1 0
-github.com/muety/wakapi/utils/strings.go:18.2,18.19 1 0
-github.com/muety/wakapi/utils/strings.go:13.29,14.18 1 0
-github.com/muety/wakapi/utils/strings.go:14.18,16.4 1 0
-github.com/muety/wakapi/utils/template.go:8.41,10.16 2 0
-github.com/muety/wakapi/utils/template.go:13.2,13.23 1 0
-github.com/muety/wakapi/utils/template.go:10.16,12.3 1 0
-github.com/muety/wakapi/utils/template.go:16.37,17.30 1 0
-github.com/muety/wakapi/utils/template.go:20.2,20.10 1 0
-github.com/muety/wakapi/utils/template.go:17.30,19.3 1 0
-github.com/muety/wakapi/config/config.go:104.70,106.2 1 0
-github.com/muety/wakapi/config/config.go:108.65,110.2 1 0
-github.com/muety/wakapi/config/config.go:112.82,122.2 1 0
-github.com/muety/wakapi/config/config.go:124.31,126.2 1 0
-github.com/muety/wakapi/config/config.go:128.32,130.2 1 0
-github.com/muety/wakapi/config/config.go:132.74,133.19 1 0
-github.com/muety/wakapi/config/config.go:134.10,135.34 1 0
-github.com/muety/wakapi/config/config.go:135.34,144.4 8 0
-github.com/muety/wakapi/config/config.go:148.73,149.33 1 0
-github.com/muety/wakapi/config/config.go:149.33,157.17 5 0
-github.com/muety/wakapi/config/config.go:161.3,162.13 2 0
-github.com/muety/wakapi/config/config.go:157.17,159.4 1 0
-github.com/muety/wakapi/config/config.go:166.50,167.19 1 0
-github.com/muety/wakapi/config/config.go:180.2,180.12 1 0
-github.com/muety/wakapi/config/config.go:168.23,172.5 1 0
-github.com/muety/wakapi/config/config.go:173.26,176.5 1 0
-github.com/muety/wakapi/config/config.go:177.24,178.48 1 0
-github.com/muety/wakapi/config/config.go:183.53,194.2 1 1
-github.com/muety/wakapi/config/config.go:196.56,198.16 2 1
-github.com/muety/wakapi/config/config.go:202.2,209.3 1 1
-github.com/muety/wakapi/config/config.go:198.16,200.3 1 0
-github.com/muety/wakapi/config/config.go:212.54,214.2 1 1
-github.com/muety/wakapi/config/config.go:216.60,218.2 1 0
-github.com/muety/wakapi/config/config.go:220.59,222.2 1 0
-github.com/muety/wakapi/config/config.go:224.57,226.2 1 0
-github.com/muety/wakapi/config/config.go:228.53,230.2 1 0
-github.com/muety/wakapi/config/config.go:232.29,234.2 1 1
-github.com/muety/wakapi/config/config.go:236.27,238.16 2 0
-github.com/muety/wakapi/config/config.go:241.2,244.16 3 0
-github.com/muety/wakapi/config/config.go:248.2,248.41 1 0
-github.com/muety/wakapi/config/config.go:238.16,240.3 1 0
-github.com/muety/wakapi/config/config.go:244.16,246.3 1 0
-github.com/muety/wakapi/config/config.go:251.48,263.16 3 0
-github.com/muety/wakapi/config/config.go:266.2,268.16 3 0
-github.com/muety/wakapi/config/config.go:272.2,272.55 1 0
-github.com/muety/wakapi/config/config.go:276.2,276.15 1 0
-github.com/muety/wakapi/config/config.go:263.16,265.3 1 0
-github.com/muety/wakapi/config/config.go:268.16,270.3 1 0
-github.com/muety/wakapi/config/config.go:272.55,274.3 1 0
-github.com/muety/wakapi/config/config.go:279.38,280.43 1 0
-github.com/muety/wakapi/config/config.go:283.2,283.15 1 0
-github.com/muety/wakapi/config/config.go:280.43,282.3 1 0
-github.com/muety/wakapi/config/config.go:286.45,287.27 1 0
-github.com/muety/wakapi/config/config.go:290.2,290.15 1 0
-github.com/muety/wakapi/config/config.go:287.27,289.3 1 0
-github.com/muety/wakapi/config/config.go:293.26,295.2 1 0
-github.com/muety/wakapi/config/config.go:297.20,299.2 1 0
-github.com/muety/wakapi/config/config.go:301.21,306.96 3 0
-github.com/muety/wakapi/config/config.go:310.2,318.52 5 0
-github.com/muety/wakapi/config/config.go:322.2,322.47 1 0
-github.com/muety/wakapi/config/config.go:328.2,328.70 1 0
-github.com/muety/wakapi/config/config.go:332.2,332.28 1 0
-github.com/muety/wakapi/config/config.go:336.2,337.14 2 0
-github.com/muety/wakapi/config/config.go:306.96,308.3 1 0
-github.com/muety/wakapi/config/config.go:318.52,320.3 1 0
-github.com/muety/wakapi/config/config.go:322.47,323.14 1 0
-github.com/muety/wakapi/config/config.go:323.14,325.4 1 0
-github.com/muety/wakapi/config/config.go:328.70,330.3 1 0
-github.com/muety/wakapi/config/config.go:332.28,334.3 1 0
-github.com/muety/wakapi/config/utils.go:5.78,7.22 2 0
-github.com/muety/wakapi/config/utils.go:13.2,13.11 1 0
-github.com/muety/wakapi/config/utils.go:7.22,8.18 1 0
-github.com/muety/wakapi/config/utils.go:11.3,11.12 1 0
-github.com/muety/wakapi/config/utils.go:8.18,10.4 1 0
 github.com/muety/wakapi/middlewares/filetype.go:13.83,14.43 1 0
 github.com/muety/wakapi/middlewares/filetype.go:14.43,19.3 1 0
 github.com/muety/wakapi/middlewares/filetype.go:22.84,24.34 2 0
@ -311,56 +336,169 @@ github.com/muety/wakapi/middlewares/filetype.go:25.50,29.4 3 0
 github.com/muety/wakapi/middlewares/logging.go:20.102,21.43 1 0
 github.com/muety/wakapi/middlewares/logging.go:21.43,27.3 1 0
 github.com/muety/wakapi/middlewares/logging.go:30.80,39.44 7 0
-github.com/muety/wakapi/middlewares/logging.go:45.2,53.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:45.2,54.3 1 0
 github.com/muety/wakapi/middlewares/logging.go:39.44,40.38 1 0
 github.com/muety/wakapi/middlewares/logging.go:40.38,42.4 1 0
-github.com/muety/wakapi/middlewares/logging.go:56.41,58.14 2 0
-github.com/muety/wakapi/middlewares/logging.go:61.2,61.14 1 0
-github.com/muety/wakapi/middlewares/logging.go:64.2,64.11 1 0
-github.com/muety/wakapi/middlewares/logging.go:58.14,60.3 1 0
-github.com/muety/wakapi/middlewares/logging.go:61.14,63.3 1 0
-github.com/muety/wakapi/middlewares/logging.go:95.52,97.2 1 0
-github.com/muety/wakapi/middlewares/logging.go:109.45,110.20 1 0
-github.com/muety/wakapi/middlewares/logging.go:110.20,114.3 3 0
-github.com/muety/wakapi/middlewares/logging.go:116.54,119.18 3 0
-github.com/muety/wakapi/middlewares/logging.go:126.2,127.15 2 0
-github.com/muety/wakapi/middlewares/logging.go:119.18,122.17 2 0
-github.com/muety/wakapi/middlewares/logging.go:122.17,124.4 1 0
-github.com/muety/wakapi/middlewares/logging.go:129.42,130.20 1 0
-github.com/muety/wakapi/middlewares/logging.go:130.20,132.3 1 0
-github.com/muety/wakapi/middlewares/logging.go:134.36,136.2 1 0
-github.com/muety/wakapi/middlewares/logging.go:137.42,139.2 1 0
-github.com/muety/wakapi/middlewares/logging.go:140.40,142.2 1 0
-github.com/muety/wakapi/middlewares/logging.go:143.52,145.2 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:20.91,26.2 1 1
-github.com/muety/wakapi/middlewares/authenticate.go:28.90,31.2 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:33.90,36.2 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:38.71,39.71 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:39.71,41.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:44.107,48.16 3 0
-github.com/muety/wakapi/middlewares/authenticate.go:52.2,52.31 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:68.2,69.29 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:48.16,50.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:52.31,53.31 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:58.3,58.29 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:65.3,65.9 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:53.31,56.4 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:58.29,61.4 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:61.9,64.4 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:72.70,73.39 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:78.2,78.14 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:73.39,74.60 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:74.60,76.4 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:81.92,83.16 2 1
-github.com/muety/wakapi/middlewares/authenticate.go:87.2,90.16 4 1
-github.com/muety/wakapi/middlewares/authenticate.go:93.2,93.18 1 1
-github.com/muety/wakapi/middlewares/authenticate.go:83.16,85.3 1 1
-github.com/muety/wakapi/middlewares/authenticate.go:90.16,92.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:96.92,98.16 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:102.2,103.16 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:110.2,110.18 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:98.16,100.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:103.16,105.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:57.41,59.14 2 0
+github.com/muety/wakapi/middlewares/logging.go:62.2,62.14 1 0
+github.com/muety/wakapi/middlewares/logging.go:65.2,65.11 1 0
+github.com/muety/wakapi/middlewares/logging.go:59.14,61.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:62.14,64.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:68.41,69.42 1 0
+github.com/muety/wakapi/middlewares/logging.go:72.2,72.12 1 0
+github.com/muety/wakapi/middlewares/logging.go:69.42,71.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:103.52,105.2 1 0
+github.com/muety/wakapi/middlewares/logging.go:117.45,118.20 1 0
+github.com/muety/wakapi/middlewares/logging.go:118.20,122.3 3 0
+github.com/muety/wakapi/middlewares/logging.go:124.54,127.18 3 0
+github.com/muety/wakapi/middlewares/logging.go:134.2,135.15 2 0
+github.com/muety/wakapi/middlewares/logging.go:127.18,130.17 2 0
+github.com/muety/wakapi/middlewares/logging.go:130.17,132.4 1 0
+github.com/muety/wakapi/middlewares/logging.go:137.42,138.20 1 0
+github.com/muety/wakapi/middlewares/logging.go:138.20,140.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:142.36,144.2 1 0
+github.com/muety/wakapi/middlewares/logging.go:145.42,147.2 1 0
+github.com/muety/wakapi/middlewares/logging.go:148.40,150.2 1 0
+github.com/muety/wakapi/middlewares/logging.go:151.52,153.2 1 0
+github.com/muety/wakapi/middlewares/principal.go:15.62,17.2 1 0
+github.com/muety/wakapi/middlewares/principal.go:19.58,21.2 1 0
+github.com/muety/wakapi/middlewares/principal.go:42.71,43.43 1 0
+github.com/muety/wakapi/middlewares/principal.go:43.43,45.3 1 0
+github.com/muety/wakapi/middlewares/principal.go:48.81,51.2 2 0
+github.com/muety/wakapi/middlewares/principal.go:53.55,54.52 1 0
+github.com/muety/wakapi/middlewares/principal.go:54.52,56.3 1 0
+github.com/muety/wakapi/middlewares/principal.go:59.49,60.52 1 0
+github.com/muety/wakapi/middlewares/principal.go:63.2,63.12 1 0
+github.com/muety/wakapi/middlewares/principal.go:60.52,62.3 1 0
+github.com/muety/wakapi/middlewares/sentry.go:14.60,15.43 1 0
+github.com/muety/wakapi/middlewares/sentry.go:15.43,19.3 1 0
+github.com/muety/wakapi/middlewares/sentry.go:22.78,25.54 3 0
+github.com/muety/wakapi/middlewares/sentry.go:25.54,26.43 1 0
+github.com/muety/wakapi/middlewares/sentry.go:26.43,28.4 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:19.91,25.2 1 1
+github.com/muety/wakapi/middlewares/authenticate.go:27.90,30.2 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:32.90,35.2 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:37.71,38.71 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:38.71,40.3 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:43.107,47.16 3 0
+github.com/muety/wakapi/middlewares/authenticate.go:51.2,51.31 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:67.2,68.12 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:47.16,49.3 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:51.31,52.31 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:57.3,57.29 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:64.3,64.9 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:52.31,55.4 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:57.29,60.4 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:60.9,63.4 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:71.70,72.39 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:77.2,77.14 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:72.39,73.60 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:73.60,75.4 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:80.92,82.16 2 1
+github.com/muety/wakapi/middlewares/authenticate.go:86.2,89.16 4 1
+github.com/muety/wakapi/middlewares/authenticate.go:92.2,92.18 1 1
+github.com/muety/wakapi/middlewares/authenticate.go:82.16,84.3 1 1
+github.com/muety/wakapi/middlewares/authenticate.go:89.16,91.3 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:95.92,97.16 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:101.2,102.16 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:109.2,109.18 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:97.16,99.3 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:102.16,104.3 1 0
+github.com/muety/wakapi/services/alias.go:17.77,22.2 1 1
+github.com/muety/wakapi/services/alias.go:26.60,27.43 1 1
+github.com/muety/wakapi/services/alias.go:30.2,30.14 1 1
+github.com/muety/wakapi/services/alias.go:27.43,29.3 1 1
+github.com/muety/wakapi/services/alias.go:33.62,35.16 2 1
+github.com/muety/wakapi/services/alias.go:38.2,38.12 1 1
+github.com/muety/wakapi/services/alias.go:35.16,37.3 1 1
+github.com/muety/wakapi/services/alias.go:41.76,43.16 2 0
+github.com/muety/wakapi/services/alias.go:46.2,46.21 1 0
+github.com/muety/wakapi/services/alias.go:43.16,45.3 1 0
+github.com/muety/wakapi/services/alias.go:49.113,51.16 2 0
+github.com/muety/wakapi/services/alias.go:54.2,54.21 1 0
+github.com/muety/wakapi/services/alias.go:51.16,53.3 1 0
+github.com/muety/wakapi/services/alias.go:57.108,58.32 1 1
+github.com/muety/wakapi/services/alias.go:64.2,65.46 2 1
+github.com/muety/wakapi/services/alias.go:70.2,70.19 1 1
+github.com/muety/wakapi/services/alias.go:58.32,59.52 1 1
+github.com/muety/wakapi/services/alias.go:59.52,61.4 1 1
+github.com/muety/wakapi/services/alias.go:65.46,66.48 1 1
+github.com/muety/wakapi/services/alias.go:66.48,68.4 1 1
+github.com/muety/wakapi/services/alias.go:73.77,75.16 2 0
+github.com/muety/wakapi/services/alias.go:78.2,79.20 2 0
+github.com/muety/wakapi/services/alias.go:75.16,77.3 1 0
+github.com/muety/wakapi/services/alias.go:82.60,83.24 1 0
+github.com/muety/wakapi/services/alias.go:86.2,88.12 3 0
+github.com/muety/wakapi/services/alias.go:83.24,85.3 1 0
+github.com/muety/wakapi/services/alias.go:91.69,94.28 3 0
+github.com/muety/wakapi/services/alias.go:102.2,104.31 2 0
+github.com/muety/wakapi/services/alias.go:108.2,108.12 1 0
+github.com/muety/wakapi/services/alias.go:94.28,95.21 1 0
+github.com/muety/wakapi/services/alias.go:98.3,99.16 2 0
+github.com/muety/wakapi/services/alias.go:95.21,97.4 1 0
+github.com/muety/wakapi/services/alias.go:104.31,106.3 1 0
+github.com/muety/wakapi/services/alias.go:111.52,112.51 1 0
+github.com/muety/wakapi/services/alias.go:112.51,114.3 1 0
+github.com/muety/wakapi/services/aggregation.go:24.142,31.2 1 0
+github.com/muety/wakapi/services/aggregation.go:40.43,42.37 1 0
+github.com/muety/wakapi/services/aggregation.go:46.2,48.19 3 0
+github.com/muety/wakapi/services/aggregation.go:42.37,44.3 1 0
+github.com/muety/wakapi/services/aggregation.go:51.67,55.40 3 0
+github.com/muety/wakapi/services/aggregation.go:59.2,59.50 1 0
+github.com/muety/wakapi/services/aggregation.go:64.2,64.60 1 0
+github.com/muety/wakapi/services/aggregation.go:70.2,70.35 1 0
+github.com/muety/wakapi/services/aggregation.go:55.40,57.3 1 0
+github.com/muety/wakapi/services/aggregation.go:59.50,61.3 1 0
+github.com/muety/wakapi/services/aggregation.go:64.60,68.3 3 0
+github.com/muety/wakapi/services/aggregation.go:73.109,74.24 1 0
+github.com/muety/wakapi/services/aggregation.go:74.24,75.111 1 0
+github.com/muety/wakapi/services/aggregation.go:75.111,77.4 1 0
+github.com/muety/wakapi/services/aggregation.go:77.9,80.4 2 0
+github.com/muety/wakapi/services/aggregation.go:84.80,85.33 1 0
+github.com/muety/wakapi/services/aggregation.go:85.33,86.60 1 0
+github.com/muety/wakapi/services/aggregation.go:86.60,88.4 1 0
+github.com/muety/wakapi/services/aggregation.go:92.100,96.59 3 0
+github.com/muety/wakapi/services/aggregation.go:111.2,112.16 2 0
+github.com/muety/wakapi/services/aggregation.go:118.2,119.16 2 0
+github.com/muety/wakapi/services/aggregation.go:125.2,126.44 2 0
+github.com/muety/wakapi/services/aggregation.go:131.2,131.41 1 0
+github.com/muety/wakapi/services/aggregation.go:145.2,145.12 1 0
+github.com/muety/wakapi/services/aggregation.go:96.59,99.3 2 0
+github.com/muety/wakapi/services/aggregation.go:99.8,99.47 1 0
+github.com/muety/wakapi/services/aggregation.go:99.47,101.30 2 0
+github.com/muety/wakapi/services/aggregation.go:101.30,102.43 1 0
+github.com/muety/wakapi/services/aggregation.go:102.43,104.5 1 0
+github.com/muety/wakapi/services/aggregation.go:106.8,108.3 1 0
+github.com/muety/wakapi/services/aggregation.go:112.16,115.3 2 0
+github.com/muety/wakapi/services/aggregation.go:119.16,122.3 2 0
+github.com/muety/wakapi/services/aggregation.go:126.44,128.3 1 0
+github.com/muety/wakapi/services/aggregation.go:131.41,132.21 1 0
+github.com/muety/wakapi/services/aggregation.go:132.21,136.4 1 0
+github.com/muety/wakapi/services/aggregation.go:136.9,136.62 1 0
+github.com/muety/wakapi/services/aggregation.go:136.62,140.4 1 0
+github.com/muety/wakapi/services/aggregation.go:148.83,163.41 5 0
+github.com/muety/wakapi/services/aggregation.go:163.41,173.3 3 0
+github.com/muety/wakapi/services/aggregation.go:176.34,179.2 2 0
+github.com/muety/wakapi/services/heartbeat.go:17.141,23.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:25.72,27.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:29.80,34.32 3 0
+github.com/muety/wakapi/services/heartbeat.go:41.2,41.55 1 0
+github.com/muety/wakapi/services/heartbeat.go:34.32,35.36 1 0
+github.com/muety/wakapi/services/heartbeat.go:35.36,38.4 2 0
+github.com/muety/wakapi/services/heartbeat.go:44.53,46.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:48.76,50.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:52.96,54.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:56.111,58.16 2 0
+github.com/muety/wakapi/services/heartbeat.go:61.2,61.43 1 0
+github.com/muety/wakapi/services/heartbeat.go:58.16,60.3 1 0
+github.com/muety/wakapi/services/heartbeat.go:64.116,66.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:68.78,70.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:72.62,74.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:76.116,78.16 2 0
+github.com/muety/wakapi/services/heartbeat.go:82.2,82.28 1 0
+github.com/muety/wakapi/services/heartbeat.go:86.2,86.24 1 0
+github.com/muety/wakapi/services/heartbeat.go:78.16,80.3 1 0
+github.com/muety/wakapi/services/heartbeat.go:82.28,84.3 1 0
 github.com/muety/wakapi/services/key_value.go:14.89,19.2 1 0
 github.com/muety/wakapi/services/key_value.go:21.83,23.2 1 0
 github.com/muety/wakapi/services/key_value.go:25.78,27.16 2 0
@ -399,9 +537,9 @@ github.com/muety/wakapi/services/misc.go:66.56,67.27 1 0
 github.com/muety/wakapi/services/misc.go:67.27,72.4 1 0
 github.com/muety/wakapi/services/misc.go:73.8,75.3 1 0
 github.com/muety/wakapi/services/misc.go:80.116,81.24 1 0
-github.com/muety/wakapi/services/misc.go:81.24,82.144 1 0
+github.com/muety/wakapi/services/misc.go:81.24,82.151 1 0
 github.com/muety/wakapi/services/misc.go:91.3,91.48 1 0
-github.com/muety/wakapi/services/misc.go:82.144,84.4 1 0
+github.com/muety/wakapi/services/misc.go:82.151,84.4 1 0
 github.com/muety/wakapi/services/misc.go:84.9,90.4 2 0
 github.com/muety/wakapi/services/misc.go:91.48,94.4 2 0
 github.com/muety/wakapi/services/misc.go:98.86,101.30 3 0
@ -411,12 +549,12 @@ github.com/muety/wakapi/services/misc.go:101.30,104.3 2 0
 github.com/muety/wakapi/services/misc.go:109.17,111.3 1 0
 github.com/muety/wakapi/services/misc.go:116.17,118.3 1 0
 github.com/muety/wakapi/services/summary.go:27.149,35.2 1 1
-github.com/muety/wakapi/services/summary.go:39.120,42.52 2 1
+github.com/muety/wakapi/services/summary.go:39.136,42.66 2 1
 github.com/muety/wakapi/services/summary.go:47.2,47.44 1 1
 github.com/muety/wakapi/services/summary.go:53.2,53.65 1 1
 github.com/muety/wakapi/services/summary.go:58.2,59.16 2 1
 github.com/muety/wakapi/services/summary.go:64.2,66.30 3 1
-github.com/muety/wakapi/services/summary.go:42.52,44.3 1 0
+github.com/muety/wakapi/services/summary.go:42.66,44.3 1 0
 github.com/muety/wakapi/services/summary.go:47.44,50.3 2 1
 github.com/muety/wakapi/services/summary.go:53.65,55.3 1 0
 github.com/muety/wakapi/services/summary.go:59.16,61.3 1 0
@ -499,63 +637,6 @@ github.com/muety/wakapi/services/summary.go:324.54,326.3 1 1
 github.com/muety/wakapi/services/summary.go:331.59,333.25 2 1
 github.com/muety/wakapi/services/summary.go:336.2,336.32 1 1
 github.com/muety/wakapi/services/summary.go:333.25,335.3 1 1
-github.com/muety/wakapi/services/aggregation.go:24.142,31.2 1 0
-github.com/muety/wakapi/services/aggregation.go:40.43,42.37 1 0
-github.com/muety/wakapi/services/aggregation.go:46.2,48.19 3 0
-github.com/muety/wakapi/services/aggregation.go:42.37,44.3 1 0
-github.com/muety/wakapi/services/aggregation.go:51.67,55.40 3 0
-github.com/muety/wakapi/services/aggregation.go:59.2,59.50 1 0
-github.com/muety/wakapi/services/aggregation.go:64.2,64.60 1 0
-github.com/muety/wakapi/services/aggregation.go:70.2,70.35 1 0
-github.com/muety/wakapi/services/aggregation.go:55.40,57.3 1 0
-github.com/muety/wakapi/services/aggregation.go:59.50,61.3 1 0
-github.com/muety/wakapi/services/aggregation.go:64.60,68.3 3 0
-github.com/muety/wakapi/services/aggregation.go:73.109,74.24 1 0
-github.com/muety/wakapi/services/aggregation.go:74.24,75.111 1 0
-github.com/muety/wakapi/services/aggregation.go:75.111,77.4 1 0
-github.com/muety/wakapi/services/aggregation.go:77.9,80.4 2 0
-github.com/muety/wakapi/services/aggregation.go:84.80,85.33 1 0
-github.com/muety/wakapi/services/aggregation.go:85.33,86.60 1 0
-github.com/muety/wakapi/services/aggregation.go:86.60,88.4 1 0
-github.com/muety/wakapi/services/aggregation.go:92.100,96.59 3 0
-github.com/muety/wakapi/services/aggregation.go:111.2,112.16 2 0
-github.com/muety/wakapi/services/aggregation.go:118.2,119.16 2 0
-github.com/muety/wakapi/services/aggregation.go:125.2,126.44 2 0
-github.com/muety/wakapi/services/aggregation.go:131.2,131.41 1 0
-github.com/muety/wakapi/services/aggregation.go:145.2,145.12 1 0
-github.com/muety/wakapi/services/aggregation.go:96.59,99.3 2 0
-github.com/muety/wakapi/services/aggregation.go:99.8,99.47 1 0
-github.com/muety/wakapi/services/aggregation.go:99.47,101.30 2 0
-github.com/muety/wakapi/services/aggregation.go:101.30,102.43 1 0
-github.com/muety/wakapi/services/aggregation.go:102.43,104.5 1 0
-github.com/muety/wakapi/services/aggregation.go:106.8,108.3 1 0
-github.com/muety/wakapi/services/aggregation.go:112.16,115.3 2 0
-github.com/muety/wakapi/services/aggregation.go:119.16,122.3 2 0
-github.com/muety/wakapi/services/aggregation.go:126.44,128.3 1 0
-github.com/muety/wakapi/services/aggregation.go:131.41,132.21 1 0
-github.com/muety/wakapi/services/aggregation.go:132.21,136.4 1 0
-github.com/muety/wakapi/services/aggregation.go:136.9,136.62 1 0
-github.com/muety/wakapi/services/aggregation.go:136.62,140.4 1 0
-github.com/muety/wakapi/services/aggregation.go:148.83,163.41 5 0
-github.com/muety/wakapi/services/aggregation.go:163.41,173.3 3 0
-github.com/muety/wakapi/services/aggregation.go:176.34,179.2 2 0
-github.com/muety/wakapi/services/heartbeat.go:17.141,23.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:25.72,27.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:29.80,31.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:33.53,35.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:37.76,39.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:41.96,43.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:45.111,47.16 2 0
-github.com/muety/wakapi/services/heartbeat.go:50.2,50.43 1 0
-github.com/muety/wakapi/services/heartbeat.go:47.16,49.3 1 0
-github.com/muety/wakapi/services/heartbeat.go:53.116,55.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:57.78,59.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:61.62,63.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:65.116,67.16 2 0
-github.com/muety/wakapi/services/heartbeat.go:71.2,71.28 1 0
-github.com/muety/wakapi/services/heartbeat.go:75.2,75.24 1 0
-github.com/muety/wakapi/services/heartbeat.go:67.16,69.3 1 0
-github.com/muety/wakapi/services/heartbeat.go:71.28,73.3 1 0
 github.com/muety/wakapi/services/user.go:19.73,25.2 1 0
 github.com/muety/wakapi/services/user.go:27.74,28.40 1 0
 github.com/muety/wakapi/services/user.go:32.2,33.16 2 0
@ -567,54 +648,22 @@ github.com/muety/wakapi/services/user.go:46.2,47.16 2 0
 github.com/muety/wakapi/services/user.go:51.2,52.15 2 0
 github.com/muety/wakapi/services/user.go:42.37,44.3 1 0
 github.com/muety/wakapi/services/user.go:47.16,49.3 1 0
-github.com/muety/wakapi/services/user.go:55.58,57.2 1 0
-github.com/muety/wakapi/services/user.go:59.61,62.2 2 0
-github.com/muety/wakapi/services/user.go:64.48,66.2 1 0
-github.com/muety/wakapi/services/user.go:68.102,77.93 2 0
-github.com/muety/wakapi/services/user.go:83.2,83.38 1 0
-github.com/muety/wakapi/services/user.go:77.93,79.3 1 0
-github.com/muety/wakapi/services/user.go:79.8,81.3 1 0
-github.com/muety/wakapi/services/user.go:86.73,89.2 2 0
-github.com/muety/wakapi/services/user.go:91.78,95.2 3 0
-github.com/muety/wakapi/services/user.go:97.99,100.2 2 0
-github.com/muety/wakapi/services/user.go:102.106,105.96 3 0
-github.com/muety/wakapi/services/user.go:110.2,110.68 1 0
-github.com/muety/wakapi/services/user.go:105.96,107.3 1 0
-github.com/muety/wakapi/services/user.go:107.8,109.3 1 0
-github.com/muety/wakapi/services/user.go:113.57,116.2 2 0
-github.com/muety/wakapi/services/user.go:118.38,120.2 1 0
-github.com/muety/wakapi/services/alias.go:17.77,22.2 1 1
-github.com/muety/wakapi/services/alias.go:26.60,27.43 1 1
-github.com/muety/wakapi/services/alias.go:30.2,30.14 1 1
-github.com/muety/wakapi/services/alias.go:27.43,29.3 1 1
-github.com/muety/wakapi/services/alias.go:33.62,35.16 2 1
-github.com/muety/wakapi/services/alias.go:38.2,38.12 1 1
-github.com/muety/wakapi/services/alias.go:35.16,37.3 1 1
-github.com/muety/wakapi/services/alias.go:41.76,43.16 2 0
-github.com/muety/wakapi/services/alias.go:46.2,46.21 1 0
-github.com/muety/wakapi/services/alias.go:43.16,45.3 1 0
-github.com/muety/wakapi/services/alias.go:49.113,51.16 2 0
-github.com/muety/wakapi/services/alias.go:54.2,54.21 1 0
-github.com/muety/wakapi/services/alias.go:51.16,53.3 1 0
-github.com/muety/wakapi/services/alias.go:57.108,58.32 1 1
-github.com/muety/wakapi/services/alias.go:64.2,65.46 2 1
-github.com/muety/wakapi/services/alias.go:70.2,70.19 1 1
-github.com/muety/wakapi/services/alias.go:58.32,59.52 1 1
-github.com/muety/wakapi/services/alias.go:59.52,61.4 1 1
-github.com/muety/wakapi/services/alias.go:65.46,66.48 1 1
-github.com/muety/wakapi/services/alias.go:66.48,68.4 1 1
-github.com/muety/wakapi/services/alias.go:73.77,75.16 2 0
-github.com/muety/wakapi/services/alias.go:78.2,79.20 2 0
-github.com/muety/wakapi/services/alias.go:75.16,77.3 1 0
-github.com/muety/wakapi/services/alias.go:82.60,83.24 1 0
-github.com/muety/wakapi/services/alias.go:86.2,88.12 3 0
-github.com/muety/wakapi/services/alias.go:83.24,85.3 1 0
-github.com/muety/wakapi/services/alias.go:91.69,94.28 3 0
-github.com/muety/wakapi/services/alias.go:102.2,104.31 2 0
-github.com/muety/wakapi/services/alias.go:108.2,108.12 1 0
-github.com/muety/wakapi/services/alias.go:94.28,95.21 1 0
-github.com/muety/wakapi/services/alias.go:98.3,99.16 2 0
-github.com/muety/wakapi/services/alias.go:95.21,97.4 1 0
-github.com/muety/wakapi/services/alias.go:104.31,106.3 1 0
-github.com/muety/wakapi/services/alias.go:111.52,112.51 1 0
-github.com/muety/wakapi/services/alias.go:112.51,114.3 1 0
+github.com/muety/wakapi/services/user.go:55.76,57.2 1 0
+github.com/muety/wakapi/services/user.go:59.86,61.2 1 0
+github.com/muety/wakapi/services/user.go:63.58,65.2 1 0
+github.com/muety/wakapi/services/user.go:67.61,70.2 2 0
+github.com/muety/wakapi/services/user.go:72.48,74.2 1 0
+github.com/muety/wakapi/services/user.go:76.102,85.93 2 0
+github.com/muety/wakapi/services/user.go:91.2,91.38 1 0
+github.com/muety/wakapi/services/user.go:85.93,87.3 1 0
+github.com/muety/wakapi/services/user.go:87.8,89.3 1 0
+github.com/muety/wakapi/services/user.go:94.73,97.2 2 0
+github.com/muety/wakapi/services/user.go:99.78,103.2 3 0
+github.com/muety/wakapi/services/user.go:105.99,108.2 2 0
+github.com/muety/wakapi/services/user.go:110.106,113.96 3 0
+github.com/muety/wakapi/services/user.go:118.2,118.68 1 0
+github.com/muety/wakapi/services/user.go:113.96,115.3 1 0
+github.com/muety/wakapi/services/user.go:115.8,117.3 1 0
+github.com/muety/wakapi/services/user.go:121.85,123.2 1 0
+github.com/muety/wakapi/services/user.go:125.57,128.2 2 0
+github.com/muety/wakapi/services/user.go:130.38,132.2 1 0
--- a/data/colors.json
+++ b/data/colors.json
@ -210,6 +210,7 @@
    "Stan": "#b2011d",
    "Standard ML": "#dc566d",
    "SuperCollider": "#46390b",
+    "Svelte": "#ff3e00",
    "Swift": "#ffac45",
    "SystemVerilog": "#DAE1C2",
    "Tcl": "#e4cc98",
--- a/docs/advanced_setup.md
+++ b/docs/advanced_setup.md
@ -1,47 +0,0 @@
-# Advanced Setup
-This page contains instructions for additional setup options, none of which are mandatory.
-
-## Optional: Client-side proxy
-Most Wakatime plugins work in a way that, for every heartbeat to send, the plugin calls your local [wakatime-cli](https://github.com/wakatime/wakatime) (a small Python program that is automatically installed when installing a Wakatime plugin) with a few command-line arguments, which is then run as a new process. Inside that process, a heartbeat request is forged and sent to the backend API – Wakapi in this case.
-
-While this is convenient for plugin developers, as they do not have to deal with sending HTTP requests, etc., it comes with a minor drawback. Because the CLI process shuts down after each request, its TCP connection is closed as well. Accordingly, **TCP connections cannot be re-used** and every single heartbeat request is inevitably preceded by the `SYN` + `SYN ACK` + `ACK` sequence for establishing a new TCP connection as well as a handshake for establishing a new TLS session.
-
-While this certainly does not hurt, it is still a bit of overhead. You can avoid that by setting up a local reverse proxy on your machine, that keeps running as a daemon and can therefore keep a continuous connection.
-
-### Option 1: [tinyproxy](https://tinyproxy.github.io) forward proxy (`Linux`, `Mac` only)
-In this example we use _tinyproxy_ as a small, easy-to-install proxy server, written in C, that runs on your local machine.
-1. Install [tinyproxy](https://tinyproxy.github.io)
-   * Fedora / RHEL: `dnf install tinyproxy`
-   * Debian / Ubuntu: `apt install tinyproxy`
-   * MacOS: Install from [MacPorts](https://ports.macports.org/port/tinyproxy/summary)
-1. Enable and start it
-   * Linux: `sudo systemctl start tinyproxy && sudo systemctl enable tinyproxy`
-   * Mac: Not sure, sorry ¯\_(ツ)_/¯
-1. Update `~/.wakatime.cfg`
-   * Set `proxy = http://localhost:8888`
-1. Done
-   * All Wakapi requests are passed through tinyproxy now, which keeps a TCP connection with the server open for some time
-
-### Option 2: [Caddy](https://caddyserver.com) reverse proxy (`Win`, `Linux`, `Mac`)
-In this example, we misuse Caddy, which is a web server and reverse proxy, to fulfil the above scenario. 
-
-1. [Install Caddy](https://caddyserver.com/) 
-    * When installing manually, don't forget to set up a systemd service to start Caddy on system startup
-1. Create a Caddyfile
-    ```
-    # /etc/caddy/Caddyfile
-   
-    http://localhost:8070 {
-        reverse_proxy * {
-            to https://wakapi.dev  # <-- substitute your own Wakapi host here
-            header_up Host {http.reverse_proxy.upstream.host}
-            header_down -Server
-        }
-    }
-    ```
-1. Restart Caddy
-1. Verify that you can access [`http://localhost:8070/api/health`](http://localhost:8070/api/health)
-1. Update `~/.wakatime.cfg`
-    * Set `api_url = http://localhost:8070/api/heartbeat`
-1. Done
-   * All Wakapi requests are passed through Caddy now, which keeps a TCP connection with the server open for some time
--- a/go.mod
+++ b/go.mod
@ -4,7 +4,10 @@ go 1.13

 require (
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
+	github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21
+	github.com/emersion/go-smtp v0.15.0
 	github.com/emvi/logbuch v1.1.1
+	github.com/getsentry/sentry-go v0.10.0
 	github.com/go-co-op/gocron v0.3.3
 	github.com/go-openapi/spec v0.20.2 // indirect
 	github.com/gorilla/handlers v1.4.2
--- a/go.sum
+++ b/go.sum
@ -1,7 +1,11 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
+github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
+github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
@ -9,10 +13,12 @@ github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tN
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
+github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@ -28,6 +34,7 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l
 github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
 github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
+github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@ -42,6 +49,7 @@ github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
+github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@ -59,31 +67,51 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
+github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 h1:OJyUGMJTzHTd1XQp98QTaHernxMYzRaOasRir9hUlFQ=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
+github.com/emersion/go-smtp v0.15.0 h1:3+hMGMGrqP/lqd7qoxZc1hTU8LY8gHV9RFGWlqSDmP8=
+github.com/emersion/go-smtp v0.15.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
 github.com/emvi/logbuch v1.1.1 h1:poBGNbHy/nB95oNoqLKAaJoBrcKxTO0W9DhMijKEkkU=
 github.com/emvi/logbuch v1.1.1/go.mod h1:J2Wgbr3BuSc1JO+D2MBVh6q3WPVSK5GzktwWz8pvkKw=
 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
+github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
+github.com/getsentry/sentry-go v0.10.0 h1:6gwY+66NHKqyZrdi6O2jGdo7wGdo9b3B69E01NFgT5g=
+github.com/getsentry/sentry-go v0.10.0/go.mod h1:kELm/9iCblqUYh+ZRML7PNdCvEuw24wBvJPYyi86cws=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
+github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
+github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
 github.com/go-co-op/gocron v0.3.3 h1:QnarcMZWWKrEP25uCbtDiLsnnGw+PhCjL3wNITdWJOs=
 github.com/go-co-op/gocron v0.3.3/go.mod h1:Y9PWlYqDChf2Nbgg7kfS+ZsXHDTZbMZYPEQ0MILqH+M=
+github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
+github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
 github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
@ -118,6 +146,9 @@ github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4
 github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q=
 github.com/gobuffalo/packr/v2 v2.7.1 h1:n3CIW5T17T8v4GGK5sWXLVWJhCz7b5aNLSxW6gYim4o=
 github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
+github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 github.com/godror/godror v0.13.3/go.mod h1:2ouUT4kdhUBk7TAkHWD4SN0CdI0pgEQbo8FVHhbSKWg=
 github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
@ -134,12 +165,15 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@ -156,6 +190,7 @@ github.com/gorilla/schema v1.1.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlI
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
@ -182,8 +217,14 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
+github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
+github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
+github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
+github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
+github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g=
+github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw=
 github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
@ -251,11 +292,21 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
+github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
+github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
+github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=
+github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro=
+github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@ -266,6 +317,8 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@ -301,7 +354,10 @@ github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO
 github.com/mattn/go-sqlite3 v1.14.3/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
+github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@ -317,6 +373,7 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
@ -335,8 +392,10 @@ github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2f
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
@ -355,6 +414,8 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
 github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
+github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@ -395,10 +456,13 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR
 github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@ -438,14 +502,29 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/swaggo/swag v1.7.0 h1:5bCA/MTLQoIqDXXyHfOpMeDvL9j68OY/udlK4pQoo4E=
 github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
+github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
+github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
@ -479,6 +558,7 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@ -504,12 +584,15 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
@ -543,6 +626,7 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -570,10 +654,12 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@ -625,9 +711,13 @@ gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
+gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
+gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
 gopkg.in/gorp.v1 v1.7.2 h1:j3DWlAyGVv8whO7AcIWznQ2Yj7yJkn34B8s63GViAAw=
 gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
+gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
@ -635,12 +725,14 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
--- a/main.go
+++ b/main.go
@ -10,6 +10,7 @@ import (
 	"github.com/muety/wakapi/migrations"
 	"github.com/muety/wakapi/repositories"
 	"github.com/muety/wakapi/routes/api"
+	"github.com/muety/wakapi/services/mail"
 	"github.com/muety/wakapi/utils"
 	"gorm.io/gorm/logger"
 	"log"
@ -51,6 +52,7 @@ var (
 	languageMappingService services.ILanguageMappingService
 	summaryService         services.ISummaryService
 	aggregationService     services.IAggregationService
+	mailService            services.IMailService
 	keyValueService        services.IKeyValueService
 	miscService            services.IMiscService
 )
@ -134,6 +136,7 @@ func main() {
 	heartbeatService = services.NewHeartbeatService(heartbeatRepository, languageMappingService)
 	summaryService = services.NewSummaryService(summaryRepository, heartbeatService, aliasService)
 	aggregationService = services.NewAggregationService(userService, summaryService, heartbeatService)
+	mailService = mail.NewMailService()
 	keyValueService = services.NewKeyValueService(keyValueRepository)
 	miscService = services.NewMiscService(userService, summaryService, keyValueService)

@ -157,22 +160,23 @@ func main() {

 	// MVC Handlers
 	summaryHandler := routes.NewSummaryHandler(summaryService, userService)
-	settingsHandler := routes.NewSettingsHandler(userService, heartbeatService, summaryService, aliasService, aggregationService, languageMappingService, keyValueService)
+	settingsHandler := routes.NewSettingsHandler(userService, heartbeatService, summaryService, aliasService, aggregationService, languageMappingService, keyValueService, mailService)
 	homeHandler := routes.NewHomeHandler(keyValueService)
-	loginHandler := routes.NewLoginHandler(userService)
+	loginHandler := routes.NewLoginHandler(userService, mailService)
 	imprintHandler := routes.NewImprintHandler(keyValueService)

 	// Setup Routers
 	router := mux.NewRouter()
 	rootRouter := router.PathPrefix("/").Subrouter()
-	apiRouter := router.PathPrefix("/api").Subrouter()
+	apiRouter := router.PathPrefix("/api").Subrouter().StrictSlash(true)

 	// Globally used middlewares
-	recoveryMiddleware := handlers.RecoveryHandler()
-	loggingMiddleware := middlewares.NewLoggingMiddleware(logbuch.Info, []string{"/assets"})
-
-	// Router configs
-	router.Use(loggingMiddleware, recoveryMiddleware)
+	router.Use(middlewares.NewPrincipalMiddleware())
+	router.Use(middlewares.NewLoggingMiddleware(logbuch.Info, []string{"/assets"}))
+	router.Use(handlers.RecoveryHandler())
+	if config.Sentry.Dsn != "" {
+		router.Use(middlewares.NewSentryMiddleware())
+	}

 	// Route registrations
 	homeHandler.RegisterRoutes(rootRouter)
--- a/middlewares/authenticate.go
+++ b/middlewares/authenticate.go
@ -1,7 +1,6 @@
 package middlewares

 import (
-	"context"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/services"
@ -65,8 +64,8 @@ func (m *AuthenticateMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Reques
 		return
 	}

-	ctx := context.WithValue(r.Context(), models.UserKey, user)
-	next(w, r.WithContext(ctx))
+	SetPrincipal(r, user)
+	next(w, r)
 }

 func (m *AuthenticateMiddleware) isOptional(requestPath string) bool {
--- a/middlewares/custom/wakatime.go
+++ b/middlewares/custom/wakatime.go
@ -6,7 +6,7 @@ import (
 	"fmt"
 	"github.com/emvi/logbuch"
 	"github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/models"
+	"github.com/muety/wakapi/middlewares"
 	"io"
 	"io/ioutil"
 	"net/http"
@ -39,7 +39,7 @@ func (m *WakatimeRelayMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Reque
 		return
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	if user == nil || user.WakatimeApiKey == "" {
 		return
 	}
--- a/middlewares/logging.go
+++ b/middlewares/logging.go
@ -43,13 +43,14 @@ func (lg *LoggingMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}

 	lg.logFunc(
-		"[request] status=%d, method=%s, uri=%s, duration=%v, bytes=%d, addr=%s",
+		"[request] status=%d, method=%s, uri=%s, duration=%v, bytes=%d, addr=%s, user=%s",
 		ww.Status(),
 		r.Method,
 		r.URL.String(),
 		duration,
 		ww.BytesWritten(),
 		readUserIP(r),
+		readUserID(r),
 	)
 }

@ -64,6 +65,13 @@ func readUserIP(r *http.Request) string {
 	return ip
 }

+func readUserID(r *http.Request) string {
+	if user := GetPrincipal(r); user != nil {
+		return user.ID
+	}
+	return "-"
+}
+
 // The below writer-wrapping code has been lifted from
 // https://github.com/zenazn/goji/blob/master/web/middleware/logger.go - because
 // it does exactly what is needed, and it's unlikely to change in any
--- a/middlewares/principal.go
+++ b/middlewares/principal.go
@ -0,0 +1,64 @@
+package middlewares
+
+import (
+	"context"
+	"github.com/muety/wakapi/models"
+	"net/http"
+)
+
+const keyPrincipal = "principal"
+
+type PrincipalContainer struct {
+	principal *models.User
+}
+
+func (c *PrincipalContainer) SetPrincipal(user *models.User) {
+	c.principal = user
+}
+
+func (c *PrincipalContainer) GetPrincipal() *models.User {
+	return c.principal
+}
+
+// This middleware is a bit of a dirty workaround to the fact that a http.Request's context
+// does not allow to pass values from an inner to an outer middleware. Calling WithContext() on a
+// request shallow-copies the whole request itself and therefore, in a chain of handler1(handler2()),
+// handler 1 will not have access to values handler 2 writes to its context. In addition, Context.WithValue
+// returns a new context with the old context as a parent.
+//
+// As a concrete example, SentryMiddleware as well as LoggingMiddleware should be quite the outer layers,
+// while AuthenticationMiddleware is on the very inside of the chain. However, we still want sentry or the
+// logger to have access to the user object populated by the auth. middleware, if present.
+//
+// This middleware shall be included as the outermost layers and it injects a stateful container that  does
+// nothing but conditionally hold a reference to an authenticated user object.
+//
+// Other reference: https://stackoverflow.com/questions/55972869/send-errors-to-sentry-with-golang-and-mux
+
+type PrincipalMiddleware struct {
+	handler http.Handler
+}
+
+func NewPrincipalMiddleware() func(handler http.Handler) http.Handler {
+	return func(h http.Handler) http.Handler {
+		return &PrincipalMiddleware{handler: h}
+	}
+}
+
+func (p *PrincipalMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	ctx := context.WithValue(r.Context(), keyPrincipal, &PrincipalContainer{})
+	p.handler.ServeHTTP(w, r.WithContext(ctx))
+}
+
+func SetPrincipal(r *http.Request, user *models.User) {
+	if p := r.Context().Value(keyPrincipal); p != nil {
+		p.(*PrincipalContainer).SetPrincipal(user)
+	}
+}
+
+func GetPrincipal(r *http.Request) *models.User {
+	if p := r.Context().Value(keyPrincipal); p != nil {
+		return p.(*PrincipalContainer).GetPrincipal()
+	}
+	return nil
+}
--- a/middlewares/sentry.go
+++ b/middlewares/sentry.go
@ -0,0 +1,30 @@
+package middlewares
+
+import (
+	"context"
+	"github.com/getsentry/sentry-go"
+	sentryhttp "github.com/getsentry/sentry-go/http"
+	"net/http"
+)
+
+type SentryMiddleware struct {
+	handler http.Handler
+}
+
+func NewSentryMiddleware() func(http.Handler) http.Handler {
+	return func(h http.Handler) http.Handler {
+		return sentryhttp.New(sentryhttp.Options{
+			Repanic: true,
+		}).Handle(&SentryMiddleware{handler: h})
+	}
+}
+
+func (h *SentryMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	ctx := context.WithValue(r.Context(), "-", "-")
+	h.handler.ServeHTTP(w, r.WithContext(ctx))
+	if hub := sentry.GetHubFromContext(ctx); hub != nil {
+		if user := GetPrincipal(r); user != nil {
+			hub.Scope().SetUser(sentry.User{ID: user.ID})
+		}
+	}
+}
--- a/mocks/user_service.go
+++ b/mocks/user_service.go
@ -19,6 +19,16 @@ func (m *UserServiceMock) GetUserByKey(s string) (*models.User, error) {
 	return args.Get(0).(*models.User), args.Error(1)
 }

+func (m *UserServiceMock) GetUserByEmail(s string) (*models.User, error) {
+	args := m.Called(s)
+	return args.Get(0).(*models.User), args.Error(1)
+}
+
+func (m *UserServiceMock) GetUserByResetToken(s string) (*models.User, error) {
+	args := m.Called(s)
+	return args.Get(0).(*models.User), args.Error(1)
+}
+
 func (m *UserServiceMock) GetAll() ([]*models.User, error) {
 	args := m.Called()
 	return args.Get(0).([]*models.User), args.Error(1)
@ -69,6 +79,11 @@ func (m *UserServiceMock) MigrateMd5Password(user *models.User, login *models.Lo
 	return args.Get(0).(*models.User), args.Error(1)
 }

+func (m *UserServiceMock) GenerateResetToken(user *models.User) (*models.User, error) {
+	args := m.Called(user)
+	return args.Get(0).(*models.User), args.Error(1)
+}
+
 func (m *UserServiceMock) FlushCache() {
 	m.Called()
 }
--- a/models/heartbeat.go
+++ b/models/heartbeat.go
@ -4,16 +4,10 @@ import (
 	"fmt"
 	"github.com/emvi/logbuch"
 	"github.com/mitchellh/hashstructure/v2"
-	"regexp"
+	"strings"
 	"time"
 )

-var languageRegex *regexp.Regexp
-
-func init() {
-	languageRegex = regexp.MustCompile(`^.+\.(.+)$`)
-}
-
 type Heartbeat struct {
 	ID              uint       `gorm:"primary_key" hash:"ignore"`
 	User            *User      `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" hash:"ignore"`
@ -32,7 +26,7 @@ type Heartbeat struct {
 	Hash            string     `json:"-" gorm:"type:varchar(17); uniqueIndex"`
 	Origin          string     `json:"-" hash:"ignore"`
 	OriginId        string     `json:"-" hash:"ignore"`
-	CreatedAt       CustomTime `json:"created_at" gorm:"type:timestamp" swaggertype:"primitive,number"` // https://gorm.io/docs/conventions.html#CreatedAt
+	CreatedAt       CustomTime `json:"created_at" gorm:"type:timestamp" swaggertype:"primitive,number" hash:"ignore"` // https://gorm.io/docs/conventions.html#CreatedAt
 }

 func (h *Heartbeat) Valid() bool {
@ -40,15 +34,12 @@ func (h *Heartbeat) Valid() bool {
 }

 func (h *Heartbeat) Augment(languageMappings map[string]string) {
-	groups := languageRegex.FindAllStringSubmatch(h.Entity, -1)
-	if len(groups) == 0 || len(groups[0]) != 2 {
-		return
+	for ending, value := range languageMappings {
+		if strings.HasSuffix(h.Entity, "."+ending) {
+			h.Language = value
+			return
+		}
 	}
-	ending := groups[0][1]
-	if _, ok := languageMappings[ending]; !ok {
-		return
-	}
-	h.Language, _ = languageMappings[ending]
 }

 func (h *Heartbeat) GetKey(t uint8) (key string) {
--- a/models/heartbeat_test.go
+++ b/models/heartbeat_test.go
@ -26,17 +26,24 @@ func TestHeartbeat_Valid_MissingUser(t *testing.T) {

 func TestHeartbeat_Augment(t *testing.T) {
 	testMappings := map[string]string{
-		"py": "Python3",
+		"py":        "Python3",
+		"foo":       "Foo Script",
+		"blade.php": "Blade",
 	}

-	sut := &Heartbeat{
+	sut1, sut2 := &Heartbeat{
 		Entity:   "~/dev/file.py",
 		Language: "Python",
+	}, &Heartbeat{
+		Entity:   "~/dev/file.blade.php",
+		Language: "unknown",
 	}

-	sut.Augment(testMappings)
+	sut1.Augment(testMappings)
+	sut2.Augment(testMappings)

-	assert.Equal(t, "Python3", sut.Language)
+	assert.Equal(t, "Python3", sut1.Language)
+	assert.Equal(t, "Blade", sut2.Language)
 }

 func TestHeartbeat_GetKey(t *testing.T) {
--- a/models/mail.go
+++ b/models/mail.go
@ -0,0 +1,45 @@
+package models
+
+import (
+	"fmt"
+	"strings"
+)
+
+type Mail struct {
+	From    MailAddress
+	To      MailAddresses
+	Subject string
+	Body    string
+	Type    string
+}
+
+func (m *Mail) WithText(text string) *Mail {
+	m.Body = text
+	m.Type = "text/plain; charset=UTF-8"
+	return m
+}
+
+func (m *Mail) WithHTML(html string) *Mail {
+	m.Body = html
+	m.Type = "text/html; charset=UTF-8"
+	return m
+}
+
+func (m *Mail) String() string {
+	return fmt.Sprintf("To: %s\r\n"+
+		"From: %s\r\n"+
+		"Subject: %s\r\n"+
+		"Content-Type: %s\r\n"+
+		"\r\n"+
+		"%s\r\n",
+		strings.Join(m.To.RawStrings(), ", "),
+		m.From.String(),
+		m.Subject,
+		m.Type,
+		m.Body,
+	)
+}
+
+func (m *Mail) Reader() *strings.Reader {
+	return strings.NewReader(m.String())
+}
--- a/models/mail_address.go
+++ b/models/mail_address.go
@ -0,0 +1,66 @@
+package models
+
+import "regexp"
+
+const (
+	MailPattern      = "[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+"
+	EmailAddrPattern = ".*\\s<(" + MailPattern + ")>|(" + MailPattern + ")"
+)
+
+var (
+	mailRegex      *regexp.Regexp
+	emailAddrRegex *regexp.Regexp
+)
+
+func init() {
+	mailRegex = regexp.MustCompile(MailPattern)
+	emailAddrRegex = regexp.MustCompile(EmailAddrPattern)
+}
+
+type MailAddress string
+
+type MailAddresses []MailAddress
+
+func (m MailAddress) String() string {
+	return string(m)
+}
+
+func (m MailAddress) Raw() string {
+	match := emailAddrRegex.FindStringSubmatch(string(m))
+	if len(match) == 3 {
+		if match[2] != "" {
+			return match[2]
+		}
+		return match[1]
+	}
+	return ""
+}
+
+func (m MailAddress) Valid() bool {
+	return emailAddrRegex.Match([]byte(m))
+}
+
+func (m MailAddresses) Strings() []string {
+	out := make([]string, len(m))
+	for i, s := range m {
+		out[i] = s.String()
+	}
+	return out
+}
+
+func (m MailAddresses) RawStrings() []string {
+	out := make([]string, len(m))
+	for i, s := range m {
+		out[i] = s.Raw()
+	}
+	return out
+}
+
+func (m MailAddresses) AllValid() bool {
+	for _, a := range m {
+		if !a.Valid() {
+			return false
+		}
+	}
+	return true
+}
--- a/models/summary.go
+++ b/models/summary.go
@ -35,7 +35,7 @@ type SummaryItem struct {
 	ID        uint          `json:"-" gorm:"primary_key"`
 	Summary   *Summary      `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	SummaryID uint          `json:"-"`
-	Type      uint8         `json:"-"`
+	Type      uint8         `json:"-" gorm:"index:idx_type"`
 	Key       string        `json:"key"`
 	Total     time.Duration `json:"total" swaggertype:"primitive,integer"`
 }
--- a/models/user.go
+++ b/models/user.go
@ -2,14 +2,6 @@ package models

 import "regexp"

-const (
-	MailPattern = "[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+"
-)
-
-var (
-	mailRegex *regexp.Regexp
-)
-
 func init() {
 	mailRegex = regexp.MustCompile(MailPattern)
 }
@ -17,7 +9,7 @@ func init() {
 type User struct {
 	ID               string     `json:"id" gorm:"primary_key"`
 	ApiKey           string     `json:"api_key" gorm:"unique"`
-	Email            string     `json:"email"`
+	Email            string     `json:"email" gorm:"uniqueIndex:idx_user_email"`
 	Password         string     `json:"-"`
 	CreatedAt        CustomTime `gorm:"type:timestamp; default:CURRENT_TIMESTAMP" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
 	LastLoggedInAt   CustomTime `gorm:"type:timestamp; default:CURRENT_TIMESTAMP" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
@ -30,6 +22,7 @@ type User struct {
 	IsAdmin          bool       `json:"-" gorm:"default:false; type:bool"`
 	HasData          bool       `json:"-" gorm:"default:false; type:bool"`
 	WakatimeApiKey   string     `json:"-"`
+	ResetToken       string     `json:"-"`
 }

 type Login struct {
@ -44,6 +37,16 @@ type Signup struct {
 	PasswordRepeat string `schema:"password_repeat"`
 }

+type SetPasswordRequest struct {
+	Password       string `schema:"password"`
+	PasswordRepeat string `schema:"password_repeat"`
+	Token          string `schema:"token"`
+}
+
+type ResetPasswordRequest struct {
+	Email string `schema:"email"`
+}
+
 type CredentialsReset struct {
 	PasswordOld    string `schema:"password_old"`
 	PasswordNew    string `schema:"password_new"`
@ -69,6 +72,11 @@ func (c *CredentialsReset) IsValid() bool {
 		c.PasswordNew == c.PasswordRepeat
 }

+func (c *SetPasswordRequest) IsValid() bool {
+	return ValidatePassword(c.Password) &&
+		c.Password == c.PasswordRepeat
+}
+
 func (s *Signup) IsValid() bool {
 	return ValidateUsername(s.Username) &&
 		ValidateEmail(s.Email) &&
--- a/models/view/login.go
+++ b/models/view/login.go
@ -6,6 +6,11 @@ type LoginViewModel struct {
 	TotalUsers int
 }

+type SetPasswordViewModel struct {
+	LoginViewModel
+	Token string
+}
+
 func (s *LoginViewModel) WithSuccess(m string) *LoginViewModel {
 	s.Success = m
 	return s
--- a/postman/Wakapi.postman_collection.json
+++ b/postman/Wakapi.postman_collection.json
@ -0,0 +1,346 @@
+{
+	"info": {
+		"_postman_id": "3dcc346d-a9a8-4699-8a52-459eb978b382",
+		"name": "Wakapi",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "Misc",
+			"item": [
+				{
+					"name": "Get health",
+					"request": {
+						"method": "GET",
+						"header": [],
+						"url": {
+							"raw": "{{BASE_URL}}/api/health",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"health"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get metrics",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/metrics",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"metrics"
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Heartbeats",
+			"item": [
+				{
+					"name": "Create heartbeat",
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							},
+							{
+								"key": "X-Machine-Name",
+								"value": "devmachine",
+								"type": "text"
+							},
+							{
+								"key": "User-Agent",
+								"value": "wakatime/13.0.7 (Linux-4.15.0-91-generic-x86_64-with-glibc2.4) Python3.8.0.final.0 generator/1.42.1 generator-wakatime/4.0.0",
+								"type": "text"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "[{\n    \"entity\": \"/home/user1/dev/proejct1/main.go\",\n    \"project\": \"Project 1\",\n    \"language\": \"Go\",\n    \"is_write\": true,\n    \"type\": \"file\",\n    \"category\": null,\n    \"branch\": null,\n    \"time\": 1616680499.113417\n}]",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": {
+							"raw": "{{BASE_URL}}/api/heartbeat",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"heartbeat"
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Summary",
+			"item": [
+				{
+					"name": "Get summary",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/summary?interval=last_7_days",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"summary"
+							],
+							"query": [
+								{
+									"key": "interval",
+									"value": "last_7_days"
+								}
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Shields",
+			"item": [
+				{
+					"name": "Get Shields data",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/shields/v1/n1try/interval:today/language:Go",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"shields",
+								"v1",
+								"n1try",
+								"interval:today",
+								"language:Go"
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "WakaTime",
+			"item": [
+				{
+					"name": "Get all time",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/wakatime/v1/users/current/all_time_since_today",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"wakatime",
+								"v1",
+								"users",
+								"current",
+								"all_time_since_today"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get stats",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/wakatime/v1/users/current/stats",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"wakatime",
+								"v1",
+								"users",
+								"current",
+								"stats"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get stats with range",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/wakatime/v1/users/current/stats/last_7_days",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"wakatime",
+								"v1",
+								"users",
+								"current",
+								"stats",
+								"last_7_days"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get summaries",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/wakatime/v1/users/current/summaries?start=2020-03-01T15:04:05Z&end=2020-03-31T15:04:05Z",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"wakatime",
+								"v1",
+								"users",
+								"current",
+								"summaries"
+							],
+							"query": [
+								{
+									"key": "start",
+									"value": "2020-03-01T15:04:05Z"
+								},
+								{
+									"key": "end",
+									"value": "2020-03-31T15:04:05Z"
+								}
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		}
+	],
+	"event": [
+		{
+			"listen": "prerequest",
+			"script": {
+				"type": "text/javascript",
+				"exec": [
+					"const apiKey = pm.variables.get('API_KEY')",
+					"",
+					"if (!apiKey) {",
+					"    throw new Error('no api key given')",
+					"}",
+					"",
+					"const token = base64encode(apiKey)",
+					"pm.variables.set('TOKEN', token)",
+					"",
+					"function base64encode(str) {",
+					"    return Buffer.from(str, 'utf-8').toString('base64')",
+					"}"
+				]
+			}
+		},
+		{
+			"listen": "test",
+			"script": {
+				"type": "text/javascript",
+				"exec": [
+					""
+				]
+			}
+		}
+	],
+	"variable": [
+		{
+			"key": "BASE_URL",
+			"value": "http://localhost:3000"
+		},
+		{
+			"key": "API_KEY",
+			"value": ""
+		}
+	]
+}
--- a/repositories/key_value.go
+++ b/repositories/key_value.go
@ -2,7 +2,6 @@ package repositories

 import (
 	"errors"
-	"github.com/emvi/logbuch"
 	"github.com/muety/wakapi/models"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
@ -40,10 +39,6 @@ func (r *KeyValueRepository) PutString(kv *models.KeyStringValue) error {
 		return err
 	}

-	if result.RowsAffected != 1 {
-		logbuch.Warn("did not insert key '%s', maybe just updated?", kv.Key)
-	}
-
 	return nil
 }

--- a/repositories/repositories.go
+++ b/repositories/repositories.go
@ -51,6 +51,8 @@ type IUserRepository interface {
 	GetById(string) (*models.User, error)
 	GetByIds([]string) ([]*models.User, error)
 	GetByApiKey(string) (*models.User, error)
+	GetByEmail(string) (*models.User, error)
+	GetByResetToken(string) (*models.User, error)
 	GetAll() ([]*models.User, error)
 	GetByLoggedInAfter(time.Time) ([]*models.User, error)
 	GetByLastActiveAfter(time.Time) ([]*models.User, error)
--- a/repositories/user.go
+++ b/repositories/user.go
@ -42,6 +42,28 @@ func (r *UserRepository) GetByApiKey(key string) (*models.User, error) {
 	return u, nil
 }

+func (r *UserRepository) GetByResetToken(resetToken string) (*models.User, error) {
+	if resetToken == "" {
+		return nil, errors.New("invalid input")
+	}
+	u := &models.User{}
+	if err := r.db.Where(&models.User{ResetToken: resetToken}).First(u).Error; err != nil {
+		return u, err
+	}
+	return u, nil
+}
+
+func (r *UserRepository) GetByEmail(email string) (*models.User, error) {
+	if email == "" {
+		return nil, errors.New("invalid input")
+	}
+	u := &models.User{}
+	if err := r.db.Where(&models.User{Email: email}).First(u).Error; err != nil {
+		return u, err
+	}
+	return u, nil
+}
+
 func (r *UserRepository) GetAll() ([]*models.User, error) {
 	var users []*models.User
 	if err := r.db.
@ -119,6 +141,7 @@ func (r *UserRepository) Update(user *models.User) (*models.User, error) {
 		"share_machines":      user.ShareMachines,
 		"wakatime_api_key":    user.WakatimeApiKey,
 		"has_data":            user.HasData,
+		"reset_token":         user.ResetToken,
 	}

 	result := r.db.Model(user).Updates(updateMap)
--- a/routes/api/heartbeat.go
+++ b/routes/api/heartbeat.go
@ -53,7 +53,7 @@ func (h *HeartbeatApiHandler) RegisterRoutes(router *mux.Router) {
 // @Router /heartbeat [post]
 func (h *HeartbeatApiHandler) Post(w http.ResponseWriter, r *http.Request) {
 	var heartbeats []*models.Heartbeat
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	opSys, editor, _ := utils.ParseUserAgent(r.Header.Get("User-Agent"))
 	machineName := r.Header.Get("X-Machine-Name")

--- a/routes/api/metrics.go
+++ b/routes/api/metrics.go
@ -68,7 +68,7 @@ func (h *MetricsHandler) RegisterRoutes(router *mux.Router) {
 }

 func (h *MetricsHandler) Get(w http.ResponseWriter, r *http.Request) {
-	reqUser := r.Context().Value(models.UserKey).(*models.User)
+	reqUser := middlewares.GetPrincipal(r)
 	if reqUser == nil {
 		w.WriteHeader(http.StatusUnauthorized)
 		w.Write([]byte(conf.ErrUnauthorized))
@ -108,7 +108,7 @@ func (h *MetricsHandler) Get(w http.ResponseWriter, r *http.Request) {
 func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error) {
 	var metrics mm.Metrics

-	summaryAllTime, err := h.summarySrvc.Aliased(time.Time{}, time.Now(), user, h.summarySrvc.Retrieve)
+	summaryAllTime, err := h.summarySrvc.Aliased(time.Time{}, time.Now(), user, h.summarySrvc.Retrieve, false)
 	if err != nil {
 		logbuch.Error("failed to retrieve all time summary for user '%s' for metric", user.ID)
 		return nil, err
@ -116,7 +116,7 @@ func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error)

 	from, to := utils.MustResolveIntervalRaw("today")

-	summaryToday, err := h.summarySrvc.Aliased(from, to, user, h.summarySrvc.Retrieve)
+	summaryToday, err := h.summarySrvc.Aliased(from, to, user, h.summarySrvc.Retrieve, false)
 	if err != nil {
 		logbuch.Error("failed to retrieve today's summary for user '%s' for metric", user.ID)
 		return nil, err
--- a/routes/compat/shields/v1/badge.go
+++ b/routes/compat/shields/v1/badge.go
@ -1,15 +1,16 @@
 package v1

 import (
+	"fmt"
 	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	v1 "github.com/muety/wakapi/models/compat/shields/v1"
 	"github.com/muety/wakapi/services"
 	"github.com/muety/wakapi/utils"
+	"github.com/patrickmn/go-cache"
 	"net/http"
 	"regexp"
-	"strings"
 	"time"
 )

@ -22,12 +23,14 @@ type BadgeHandler struct {
 	config      *conf.Config
 	userSrvc    services.IUserService
 	summarySrvc services.ISummaryService
+	cache       *cache.Cache
 }

 func NewBadgeHandler(summaryService services.ISummaryService, userService services.IUserService) *BadgeHandler {
 	return &BadgeHandler{
 		summarySrvc: summaryService,
 		userSrvc:    userService,
+		cache:       cache.New(time.Hour, time.Hour),
 		config:      conf.Get(),
 	}
 }
@ -52,11 +55,6 @@ func (h *BadgeHandler) Get(w http.ResponseWriter, r *http.Request) {
 	intervalReg := regexp.MustCompile(intervalPattern)
 	entityFilterReg := regexp.MustCompile(entityFilterPattern)

-	if userAgent := r.Header.Get("user-agent"); !strings.HasPrefix(userAgent, "Shields.io/") && !h.config.IsDev() {
-		w.WriteHeader(http.StatusForbidden)
-		return
-	}
-
 	var filterEntity, filterKey string
 	if groups := entityFilterReg.FindStringSubmatch(r.URL.Path); len(groups) > 2 {
 		filterEntity, filterKey = groups[1], groups[2]
@ -101,6 +99,12 @@ func (h *BadgeHandler) Get(w http.ResponseWriter, r *http.Request) {
 		filters = &models.Filters{}
 	}

+	cacheKey := fmt.Sprintf("%s_%v_%s_%s", user.ID, *interval, filterEntity, filterKey)
+	if cacheResult, ok := h.cache.Get(cacheKey); ok {
+		utils.RespondJSON(w, http.StatusOK, cacheResult.(*v1.BadgeData))
+		return
+	}
+
 	summary, err, status := h.loadUserSummary(user, interval)
 	if err != nil {
 		w.WriteHeader(status)
@ -109,6 +113,7 @@ func (h *BadgeHandler) Get(w http.ResponseWriter, r *http.Request) {
 	}

 	vm := v1.NewBadgeDataFrom(summary, filters)
+	h.cache.SetDefault(cacheKey, vm)
 	utils.RespondJSON(w, http.StatusOK, vm)
 }

@ -129,7 +134,7 @@ func (h *BadgeHandler) loadUserSummary(user *models.User, interval *models.Inter
 		retrieveSummary = h.summarySrvc.Summarize
 	}

-	summary, err := h.summarySrvc.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary)
+	summary, err := h.summarySrvc.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary, summaryParams.Recompute)
 	if err != nil {
 		return nil, err, http.StatusInternalServerError
 	}
--- a/routes/compat/wakatime/v1/all_time.go
+++ b/routes/compat/wakatime/v1/all_time.go
@ -49,7 +49,7 @@ func (h *AllTimeHandler) Get(w http.ResponseWriter, r *http.Request) {
 	values, _ := url.ParseQuery(r.URL.RawQuery)

 	requestedUser := vars["user"]
-	authorizedUser := r.Context().Value(models.UserKey).(*models.User)
+	authorizedUser := middlewares.GetPrincipal(r)

 	if requestedUser != authorizedUser.ID && requestedUser != "current" {
 		w.WriteHeader(http.StatusForbidden)
@ -80,7 +80,7 @@ func (h *AllTimeHandler) loadUserSummary(user *models.User) (*models.Summary, er
 		retrieveSummary = h.summarySrvc.Summarize
 	}

-	summary, err := h.summarySrvc.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary)
+	summary, err := h.summarySrvc.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary, summaryParams.Recompute)
 	if err != nil {
 		return nil, err, http.StatusInternalServerError
 	}
--- a/routes/compat/wakatime/v1/stats.go
+++ b/routes/compat/wakatime/v1/stats.go
@ -45,10 +45,7 @@ func (h *StatsHandler) Get(w http.ResponseWriter, r *http.Request) {
 	var vars = mux.Vars(r)
 	var authorizedUser, requestedUser *models.User

-	if u := r.Context().Value(models.UserKey); u != nil {
-		authorizedUser = u.(*models.User)
-	}
-
+	authorizedUser = middlewares.GetPrincipal(r)
 	if authorizedUser != nil && vars["user"] == "current" {
 		vars["user"] = authorizedUser.ID
 	}
@ -117,7 +114,7 @@ func (h *StatsHandler) loadUserSummary(user *models.User, start, end time.Time)
 		Recompute: false,
 	}

-	summary, err := h.summarySrvc.Aliased(overallParams.From, overallParams.To, user, h.summarySrvc.Retrieve)
+	summary, err := h.summarySrvc.Aliased(overallParams.From, overallParams.To, user, h.summarySrvc.Retrieve, false)
 	if err != nil {
 		return nil, err, http.StatusInternalServerError
 	}
--- a/routes/compat/wakatime/v1/summaries.go
+++ b/routes/compat/wakatime/v1/summaries.go
@ -56,7 +56,7 @@ func (h *SummariesHandler) RegisterRoutes(router *mux.Router) {
 func (h *SummariesHandler) Get(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	requestedUser := vars["user"]
-	authorizedUser := r.Context().Value(models.UserKey).(*models.User)
+	authorizedUser := middlewares.GetPrincipal(r)

 	if requestedUser != authorizedUser.ID && requestedUser != "current" {
 		w.WriteHeader(http.StatusForbidden)
@ -80,7 +80,7 @@ func (h *SummariesHandler) Get(w http.ResponseWriter, r *http.Request) {
 }

 func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary, error, int) {
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	params := r.URL.Query()
 	rangeParam, startParam, endParam := params.Get("range"), params.Get("start"), params.Get("end")

@ -121,7 +121,7 @@ func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary
 	summaries := make([]*models.Summary, len(intervals))

 	for i, interval := range intervals {
-		summary, err := h.summarySrvc.Aliased(interval[0], interval[1], user, h.summarySrvc.Retrieve)
+		summary, err := h.summarySrvc.Aliased(interval[0], interval[1], user, h.summarySrvc.Retrieve, false)
 		if err != nil {
 			return nil, err, http.StatusInternalServerError
 		}
--- a/routes/home.go
+++ b/routes/home.go
@ -20,6 +20,7 @@ type HomeHandler struct {

 var loginDecoder = schema.NewDecoder()
 var signupDecoder = schema.NewDecoder()
+var resetPasswordDecoder = schema.NewDecoder()

 func NewHomeHandler(keyValueService services.IKeyValueService) *HomeHandler {
 	return &HomeHandler{
--- a/routes/login.go
+++ b/routes/login.go
@ -2,6 +2,7 @@ package routes

 import (
 	"fmt"
+	"github.com/emvi/logbuch"
 	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
@ -9,18 +10,21 @@ import (
 	"github.com/muety/wakapi/services"
 	"github.com/muety/wakapi/utils"
 	"net/http"
+	"net/url"
 	"time"
 )

 type LoginHandler struct {
 	config   *conf.Config
 	userSrvc services.IUserService
+	mailSrvc services.IMailService
 }

-func NewLoginHandler(userService services.IUserService) *LoginHandler {
+func NewLoginHandler(userService services.IUserService, mailService services.IMailService) *LoginHandler {
 	return &LoginHandler{
 		config:   conf.Get(),
 		userSrvc: userService,
+		mailSrvc: mailService,
 	}
 }

@ -30,6 +34,10 @@ func (h *LoginHandler) RegisterRoutes(router *mux.Router) {
 	router.Path("/logout").Methods(http.MethodPost).HandlerFunc(h.PostLogout)
 	router.Path("/signup").Methods(http.MethodGet).HandlerFunc(h.GetSignup)
 	router.Path("/signup").Methods(http.MethodPost).HandlerFunc(h.PostSignup)
+	router.Path("/set-password").Methods(http.MethodGet).HandlerFunc(h.GetSetPassword)
+	router.Path("/set-password").Methods(http.MethodPost).HandlerFunc(h.PostSetPassword)
+	router.Path("/reset-password").Methods(http.MethodGet).HandlerFunc(h.GetResetPassword)
+	router.Path("/reset-password").Methods(http.MethodPost).HandlerFunc(h.PostResetPassword)
 }

 func (h *LoginHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
@ -167,6 +175,128 @@ func (h *LoginHandler) PostSignup(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, fmt.Sprintf("%s/?success=%s", h.config.Server.BasePath, "account created successfully"), http.StatusFound)
 }

+func (h *LoginHandler) GetResetPassword(w http.ResponseWriter, r *http.Request) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+	templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r))
+}
+
+func (h *LoginHandler) GetSetPassword(w http.ResponseWriter, r *http.Request) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	values, _ := url.ParseQuery(r.URL.RawQuery)
+	token := values.Get("token")
+	if token == "" {
+		w.WriteHeader(http.StatusUnauthorized)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("invalid or missing token"))
+		return
+	}
+
+	vm := &view.SetPasswordViewModel{
+		LoginViewModel: *h.buildViewModel(r),
+		Token:          token,
+	}
+
+	templates[conf.SetPasswordTemplate].Execute(w, vm)
+}
+
+func (h *LoginHandler) PostSetPassword(w http.ResponseWriter, r *http.Request) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	var setRequest models.SetPasswordRequest
+	if err := r.ParseForm(); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		return
+	}
+	if err := signupDecoder.Decode(&setRequest, r.PostForm); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		return
+	}
+
+	user, err := h.userSrvc.GetUserByResetToken(setRequest.Token)
+	if err != nil {
+		w.WriteHeader(http.StatusUnauthorized)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("invalid token"))
+		return
+	}
+
+	if !setRequest.IsValid() {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("invalid parameters"))
+		return
+	}
+
+	user.Password = setRequest.Password
+	user.ResetToken = ""
+	if hash, err := utils.HashBcrypt(user.Password, h.config.Security.PasswordSalt); err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("failed to set new password"))
+		return
+	} else {
+		user.Password = hash
+	}
+
+	if _, err := h.userSrvc.Update(user); err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("failed to save new password"))
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("%s/login?success=%s", h.config.Server.BasePath, "password updated successfully"), http.StatusFound)
+}
+
+func (h *LoginHandler) PostResetPassword(w http.ResponseWriter, r *http.Request) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	if !h.config.Mail.Enabled {
+		w.WriteHeader(http.StatusNotImplemented)
+		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("mailing is disabled on this server"))
+		return
+	}
+
+	var resetRequest models.ResetPasswordRequest
+	if err := r.ParseForm(); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		return
+	}
+	if err := resetPasswordDecoder.Decode(&resetRequest, r.PostForm); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		return
+	}
+
+	if user, err := h.userSrvc.GetUserByEmail(resetRequest.Email); user != nil && err == nil {
+		if u, err := h.userSrvc.GenerateResetToken(user); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("failed to generate password reset token"))
+			return
+		} else {
+			go func(user *models.User) {
+				link := fmt.Sprintf("%s/set-password?token=%s", h.config.Server.GetPublicUrl(), user.ResetToken)
+				if err := h.mailSrvc.SendPasswordReset(user, link); err != nil {
+					logbuch.Error("failed to send password reset mail to %s – %v", user.ID, err)
+				} else {
+					logbuch.Info("sent password reset mail to %s", user.ID)
+				}
+			}(u)
+		}
+	} else {
+		logbuch.Warn("password reset requested for unregistered address '%s'", resetRequest.Email)
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("%s/?success=%s", h.config.Server.BasePath, "an e-mail was sent to you in case your e-mail address was registered"), http.StatusFound)
+}
+
 func (h *LoginHandler) buildViewModel(r *http.Request) *view.LoginViewModel {
 	numUsers, _ := h.userSrvc.Count()

--- a/routes/settings.go
+++ b/routes/settings.go
@ -27,6 +27,7 @@ type SettingsHandler struct {
 	aggregationSrvc     services.IAggregationService
 	languageMappingSrvc services.ILanguageMappingService
 	keyValueSrvc        services.IKeyValueService
+	mailSrvc            services.IMailService
 	httpClient          *http.Client
 }

@ -40,6 +41,7 @@ func NewSettingsHandler(
 	aggregationService services.IAggregationService,
 	languageMappingService services.ILanguageMappingService,
 	keyValueService services.IKeyValueService,
+	mailService services.IMailService,
 ) *SettingsHandler {
 	return &SettingsHandler{
 		config:              conf.Get(),
@ -50,6 +52,7 @@ func NewSettingsHandler(
 		userSrvc:            userService,
 		heartbeatSrvc:       heartbeatService,
 		keyValueSrvc:        keyValueService,
+		mailSrvc:            mailService,
 		httpClient:          &http.Client{Timeout: 10 * time.Second},
 	}
 }
@ -148,7 +151,7 @@ func (h *SettingsHandler) actionUpdateUser(w http.ResponseWriter, r *http.Reques
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)

 	var payload models.UserDataUpdate
 	if err := r.ParseForm(); err != nil {
@ -176,7 +179,7 @@ func (h *SettingsHandler) actionChangePassword(w http.ResponseWriter, r *http.Re
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)

 	var credentials models.CredentialsReset
 	if err := r.ParseForm(); err != nil {
@ -223,7 +226,7 @@ func (h *SettingsHandler) actionResetApiKey(w http.ResponseWriter, r *http.Reque
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	if _, err := h.userSrvc.ResetApiKey(user); err != nil {
 		return http.StatusInternalServerError, "", conf.ErrInternalServerError
 	}
@ -238,7 +241,7 @@ func (h *SettingsHandler) actionUpdateSharing(w http.ResponseWriter, r *http.Req
 	}

 	var err error
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)

 	defer h.userSrvc.FlushCache()

@ -265,7 +268,7 @@ func (h *SettingsHandler) actionDeleteAlias(w http.ResponseWriter, r *http.Reque
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	aliasKey := r.PostFormValue("key")
 	aliasType, err := strconv.Atoi(r.PostFormValue("type"))
 	if err != nil {
@ -285,7 +288,7 @@ func (h *SettingsHandler) actionAddAlias(w http.ResponseWriter, r *http.Request)
 	if h.config.IsDev() {
 		loadTemplates()
 	}
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	aliasKey := r.PostFormValue("key")
 	aliasValue := r.PostFormValue("value")
 	aliasType, err := strconv.Atoi(r.PostFormValue("type"))
@ -313,19 +316,20 @@ func (h *SettingsHandler) actionDeleteLanguageMapping(w http.ResponseWriter, r *
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	id, err := strconv.Atoi(r.PostFormValue("mapping_id"))
 	if err != nil {
 		return http.StatusInternalServerError, "", "could not delete mapping"
 	}

-	if mapping, err := h.languageMappingSrvc.GetById(uint(id)); err != nil || mapping == nil {
+	mapping, err := h.languageMappingSrvc.GetById(uint(id))
+	if err != nil || mapping == nil {
 		return http.StatusNotFound, "", "mapping not found"
 	} else if mapping.UserID != user.ID {
 		return http.StatusForbidden, "", "not allowed to delete mapping"
 	}

-	if err := h.languageMappingSrvc.Delete(&models.LanguageMapping{ID: uint(id)}); err != nil {
+	if err := h.languageMappingSrvc.Delete(mapping); err != nil {
 		return http.StatusInternalServerError, "", "could not delete mapping"
 	}

@ -336,7 +340,7 @@ func (h *SettingsHandler) actionAddLanguageMapping(w http.ResponseWriter, r *htt
 	if h.config.IsDev() {
 		loadTemplates()
 	}
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	extension := r.PostFormValue("extension")
 	language := r.PostFormValue("language")

@ -362,7 +366,7 @@ func (h *SettingsHandler) actionSetWakatimeApiKey(w http.ResponseWriter, r *http
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	apiKey := r.PostFormValue("api_key")

 	// Healthcheck, if a new API key is set, i.e. the feature is activated
@ -382,7 +386,7 @@ func (h *SettingsHandler) actionImportWaktime(w http.ResponseWriter, r *http.Req
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	if user.WakatimeApiKey == "" {
 		return http.StatusForbidden, "", "not connected to wakatime"
 	}
@ -400,6 +404,7 @@ func (h *SettingsHandler) actionImportWaktime(w http.ResponseWriter, r *http.Req
 	}

 	go func(user *models.User) {
+		start := time.Now()
 		importer := imports.NewWakatimeHeartbeatImporter(user.WakatimeApiKey)

 		countBefore, err := h.heartbeatSrvc.CountByUser(user)
@ -418,23 +423,38 @@ func (h *SettingsHandler) actionImportWaktime(w http.ResponseWriter, r *http.Req
 		count := 0
 		batch := make([]*models.Heartbeat, 0)

+		insert := func(batch []*models.Heartbeat) {
+			if err := h.heartbeatSrvc.InsertBatch(batch); err != nil {
+				logbuch.Warn("failed to insert imported heartbeat, already existing? – %v", err)
+			}
+		}
+
 		for hb := range stream {
 			count++
 			batch = append(batch, hb)

 			if len(batch) == h.config.App.ImportBatchSize {
-				if err := h.heartbeatSrvc.InsertBatch(batch); err != nil {
-					logbuch.Warn("failed to insert imported heartbeat, already existing? – %v", err)
-				}
-
+				insert(batch)
 				batch = make([]*models.Heartbeat, 0)
 			}
 		}

+		if len(batch) > 0 {
+			insert(batch)
+		}
+
 		countAfter, _ := h.heartbeatSrvc.CountByUser(user)
 		logbuch.Info("downloaded %d heartbeats for user '%s' (%d actually imported)", count, user.ID, countAfter-countBefore)

 		h.regenerateSummaries(user)
+
+		if user.Email != "" {
+			if err := h.mailSrvc.SendImportNotification(user, time.Now().Sub(start), int(countAfter-countBefore)); err != nil {
+				logbuch.Error("failed to send import notification mail to %s – %v", user.ID, err)
+			} else {
+				logbuch.Info("sent import notification mail to %s", user.ID)
+			}
+		}
 	}(user)

 	h.keyValueSrvc.PutString(&models.KeyStringValue{
@ -442,7 +462,7 @@ func (h *SettingsHandler) actionImportWaktime(w http.ResponseWriter, r *http.Req
 		Value: time.Now().Format(time.RFC822),
 	})

-	return http.StatusAccepted, "ImportAll started. This may take a few minutes.", ""
+	return http.StatusAccepted, "Import started. This will take several minutes. Please check back later.", ""
 }

 func (h *SettingsHandler) actionRegenerateSummaries(w http.ResponseWriter, r *http.Request) (int, string, string) {
@ -450,13 +470,13 @@ func (h *SettingsHandler) actionRegenerateSummaries(w http.ResponseWriter, r *ht
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	go func(user *models.User) {
+		if err := h.regenerateSummaries(user); err != nil {
+			logbuch.Error("failed to regenerate summaries for user '%s' – %v", user.ID, err)
+		}
+	}(middlewares.GetPrincipal(r))

-	if err := h.regenerateSummaries(user); err != nil {
-		return http.StatusInternalServerError, "", "failed to regenerate summaries"
-	}
-
-	return http.StatusOK, "summaries are being regenerated – this may take a few seconds", ""
+	return http.StatusAccepted, "summaries are being regenerated – this may take a up to a couple of minutes, please come back later", ""
 }

 func (h *SettingsHandler) actionDeleteUser(w http.ResponseWriter, r *http.Request) (int, string, string) {
@ -464,7 +484,7 @@ func (h *SettingsHandler) actionDeleteUser(w http.ResponseWriter, r *http.Reques
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	go func(user *models.User) {
 		logbuch.Info("deleting user '%s' shortly", user.ID)
 		time.Sleep(5 * time.Minute)
@ -523,7 +543,7 @@ func (h *SettingsHandler) regenerateSummaries(user *models.User) error {
 }

 func (h *SettingsHandler) buildViewModel(r *http.Request) *view.SettingsViewModel {
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	mappings, _ := h.languageMappingSrvc.GetByUser(user.ID)
 	aliases, _ := h.aliasSrvc.GetByUser(user.ID)
 	aliasMap := make(map[string][]*models.Alias)
--- a/routes/summary.go
+++ b/routes/summary.go
@ -53,7 +53,7 @@ func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	if user == nil {
 		w.WriteHeader(http.StatusUnauthorized)
 		templates[conf.SummaryTemplate].Execute(w, h.buildViewModel(r).WithError("unauthorized"))
--- a/routes/utils/summary_utils.go
+++ b/routes/utils/summary_utils.go
@ -18,7 +18,7 @@ func LoadUserSummary(ss services.ISummaryService, r *http.Request) (*models.Summ
 		retrieveSummary = ss.Summarize
 	}

-	summary, err := ss.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary)
+	summary, err := ss.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary, summaryParams.Recompute)
 	if err != nil {
 		return nil, err, http.StatusInternalServerError
 	}
--- a/scripts/push_sample_data.py
+++ b/scripts/push_sample_data.py
@ -1,113 +0,0 @@
-#!/usr/bin/python3
-
-import argparse
-import base64
-import random
-import string
-import sys
-from datetime import datetime, timedelta
-from typing import List, Union
-
-import requests
-from tqdm import tqdm
-
-MACHINE = "devmachine"
-UA = 'wakatime/13.0.7 (Linux-4.15.0-91-generic-x86_64-with-glibc2.4) Python3.8.0.final.0 generator/1.42.1 generator-wakatime/4.0.0'
-LANGUAGES = {
-    'Go': 'go',
-    'Java': 'java',
-    'JavaScript': 'js',
-    'Python': 'py'
-}
-
-
-class Heartbeat:
-    def __init__(
-            self,
-            entity: str,
-            project: str,
-            language: str,
-            time: float,
-            is_write: bool = True,
-            branch: str = 'master',
-            type: str = 'file'
-    ):
-        self.entity: str = entity
-        self.project: str = project
-        self.language: str = language
-        self.time: float = time
-        self.is_write: bool = is_write
-        self.branch: str = branch
-        self.type: str = type
-        self.category: Union[str, None] = None
-
-
-def generate_data(n: int, n_projects: int = 5, n_past_hours: int = 24) -> List[Heartbeat]:
-    data: List[Heartbeat] = []
-    now: datetime = datetime.today()
-    projects: List[str] = [randomword(random.randint(5, 10)) for _ in range(n_projects)]
-    languages: List[str] = list(LANGUAGES.keys())
-
-    for _ in range(n):
-        p: str = random.choice(projects)
-        l: str = random.choice(languages)
-        f: str = randomword(random.randint(2, 8))
-        delta: timedelta = timedelta(
-            hours=random.randint(0, n_past_hours - 1),
-            minutes=random.randint(0, 59),
-            seconds=random.randint(0, 59),
-            milliseconds=random.randint(0, 999),
-            microseconds=random.randint(0, 999)
-        )
-
-        data.append(Heartbeat(
-            entity=f'/home/me/dev/{p}/{f}.{LANGUAGES[l]}',
-            project=p,
-            language=l,
-            time=(now - delta).timestamp()
-        ))
-
-    return data
-
-
-def post_data_sync(data: List[Heartbeat], url: str, api_key: str):
-    encoded_key: str = str(base64.b64encode(api_key.encode('utf-8')), 'utf-8')
-
-    for h in tqdm(data):
-        r = requests.post(url, json=[h.__dict__], headers={
-            'User-Agent': UA,
-            'Authorization': f'Basic {encoded_key}',
-            'X-Machine-Name': MACHINE,
-        })
-        if r.status_code != 201:
-            print(r.text)
-            sys.exit(1)
-
-
-def randomword(length: int) -> str:
-    letters = string.ascii_lowercase + 'äöü💩'  # test utf8 and utf8mb4 characters as well
-    return ''.join(random.choice(letters) for _ in range(length))
-
-
-def parse_arguments():
-    parser = argparse.ArgumentParser(description='Wakapi test data insertion script.')
-    parser.add_argument('-n', type=int, default=20, help='total number of random heartbeats to generate and insert')
-    parser.add_argument('-u', '--url', type=str, default='http://localhost:3000/api/heartbeat',
-                        help='url of your api\'s heartbeats endpoint')
-    parser.add_argument('-k', '--apikey', type=str, required=True,
-                        help='your api key (to get one, go to the web interface, create a new user, log in and copy the key)')
-    parser.add_argument('-p', '--projects', type=int, default=5, help='number of different fake projects to generate')
-    parser.add_argument('-o', '--offset', type=int, default=24,
-                        help='negative time offset in hours from now for to be used as an interval within which to generate heartbeats for')
-    parser.add_argument('-s', '--seed', type=int, default=2020,
-                        help='a seed for initializing the pseudo-random number generator')
-    return parser.parse_args()
-
-
-if __name__ == '__main__':
-    args = parse_arguments()
-
-    random.seed(args.seed)
-
-    data: List[Heartbeat] = generate_data(args.n, args.projects, args.offset)
-    post_data_sync(data, args.url, args.apikey)
--- a/scripts/sample_data.py
+++ b/scripts/sample_data.py
@ -0,0 +1,271 @@
+#!/usr/bin/python3
+
+import argparse
+import base64
+import random
+import string
+import sys
+from datetime import datetime, timedelta
+from typing import List, Union, Callable
+
+import requests
+from tqdm import tqdm
+
+MACHINE = "devmachine"
+UA = 'wakatime/13.0.7 (Linux-4.15.0-91-generic-x86_64-with-glibc2.4) Python3.8.0.final.0 generator/1.42.1 generator-wakatime/4.0.0'
+LANGUAGES = {
+    'Go': 'go',
+    'Java': 'java',
+    'JavaScript': 'js',
+    'Python': 'py'
+}
+
+
+class Heartbeat:
+    def __init__(
+            self,
+            entity: str,
+            project: str,
+            language: str,
+            time: float,
+            is_write: bool = True,
+            branch: str = 'master',
+            type: str = 'file'
+    ):
+        self.entity: str = entity
+        self.project: str = project
+        self.language: str = language
+        self.time: float = time
+        self.is_write: bool = is_write
+        self.branch: str = branch
+        self.type: str = type
+        self.category: Union[str, None] = None
+
+
+class ConfigParams:
+    def __init__(self):
+        self.api_url = ''
+        self.api_key = ''
+        self.n = 0
+        self.n_projects = 0
+        self.offset = 0
+        self.seed = 0
+
+
+def generate_data(n: int, n_projects: int = 5, n_past_hours: int = 24) -> List[Heartbeat]:
+    data: List[Heartbeat] = []
+    now: datetime = datetime.today()
+    projects: List[str] = [randomword(random.randint(5, 10)) for _ in range(n_projects)]
+    languages: List[str] = list(LANGUAGES.keys())
+
+    for _ in range(n):
+        p: str = random.choice(projects)
+        l: str = random.choice(languages)
+        f: str = randomword(random.randint(2, 8))
+        delta: timedelta = timedelta(
+            hours=random.randint(0, n_past_hours - 1),
+            minutes=random.randint(0, 59),
+            seconds=random.randint(0, 59),
+            milliseconds=random.randint(0, 999),
+            microseconds=random.randint(0, 999)
+        )
+
+        data.append(Heartbeat(
+            entity=f'/home/me/dev/{p}/{f}.{LANGUAGES[l]}',
+            project=p,
+            language=l,
+            time=(now - delta).timestamp()
+        ))
+
+    return data
+
+
+def post_data_sync(data: List[Heartbeat], url: str, api_key: str):
+    encoded_key: str = str(base64.b64encode(api_key.encode('utf-8')), 'utf-8')
+
+    for h in data:
+        r = requests.post(url, json=[h.__dict__], headers={
+            'User-Agent': UA,
+            'Authorization': f'Basic {encoded_key}',
+            'X-Machine-Name': MACHINE,
+        })
+        if r.status_code != 201:
+            print(r.text)
+            sys.exit(1)
+
+
+def make_gui(callback: Callable[[ConfigParams, Callable[[int], None]], None]) -> ('QApplication', 'QWidget'):
+    from PyQt5.QtCore import Qt
+    from PyQt5.QtWidgets import QApplication, QWidget, QFormLayout, QHBoxLayout, QVBoxLayout, QGroupBox, QLabel, \
+        QLineEdit, QSpinBox, QProgressBar, QPushButton
+
+    # Main app
+    app = QApplication([])
+
+    window = QWidget()
+    window.setWindowTitle('Wakapi Sample Data Generator')
+    window.setFixedSize(window.sizeHint())
+    window.setMinimumWidth(350)
+
+    container_layout = QVBoxLayout()
+
+    # Top Controls
+    form_layout_1 = QFormLayout()
+
+    url_input_label = QLabel('URL:')
+    url_input = QLineEdit()
+    url_input.setPlaceholderText('Wakatime API Url')
+    url_input.setText('http://localhost:3000/api')
+
+    api_key_input_label = QLabel('API Key:')
+    api_key_input = QLineEdit()
+    api_key_input.setPlaceholderText(f'{"x"*8}-{"x"*4}-{"x"*4}-{"x"*4}-{"x"*12}')
+
+    form_layout_1.addRow(url_input_label, url_input)
+    form_layout_1.addRow(api_key_input_label, api_key_input)
+
+    # Middle controls
+    form_layout_2 = QFormLayout()
+    params_container = QGroupBox('Parameters')
+    params_container.setLayout(form_layout_2)
+
+    heartbeats_input_label = QLabel('# Heartbeats')
+    heartbeats_input = QSpinBox()
+    heartbeats_input.setMaximum(2147483647)
+    heartbeats_input.setValue(100)
+
+    projects_input_label = QLabel('# Projects:')
+    projects_input = QSpinBox()
+    projects_input.setMinimum(1)
+    projects_input.setValue(5)
+
+    offset_input_label = QLabel('Time Offset (hrs):')
+    offset_input = QSpinBox()
+    offset_input.setMinimum(-2147483647)
+    offset_input.setMaximum(0)
+    offset_input.setValue(-12)
+
+    seed_input_label = QLabel('Random Seed:')
+    seed_input = QSpinBox()
+    seed_input.setMaximum(2147483647)
+    seed_input.setValue(1337)
+
+    form_layout_2.addRow(heartbeats_input_label, heartbeats_input)
+    form_layout_2.addRow(projects_input_label, projects_input)
+    form_layout_2.addRow(offset_input_label, offset_input)
+    form_layout_2.addRow(seed_input_label, seed_input)
+
+    # Bottom controls
+    bottom_layout = QHBoxLayout()
+
+    start_button = QPushButton('Generate')
+    progress_bar = QProgressBar()
+
+    bottom_layout.addWidget(progress_bar)
+    bottom_layout.addWidget(start_button)
+
+    # Wiring up
+    container_layout.addLayout(form_layout_1)
+    container_layout.addWidget(params_container)
+    container_layout.addLayout(bottom_layout)
+    container_layout.setStretch(1, 1)
+
+    window.setLayout(container_layout)
+
+    # Done dialog
+    done_dialog = QWidget()
+    done_dialog.setWindowTitle('Done')
+    done_ok_button = QPushButton('Ok')
+    done_layout = QVBoxLayout()
+    done_layout.addWidget(QLabel('Done!'), alignment=Qt.AlignCenter)
+    done_layout.addWidget(done_ok_button, alignment=Qt.AlignCenter)
+    done_dialog.setFixedSize(done_dialog.sizeHint())
+    done_ok_button.clicked.connect(done_dialog.close)
+    done_dialog.setLayout(done_layout)
+
+    # Logic
+    def parse_params() -> ConfigParams:
+        params = ConfigParams()
+        params.api_url = url_input.text()
+        params.api_key = api_key_input.text()
+        params.n = heartbeats_input.value()
+        params.n_projects = projects_input.value()
+        params.offset = offset_input.value()
+        params.seed = seed_input.value()
+        return params
+
+    def update_progress(inc=1):
+        current = progress_bar.value()
+        updated = current + inc
+        if updated == progress_bar.maximum() - 1:
+            progress_bar.setValue(0)
+            start_button.setEnabled(True)
+            done_dialog.show()
+            return
+        progress_bar.setValue(updated)
+
+    def call_back():
+        params = parse_params()
+        progress_bar.setMaximum(params.n)
+        start_button.setEnabled(False)
+        callback(params, update_progress)
+
+    start_button.clicked.connect(call_back)
+
+    return app, window
+
+
+def parse_arguments():
+    parser = argparse.ArgumentParser(description='Wakapi test data insertion script.')
+    parser.add_argument('--headless', default=False, help='do not show a gui', action='store_true')
+    parser.add_argument('-n', type=int, default=20, help='total number of random heartbeats to generate and insert')
+    parser.add_argument('-u', '--url', type=str, default='http://localhost:3000/api',
+                        help='url of your api\'s heartbeats endpoint')
+    parser.add_argument('-k', '--apikey', type=str,
+                        help='your api key (to get one, go to the web interface, create a new user, log in and copy the key)')
+    parser.add_argument('-p', '--projects', type=int, default=5, help='number of different fake projects to generate')
+    parser.add_argument('-o', '--offset', type=int, default=24,
+                        help='negative time offset in hours from now for to be used as an interval within which to generate heartbeats for')
+    parser.add_argument('-s', '--seed', type=int, default=2020,
+                        help='a seed for initializing the pseudo-random number generator')
+    return parser.parse_args()
+
+
+def args_to_params(parsed_args: argparse.Namespace) -> (ConfigParams, bool):
+    params = ConfigParams()
+    params.n = parsed_args.n
+    params.n_projects = parsed_args.projects
+    params.offset = parsed_args.offset
+    params.seed = parsed_args.seed
+    params.api_url = parsed_args.url
+    params.api_key = parsed_args.apikey
+    return params, not parsed_args.headless
+
+
+def randomword(length: int) -> str:
+    letters = string.ascii_lowercase + 'äöü💩'  # test utf8 and utf8mb4 characters as well
+    return ''.join(random.choice(letters) for _ in range(length))
+
+
+def run(params: ConfigParams, update_progress: Callable[[int], None]):
+    random.seed(params.seed)
+    data: List[Heartbeat] = generate_data(
+        params.n,
+        params.n_projects,
+        params.offset * -1 if params.offset < 0 else params.offset
+    )
+
+    for d in data:
+        post_data_sync([d], f'{params.api_url}/heartbeats', params.api_key)
+        update_progress(1)
+
+
+if __name__ == '__main__':
+    params, show_gui = args_to_params(parse_arguments())
+    if show_gui:
+        app, window = make_gui(callback=run)
+        window.show()
+        app.exec()
+    else:
+        pbar = tqdm(total=params.n)
+        run(params, pbar.update)
--- a/services/heartbeat.go
+++ b/services/heartbeat.go
@ -27,7 +27,18 @@ func (srv *HeartbeatService) Insert(heartbeat *models.Heartbeat) error {
 }

 func (srv *HeartbeatService) InsertBatch(heartbeats []*models.Heartbeat) error {
-	return srv.repository.InsertBatch(heartbeats)
+	hashes := make(map[string]bool)
+
+	// https://github.com/muety/wakapi/issues/139
+	filteredHeartbeats := make([]*models.Heartbeat, 0, len(heartbeats))
+	for _, hb := range heartbeats {
+		if _, ok := hashes[hb.Hash]; !ok {
+			filteredHeartbeats = append(filteredHeartbeats, hb)
+			hashes[hb.Hash] = true
+		}
+	}
+
+	return srv.repository.InsertBatch(filteredHeartbeats)
 }

 func (srv *HeartbeatService) Count() (int64, error) {
--- a/services/imports/wakatime.go
+++ b/services/imports/wakatime.go
@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"github.com/emvi/logbuch"
 	"github.com/muety/wakapi/config"
@ -17,7 +18,13 @@ import (
 )

 const OriginWakatime = "wakatime"
-const maxWorkers = 6
+const (
+	// wakatime api permits a max. rate of 10 req / sec
+	// https://github.com/wakatime/wakatime/issues/261
+	// with 5 workers, each sleeping slightly over 1/2 sec after every req., we should stay well below that limit
+	maxWorkers    = 5
+	throttleDelay = 550 * time.Millisecond
+)

 type WakatimeHeartbeatImporter struct {
 	ApiKey string
@ -72,11 +79,12 @@ func (w *WakatimeHeartbeatImporter) Import(user *models.User, minFrom time.Time,

 			go func(day time.Time) {
 				defer sem.Release(1)
+				defer time.Sleep(throttleDelay)

 				d := day.Format(config.SimpleDateFormat)
 				heartbeats, err := w.fetchHeartbeats(d)
 				if err != nil {
-					logbuch.Error("failed to fetch heartbeats for day '%s' and user '%s' – &v", day, user.ID, err)
+					logbuch.Error("failed to fetch heartbeats for day '%s' and user '%s' – &v", d, user.ID, err)
 				}

 				for _, h := range heartbeats {
@ -113,6 +121,8 @@ func (w *WakatimeHeartbeatImporter) fetchHeartbeats(day string) ([]*wakatime.Hea
 	res, err := httpClient.Do(w.withHeaders(req))
 	if err != nil {
 		return nil, err
+	} else if res.StatusCode >= 400 {
+		return nil, errors.New(fmt.Sprintf("got status %d from wakatime api", res.StatusCode))
 	}

 	var heartbeatsData wakatime.HeartbeatsViewModel
--- a/services/mail/mail.go
+++ b/services/mail/mail.go
@ -0,0 +1,81 @@
+package mail
+
+import (
+	"bytes"
+	"fmt"
+	"github.com/markbates/pkger"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/services"
+	"io/ioutil"
+	"text/template"
+)
+
+const (
+	tplPath                   = "/views/mail"
+	tplNamePasswordReset      = "reset_password"
+	tplNameImportNotification = "import_finished"
+	subjectPasswordReset      = "Wakapi – Password Reset"
+	subjectImportNotification = "Wakapi – Data Import Finished"
+)
+
+type PasswordResetTplData struct {
+	ResetLink string
+}
+
+type ImportNotificationTplData struct {
+	PublicUrl     string
+	Duration      string
+	NumHeartbeats int
+}
+
+// Factory
+func NewMailService() services.IMailService {
+	config := conf.Get()
+	if config.Mail.Enabled {
+		if config.Mail.Provider == conf.MailProviderMailWhale {
+			return NewMailWhaleService(config.Mail.MailWhale, config.Server.PublicUrl)
+		} else if config.Mail.Provider == conf.MailProviderSmtp {
+			return NewSMTPMailService(config.Mail.Smtp, config.Server.PublicUrl)
+		}
+	}
+	return &NoopMailService{}
+}
+
+func getPasswordResetTemplate(data PasswordResetTplData) (*bytes.Buffer, error) {
+	tpl, err := loadTemplate(tplNamePasswordReset)
+	if err != nil {
+		return nil, err
+	}
+	var rendered bytes.Buffer
+	if err := tpl.Execute(&rendered, data); err != nil {
+		return nil, err
+	}
+	return &rendered, nil
+}
+
+func getImportNotificationTemplate(data ImportNotificationTplData) (*bytes.Buffer, error) {
+	tpl, err := loadTemplate(tplNameImportNotification)
+	if err != nil {
+		return nil, err
+	}
+	var rendered bytes.Buffer
+	if err := tpl.Execute(&rendered, data); err != nil {
+		return nil, err
+	}
+	return &rendered, nil
+}
+
+func loadTemplate(tplName string) (*template.Template, error) {
+	tplFile, err := pkger.Open(fmt.Sprintf("%s/%s.tpl.html", tplPath, tplName))
+	if err != nil {
+		return nil, err
+	}
+	defer tplFile.Close()
+
+	tplData, err := ioutil.ReadAll(tplFile)
+	if err != nil {
+		return nil, err
+	}
+
+	return template.New(tplName).Parse(string(tplData))
+}
--- a/services/mail/mailwhale.go
+++ b/services/mail/mailwhale.go
@ -0,0 +1,92 @@
+package mail
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"net/http"
+	"time"
+)
+
+type MailWhaleMailService struct {
+	publicUrl  string
+	config     *conf.MailwhaleMailConfig
+	httpClient *http.Client
+}
+
+type MailWhaleSendRequest struct {
+	To           []string          `json:"to"`
+	Subject      string            `json:"subject"`
+	Text         string            `json:"text"`
+	Html         string            `json:"html"`
+	TemplateId   string            `json:"template_id"`
+	TemplateVars map[string]string `json:"template_vars"`
+}
+
+func NewMailWhaleService(config *conf.MailwhaleMailConfig, publicUrl string) *MailWhaleMailService {
+	return &MailWhaleMailService{
+		publicUrl: publicUrl,
+		config:    config,
+		httpClient: &http.Client{
+			Timeout: 10 * time.Second,
+		},
+	}
+}
+
+func (s *MailWhaleMailService) SendPasswordReset(recipient *models.User, resetLink string) error {
+	template, err := getPasswordResetTemplate(PasswordResetTplData{ResetLink: resetLink})
+	if err != nil {
+		return err
+	}
+	return s.send(recipient.Email, subjectPasswordReset, template.String(), true)
+}
+
+func (s *MailWhaleMailService) SendImportNotification(recipient *models.User, duration time.Duration, numHeartbeats int) error {
+	template, err := getImportNotificationTemplate(ImportNotificationTplData{
+		PublicUrl:     s.publicUrl,
+		Duration:      fmt.Sprintf("%.0f seconds", duration.Seconds()),
+		NumHeartbeats: numHeartbeats,
+	})
+	if err != nil {
+		return err
+	}
+	return s.send(recipient.Email, subjectImportNotification, template.String(), true)
+}
+
+func (s *MailWhaleMailService) send(to, subject, body string, isHtml bool) error {
+	if to == "" {
+		return errors.New("not sending mail as recipient mail address seems to be invalid")
+	}
+
+	sendRequest := &MailWhaleSendRequest{
+		To:      []string{to},
+		Subject: subject,
+	}
+	if isHtml {
+		sendRequest.Html = body
+	} else {
+		sendRequest.Text = body
+	}
+	payload, _ := json.Marshal(sendRequest)
+
+	req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("%s/api/mail", s.config.Url), bytes.NewBuffer(payload))
+	if err != nil {
+		return err
+	}
+
+	req.SetBasicAuth(s.config.ClientId, s.config.ClientSecret)
+	req.Header.Set("Content-Type", "application/json")
+
+	res, err := s.httpClient.Do(req)
+	if err != nil {
+		return err
+	}
+	if res.StatusCode >= 400 {
+		return errors.New(fmt.Sprintf("got status %d from mailwhale", res.StatusCode))
+	}
+
+	return nil
+}
--- a/services/mail/noop.go
+++ b/services/mail/noop.go
@ -0,0 +1,19 @@
+package mail
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/models"
+	"time"
+)
+
+type NoopMailService struct{}
+
+func (n *NoopMailService) SendPasswordReset(recipient *models.User, resetLink string) error {
+	logbuch.Info("noop mail service doing nothing instead of sending password reset mail to %s", recipient.ID)
+	return nil
+}
+
+func (n *NoopMailService) SendImportNotification(recipient *models.User, duration time.Duration, numHeartbeats int) error {
+	logbuch.Info("noop mail service doing nothing instead of sending import notification mail to %s", recipient.ID)
+	return nil
+}
--- a/services/mail/smtp.go
+++ b/services/mail/smtp.go
@ -0,0 +1,117 @@
+package mail
+
+import (
+	"errors"
+	"fmt"
+	"github.com/emersion/go-sasl"
+	"github.com/emersion/go-smtp"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"io"
+	"time"
+)
+
+type SMTPMailService struct {
+	publicUrl string
+	config    *conf.SMTPMailConfig
+	auth      sasl.Client
+}
+
+func NewSMTPMailService(config *conf.SMTPMailConfig, publicUrl string) *SMTPMailService {
+	return &SMTPMailService{
+		publicUrl: publicUrl,
+		config:    config,
+		auth: sasl.NewPlainClient(
+			"",
+			config.Username,
+			config.Password,
+		),
+	}
+}
+
+func (s *SMTPMailService) SendPasswordReset(recipient *models.User, resetLink string) error {
+	template, err := getPasswordResetTemplate(PasswordResetTplData{ResetLink: resetLink})
+	if err != nil {
+		return err
+	}
+
+	mail := &models.Mail{
+		From:    models.MailAddress(s.config.Sender),
+		To:      models.MailAddresses([]models.MailAddress{models.MailAddress(recipient.Email)}),
+		Subject: subjectPasswordReset,
+	}
+	mail.WithHTML(template.String())
+
+	return s.send(s.config.ConnStr(), s.config.TLS, s.auth, mail.From.Raw(), mail.To.RawStrings(), mail.Reader())
+}
+
+func (s *SMTPMailService) SendImportNotification(recipient *models.User, duration time.Duration, numHeartbeats int) error {
+	template, err := getImportNotificationTemplate(ImportNotificationTplData{
+		PublicUrl:     s.publicUrl,
+		Duration:      fmt.Sprintf("%.0f seconds", duration.Seconds()),
+		NumHeartbeats: numHeartbeats,
+	})
+	if err != nil {
+		return err
+	}
+
+	mail := &models.Mail{
+		From:    models.MailAddress(s.config.Sender),
+		To:      models.MailAddresses([]models.MailAddress{models.MailAddress(recipient.Email)}),
+		Subject: subjectImportNotification,
+	}
+	mail.WithHTML(template.String())
+
+	return s.send(s.config.ConnStr(), s.config.TLS, s.auth, mail.From.Raw(), mail.To.RawStrings(), mail.Reader())
+}
+
+func (s *SMTPMailService) send(addr string, tls bool, a sasl.Client, from string, to []string, r io.Reader) error {
+	dial := smtp.Dial
+	if tls {
+		dial = func(addr string) (*smtp.Client, error) {
+			return smtp.DialTLS(addr, nil)
+		}
+	}
+
+	c, err := dial(addr)
+	if err != nil {
+		return err
+	}
+
+	defer c.Close()
+
+	if ok, _ := c.Extension("STARTTLS"); ok {
+		if err = c.StartTLS(nil); err != nil {
+			return err
+		}
+	}
+	if a != nil {
+		if ok, _ := c.Extension("AUTH"); !ok {
+			return errors.New("smtp: server doesn't support AUTH")
+		}
+		if err = c.Auth(a); err != nil {
+			return err
+		}
+	}
+	if err = c.Mail(from, nil); err != nil {
+		return err
+	}
+	for _, addr := range to {
+		if err = c.Rcpt(addr); err != nil {
+			return err
+		}
+	}
+	w, err := c.Data()
+	if err != nil {
+		return err
+	}
+	_, err = io.Copy(w, r)
+	if err != nil {
+		return err
+	}
+	err = w.Close()
+	if err != nil {
+		return err
+	}
+	return c.Quit()
+}
--- a/services/mail/utils.go
+++ b/services/mail/utils.go
@ -0,0 +1 @@
+package mail
--- a/services/misc.go
+++ b/services/misc.go
@ -79,7 +79,7 @@ func (srv *MiscService) runCountTotalTime() error {

 func (srv *MiscService) countTotalTimeWorker(jobs <-chan *CountTotalTimeJob, results chan<- *CountTotalTimeResult) {
 	for job := range jobs {
-		if result, err := srv.summaryService.Aliased(time.Time{}, time.Now(), &models.User{ID: job.UserID}, srv.summaryService.Retrieve); err != nil {
+		if result, err := srv.summaryService.Aliased(time.Time{}, time.Now(), &models.User{ID: job.UserID}, srv.summaryService.Retrieve, false); err != nil {
 			logbuch.Error("failed to count total for user %s: %v", job.UserID, err)
 		} else {
 			logbuch.Info("successfully counted total for user %s", job.UserID)
--- a/services/services.go
+++ b/services/services.go
@ -53,7 +53,7 @@ type ILanguageMappingService interface {
 }

 type ISummaryService interface {
-	Aliased(time.Time, time.Time, *models.User, SummaryRetriever) (*models.Summary, error)
+	Aliased(time.Time, time.Time, *models.User, SummaryRetriever, bool) (*models.Summary, error)
 	Retrieve(time.Time, time.Time, *models.User) (*models.Summary, error)
 	Summarize(time.Time, time.Time, *models.User) (*models.Summary, error)
 	GetLatestByUser() ([]*models.TimeByUser, error)
@ -64,6 +64,8 @@ type ISummaryService interface {
 type IUserService interface {
 	GetUserById(string) (*models.User, error)
 	GetUserByKey(string) (*models.User, error)
+	GetUserByEmail(string) (*models.User, error)
+	GetUserByResetToken(string) (*models.User, error)
 	GetAll() ([]*models.User, error)
 	GetActive() ([]*models.User, error)
 	Count() (int64, error)
@ -73,5 +75,11 @@ type IUserService interface {
 	ResetApiKey(*models.User) (*models.User, error)
 	SetWakatimeApiKey(*models.User, string) (*models.User, error)
 	MigrateMd5Password(*models.User, *models.Login) (*models.User, error)
+	GenerateResetToken(*models.User) (*models.User, error)
 	FlushCache()
 }
+
+type IMailService interface {
+	SendPasswordReset(*models.User, string) error
+	SendImportNotification(*models.User, time.Duration, int) error
+}
--- a/services/summary.go
+++ b/services/summary.go
@ -36,10 +36,10 @@ func NewSummaryService(summaryRepo repositories.ISummaryRepository, heartbeatSer

 // Public summary generation methods

-func (srv *SummaryService) Aliased(from, to time.Time, user *models.User, f SummaryRetriever) (*models.Summary, error) {
+func (srv *SummaryService) Aliased(from, to time.Time, user *models.User, f SummaryRetriever, skipCache bool) (*models.Summary, error) {
 	// Check cache
 	cacheKey := srv.getHash(from.String(), to.String(), user.ID, "--aliased")
-	if cacheResult, ok := srv.cache.Get(cacheKey); ok {
+	if cacheResult, ok := srv.cache.Get(cacheKey); ok && !skipCache {
 		return cacheResult.(*models.Summary), nil
 	}

--- a/services/summary_test.go
+++ b/services/summary_test.go
@ -253,7 +253,7 @@ func (suite *SummaryServiceTestSuite) TestSummaryService_Aliased() {
 	suite.AliasService.On("GetAliasOrDefault", TestUserId, models.SummaryProject, TestProject1).Return(TestProject2, nil)
 	suite.AliasService.On("GetAliasOrDefault", TestUserId, mock.Anything, mock.Anything).Return("", nil)

-	result, err = sut.Aliased(from, to, suite.TestUser, sut.Summarize)
+	result, err = sut.Aliased(from, to, suite.TestUser, sut.Summarize, false)

 	assert.Nil(suite.T(), err)
 	assert.NotNil(suite.T(), result)
--- a/services/user.go
+++ b/services/user.go
@ -52,6 +52,14 @@ func (srv *UserService) GetUserByKey(key string) (*models.User, error) {
 	return u, nil
 }

+func (srv *UserService) GetUserByEmail(email string) (*models.User, error) {
+	return srv.repository.GetByEmail(email)
+}
+
+func (srv *UserService) GetUserByResetToken(resetToken string) (*models.User, error) {
+	return srv.repository.GetByResetToken(resetToken)
+}
+
 func (srv *UserService) GetAll() ([]*models.User, error) {
 	return srv.repository.GetAll()
 }
@ -110,6 +118,10 @@ func (srv *UserService) MigrateMd5Password(user *models.User, login *models.Logi
 	return srv.repository.UpdateField(user, "password", user.Password)
 }

+func (srv *UserService) GenerateResetToken(user *models.User) (*models.User, error) {
+	return srv.repository.UpdateField(user, "reset_token", uuid.NewV4())
+}
+
 func (srv *UserService) Delete(user *models.User) error {
 	srv.cache.Flush()
 	return srv.repository.Delete(user)
--- a/sonar-project.properties
+++ b/sonar-project.properties
@ -1,3 +1,3 @@
-sonar.exclusions=**/*_test.go,.idea/**,.vscode/**,mocks/**
+sonar.exclusions=**/*_test.go,.idea/**,.vscode/**,mocks/**,static/**
 sonar.tests=.
 sonar.go.coverage.reportPaths=coverage/coverage.out
--- a/static/assets/app.js
+++ b/static/assets/app.js
@ -371,21 +371,6 @@ function copyApiKey(event) {
    event.stopPropagation()
 }

-// https://koddsson.com/posts/emoji-favicon/
-const favicon = document.querySelector('link[rel=icon]')
-if (favicon) {
-    const emoji = favicon.getAttribute('data-emoji')
-    if (emoji) {
-        const canvas = document.createElement('canvas')
-        canvas.height = 64
-        canvas.width = 64
-        const ctx = canvas.getContext('2d')
-        ctx.font = '64px serif'
-        ctx.fillText(emoji, 0, 64)
-        favicon.href = canvas.toDataURL()
-    }
-}
-
 // Click outside
 window.addEventListener('click', function (event) {
    if (event.target.classList.contains('popup')) {
--- a/utils/summary.go
+++ b/utils/summary.go
@ -71,7 +71,7 @@ func ResolveInterval(interval *models.IntervalKey) (err error, from, to time.Tim
 }

 func ParseSummaryParams(r *http.Request) (*models.SummaryParams, error) {
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := extractUser(r)
 	params := r.URL.Query()

 	var err error
@ -108,3 +108,13 @@ func ParseSummaryParams(r *http.Request) (*models.SummaryParams, error) {
 		Recompute: recompute,
 	}, nil
 }
+
+func extractUser(r *http.Request) *models.User {
+	type principalGetter interface {
+		GetPrincipal() *models.User
+	}
+	if p := r.Context().Value("principal"); p != nil {
+		return p.(principalGetter).GetPrincipal()
+	}
+	return nil
+}
--- a/version.txt
+++ b/version.txt
@ -1 +1 @@
-1.24.5
+1.26.1
--- a/views/foot.tpl.html
+++ b/views/foot.tpl.html
@ -1,2 +1,2 @@
-<script src="assets/vendor/seedrandom.min.js" integrity="sha384-bFS5CG904xYIgxBcrDF4KFNXuM7KeSGsSvS/QTaDqMTEdbaaxjg2Y2TSU3Ygs7wG" crossorigin="anonymous"></script>
-<script src="assets/vendor/Chart.bundle.min.js" integrity="sha384-mZ3q69BYmd4GxHp59G3RrsaFdWDxVSoqd7oVYuWRm2qiXrduT63lQtlhdD9lKbm3" crossorigin="anonymous"></script>
+<script src="assets/vendor/seedrandom.min.js"></script>
+<script src="assets/vendor/Chart.bundle.min.js"></script>
--- a/views/head.tpl.html
+++ b/views/head.tpl.html
@ -2,6 +2,10 @@
    <title>Wakapi – Coding Statistics</title>
    <base href="{{ getBasePath }}/">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
+    <meta property="og:title" content="Wakapi - Coding Statistics" />
+    <meta property="og:type" content="website" />
+    <meta property="og:description" content="Wakapi is an open-source tool that helps you keep track of the time you have spent coding on different projects in different programming languages and more. Ideal for statistics freaks and anyone else.">
+    <meta property="og:image" content="assets/images/screenshot.png" />
    <link rel="apple-touch-icon" sizes="180x180" href="assets/images/apple-touch-icon.png">
    <link rel="icon" type="image/png" sizes="32x32" href="assets/images/favicon-32x32.png">
    <link rel="icon" type="image/png" sizes="16x16" href="assets/images/favicon-16x16.png">
--- a/views/index.tpl.html
+++ b/views/index.tpl.html
@ -46,6 +46,10 @@
                <button type="button" class="py-1 px-3 h-8 rounded border border-green-700 text-white">📡 Host it
                </button>
            </a>
+            <a href="https://liberapay.com/muety" target="_blank" rel="noopener noreferrer">
+                <button type="button" class="py-1 px-3 h-8 rounded border border-green-700 text-white">🙏 Support it
+                </button>
+            </a>
            <a href="https://github.com/muety/wakapi" target="_blank" rel="noopener noreferrer">
                <button type="button" class="py-1 px-3 h-8 rounded border border-green-700 text-white">
                    <img alt="GitHub Icon" src="assets/images/ghicon.svg" width="22px">
--- a/views/login.tpl.html
+++ b/views/login.tpl.html
@ -7,8 +7,12 @@

 {{ template "header.tpl.html" . }}

-<div class="flex items-center justify-center">
-    <h1 class="font-semibold text-xl text-white m-0 border-b-4 border-green-700">Login</h1>
+<div class="w-full flex justify-center">
+    <div class="flex items-center justify-between max-w-lg flex-grow">
+        <div><a onclick="window.history.back()" class="text-gray-500 text-sm cursor-pointer">&larr; Go back</a></div>
+        <div><h1 class="font-semibold text-2xl text-white m-0 border-b-4 border-green-700">Login</h1></div>
+        <div></div>
+    </div>
 </div>

 {{ template "alerts.tpl.html" . }}
@ -28,11 +32,16 @@
                       type="password" id="password"
                       name="password" placeholder="******" minlength="6" required>
            </div>
-            <div class="flex justify-between">
-                <a href="signup">
-                    <button type="button" class="py-1 px-3 rounded border border-green-700 text-white text-sm">Sign up</button>
+            <div class="flex justify-between items-center">
+                <a href="reset-password" class="text-gray-500 text-sm">
+                    Forgot password?
                </a>
-                <button type="submit" class="py-1 px-3 rounded bg-green-700 hover:bg-green-800 text-white text-sm">Log in</button>
+                <div class="flex space-x-2">
+                    <a href="signup">
+                        <button type="button" class="py-1 px-3 rounded border border-green-700 text-white text-sm">Sign up</button>
+                    </a>
+                    <button type="submit" class="py-1 px-3 rounded bg-green-700 hover:bg-green-800 text-white text-sm">Log in</button>
+                </div>
            </div>
        </form>
    </div>
--- a/views/mail/import_finished.tpl.html
+++ b/views/mail/import_finished.tpl.html
@ -0,0 +1,152 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta name="viewport" content="width=device-width">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Wakapi – Data Import Finished</title>
+    <style>
+        @media only screen and (max-width: 620px) {
+            table[class=body] h1 {
+                font-size: 28px !important;
+                margin-bottom: 10px !important;
+            }
+            table[class=body] p,
+            table[class=body] ul,
+            table[class=body] ol,
+            table[class=body] td,
+            table[class=body] span,
+            table[class=body] a {
+                font-size: 16px !important;
+            }
+            table[class=body] .wrapper,
+            table[class=body] .article {
+                padding: 10px !important;
+            }
+            table[class=body] .content {
+                padding: 0 !important;
+            }
+            table[class=body] .container {
+                padding: 0 !important;
+                width: 100% !important;
+            }
+            table[class=body] .main {
+                border-left-width: 0 !important;
+                border-radius: 0 !important;
+                border-right-width: 0 !important;
+            }
+            table[class=body] .btn table {
+                width: 100% !important;
+            }
+            table[class=body] .btn a {
+                width: 100% !important;
+            }
+            table[class=body] .img-responsive {
+                height: auto !important;
+                max-width: 100% !important;
+                width: auto !important;
+            }
+        }
+
+        /* -------------------------------------
+            PRESERVE THESE STYLES IN THE HEAD
+        ------------------------------------- */
+        @media all {
+            .ExternalClass {
+                width: 100%;
+            }
+            .ExternalClass,
+            .ExternalClass p,
+            .ExternalClass span,
+            .ExternalClass font,
+            .ExternalClass td,
+            .ExternalClass div {
+                line-height: 100%;
+            }
+            .apple-link a {
+                color: inherit !important;
+                font-family: inherit !important;
+                font-size: inherit !important;
+                font-weight: inherit !important;
+                line-height: inherit !important;
+                text-decoration: none !important;
+            }
+            #MessageViewBody a {
+                color: inherit;
+                text-decoration: none;
+                font-size: inherit;
+                font-family: inherit;
+                font-weight: inherit;
+                line-height: inherit;
+            }
+            .btn-primary table td:hover {
+                background-color: #047857 !important;
+            }
+            .btn-primary a:hover {
+                background-color: #047857 !important;
+                border-color: #047857 !important;
+            }
+        }
+    </style>
+</head>
+<body class="" style="background-color: #f6f6f6; font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
+<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #f6f6f6;">
+    <tr>
+        <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;">&nbsp;</td>
+        <td class="container" style="font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; Margin: 0 auto; max-width: 580px; padding: 10px; width: 580px;">
+            <div class="content" style="box-sizing: border-box; display: block; Margin: 0 auto; max-width: 580px; padding: 10px;">
+
+                <!-- START CENTERED WHITE CONTAINER -->
+                <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 3px;">
+
+                    <!-- START MAIN CONTENT AREA -->
+                    <tr>
+                        <td class="wrapper" style="font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 20px;">
+                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                                <tr>
+                                    <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+                                        <p style="font-family: sans-serif; font-size: 18px; font-weight: 500; margin: 0; Margin-bottom: 15px;">Data import finished</p>
+                                        <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">You have requested to import data from WakaTime to Wakapi. The import has now finished after {{ .Duration }} ({{ .NumHeartbeats }} new heartbeats imported).<br><br>You should be able to see the newly imported coding statistics in Wakapi.</p>
+                                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
+                                            <tbody>
+                                            <tr>
+                                                <td align="left" style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;">
+                                                    <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                                                        <tbody>
+                                                        <tr>
+                                                            <td style="font-family: sans-serif; font-size: 14px; vertical-align: top; background-color: #2F855A; border-radius: 5px; text-align: center;"> <a href="{{ .PublicUrl }}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #2F855A; border: solid 1px #2F855A; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-transform: capitalize; border-color: #2F855A;">Go to dashboard</a> </td>
+                                                        </tr>
+                                                        </tbody>
+                                                    </table>
+                                                </td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+
+                    <!-- END MAIN CONTENT AREA -->
+                </table>
+
+                <!-- START FOOTER -->
+                <div class="footer" style="clear: both; Margin-top: 10px; text-align: center; width: 100%;">
+                    <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                        <tr>
+                            <td class="content-block powered-by" style="font-family: sans-serif; vertical-align: top; padding-bottom: 10px; padding-top: 10px; font-size: 12px; color: #999999; text-align: center;">
+                                Powered by <a href="https://wakapi.dev" style="color: #999999; font-size: 12px; text-align: center; text-decoration: none;">Wakapi.dev</a>.
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+                <!-- END FOOTER -->
+
+                <!-- END CENTERED WHITE CONTAINER -->
+            </div>
+        </td>
+        <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;">&nbsp;</td>
+    </tr>
+</table>
+</body>
+</html>
--- a/views/mail/reset_password.tpl.html
+++ b/views/mail/reset_password.tpl.html
@ -0,0 +1,153 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta name="viewport" content="width=device-width">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Wakapi – Reset Password</title>
+    <style>
+        @media only screen and (max-width: 620px) {
+            table[class=body] h1 {
+                font-size: 28px !important;
+                margin-bottom: 10px !important;
+            }
+            table[class=body] p,
+            table[class=body] ul,
+            table[class=body] ol,
+            table[class=body] td,
+            table[class=body] span,
+            table[class=body] a {
+                font-size: 16px !important;
+            }
+            table[class=body] .wrapper,
+            table[class=body] .article {
+                padding: 10px !important;
+            }
+            table[class=body] .content {
+                padding: 0 !important;
+            }
+            table[class=body] .container {
+                padding: 0 !important;
+                width: 100% !important;
+            }
+            table[class=body] .main {
+                border-left-width: 0 !important;
+                border-radius: 0 !important;
+                border-right-width: 0 !important;
+            }
+            table[class=body] .btn table {
+                width: 100% !important;
+            }
+            table[class=body] .btn a {
+                width: 100% !important;
+            }
+            table[class=body] .img-responsive {
+                height: auto !important;
+                max-width: 100% !important;
+                width: auto !important;
+            }
+        }
+
+        /* -------------------------------------
+            PRESERVE THESE STYLES IN THE HEAD
+        ------------------------------------- */
+        @media all {
+            .ExternalClass {
+                width: 100%;
+            }
+            .ExternalClass,
+            .ExternalClass p,
+            .ExternalClass span,
+            .ExternalClass font,
+            .ExternalClass td,
+            .ExternalClass div {
+                line-height: 100%;
+            }
+            .apple-link a {
+                color: inherit !important;
+                font-family: inherit !important;
+                font-size: inherit !important;
+                font-weight: inherit !important;
+                line-height: inherit !important;
+                text-decoration: none !important;
+            }
+            #MessageViewBody a {
+                color: inherit;
+                text-decoration: none;
+                font-size: inherit;
+                font-family: inherit;
+                font-weight: inherit;
+                line-height: inherit;
+            }
+            .btn-primary table td:hover {
+                background-color: #047857 !important;
+            }
+            .btn-primary a:hover {
+                background-color: #047857 !important;
+                border-color: #047857 !important;
+            }
+        }
+    </style>
+</head>
+<body class="" style="background-color: #f6f6f6; font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
+<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background-color: #f6f6f6;">
+    <tr>
+        <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;">&nbsp;</td>
+        <td class="container" style="font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; Margin: 0 auto; max-width: 580px; padding: 10px; width: 580px;">
+            <div class="content" style="box-sizing: border-box; display: block; Margin: 0 auto; max-width: 580px; padding: 10px;">
+
+                <!-- START CENTERED WHITE CONTAINER -->
+                <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 3px;">
+
+                    <!-- START MAIN CONTENT AREA -->
+                    <tr>
+                        <td class="wrapper" style="font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 20px;">
+                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                                <tr>
+                                    <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;">
+                                        <p style="font-family: sans-serif; font-size: 18px; font-weight: 500; margin: 0; Margin-bottom: 15px;">Password Reset</p>
+                                        <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">You have requested to reset your Wakapi password. Please click the following link to proceed.</p>
+                                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
+                                            <tbody>
+                                            <tr>
+                                                <td align="left" style="font-family: sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;">
+                                                    <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                                                        <tbody>
+                                                        <tr>
+                                                            <td style="font-family: sans-serif; font-size: 14px; vertical-align: top; background-color: #2F855A; border-radius: 5px; text-align: center;"> <a href="{{ .ResetLink }}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #2F855A; border: solid 1px #2F855A; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-transform: capitalize; border-color: #2F855A;">Reset Password</a> </td>
+                                                        </tr>
+                                                        </tbody>
+                                                    </table>
+                                                </td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                        <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">If you did not request a password change, please just ignore this mail.</p>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+
+                    <!-- END MAIN CONTENT AREA -->
+                </table>
+
+                <!-- START FOOTER -->
+                <div class="footer" style="clear: both; Margin-top: 10px; text-align: center; width: 100%;">
+                    <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                        <tr>
+                            <td class="content-block powered-by" style="font-family: sans-serif; vertical-align: top; padding-bottom: 10px; padding-top: 10px; font-size: 12px; color: #999999; text-align: center;">
+                                Powered by <a href="https://wakapi.dev" style="color: #999999; font-size: 12px; text-align: center; text-decoration: none;">Wakapi.dev</a>.
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+                <!-- END FOOTER -->
+
+                <!-- END CENTERED WHITE CONTAINER -->
+            </div>
+        </td>
+        <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;">&nbsp;</td>
+    </tr>
+</table>
+</body>
+</html>
--- a/views/reset-password.tpl.html
+++ b/views/reset-password.tpl.html
@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="en">
+
+{{ template "head.tpl.html" . }}
+
+<body class="bg-gray-850 text-gray-700 p-4 pt-10 flex flex-col min-h-screen max-w-screen-lg mx-auto justify-center">
+
+{{ template "header.tpl.html" . }}
+
+<div class="w-full flex justify-center">
+    <div class="flex items-center justify-between max-w-lg flex-grow">
+        <div><a onclick="window.history.back()" class="text-gray-500 text-sm cursor-pointer">&larr; Go back</a></div>
+        <div><h1 class="font-semibold text-2xl text-white m-0 border-b-4 border-green-700">Reset Password</h1></div>
+        <div></div>
+    </div>
+</div>
+
+{{ template "alerts.tpl.html" . }}
+
+<main class="mt-10 flex-grow flex justify-center w-full">
+    <div class="flex-grow max-w-lg mt-10">
+        <form action="reset-password" method="post">
+            <p class="text-sm text-white mb-8">If you forgot your password, enter the e-mail address you associated with Wakapi to reset it and choose a new one. You will receive an e-mail afterwards. Make sure to check your spam folder if it does not arrive after a few minutes.</p>
+            <div class="mb-8">
+                <label class="inline-block text-sm mb-1 text-gray-500" for="email">E-Mail</label>
+                <input class="shadow appearance-none bg-gray-800 focus:bg-gray-700 text-gray-300 border-green-700 focus:border-gray-500 border rounded w-full py-1 px-3"
+                       type="email" id="email"
+                       name="email" placeholder="Enter your e-mail address" minlength="1" required autofocus>
+            </div>
+            <div class="flex justify-end items-center">
+                <button type="submit" class="py-1 px-3 rounded bg-green-700 hover:bg-green-800 text-white text-sm">Reset</button>
+            </div>
+        </form>
+    </div>
+</main>
+
+{{ template "footer.tpl.html" . }}
+
+{{ template "foot.tpl.html" . }}
+</body>
+
+</html>
--- a/views/set-password.tpl.html
+++ b/views/set-password.tpl.html
@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+
+{{ template "head.tpl.html" . }}
+
+<body class="bg-gray-850 text-gray-700 p-4 pt-10 flex flex-col min-h-screen max-w-screen-lg mx-auto justify-center">
+
+{{ template "header.tpl.html" . }}
+
+<div class="flex items-center justify-center">
+    <h1 class="font-semibold text-xl text-white m-0 border-b-4 border-green-700">Choose a new password</h1>
+</div>
+
+{{ template "alerts.tpl.html" . }}
+
+<main class="mt-10 flex-grow flex justify-center w-full">
+    <div class="flex-grow max-w-lg mt-10">
+        <form action="set-password" method="post">
+            <div class="mb-8">
+                <label class="inline-block text-sm mb-1 text-gray-500" for="password">Password</label>
+                <input class="shadow appearance-none bg-gray-800 focus:bg-gray-700 text-gray-300 border-green-700 focus:border-gray-500 border rounded w-full py-1 px-3"
+                       type="password" id="password"
+                       name="password" placeholder="Choose a password" minlength="6" required>
+            </div>
+            <div class="mb-8">
+                <label class="inline-block text-sm mb-1 text-gray-500" for="password_repeat">And again ...</label>
+                <input class="shadow appearance-none bg-gray-800 focus:bg-gray-700 text-gray-300 border-green-700 focus:border-gray-500 border rounded w-full py-1 px-3"
+                       type="password" id="password_repeat"
+                       name="password_repeat" placeholder="Repeat your password" minlength="6" required>
+            </div>
+            <div class="flex justify-end items-center">
+                <input type="hidden" name="token" value="{{ .Token }}">
+                <button type="submit" class="py-1 px-3 rounded bg-green-700 hover:bg-green-800 text-white text-sm">Save</button>
+            </div>
+        </form>
+    </div>
+</main>
+
+{{ template "footer.tpl.html" . }}
+
+{{ template "foot.tpl.html" . }}
+</body>
+
+</html>
--- a/views/settings.tpl.html
+++ b/views/settings.tpl.html
@ -23,7 +23,7 @@

 <div class="w-full flex justify-center">
    <div class="flex items-center justify-between max-w-2xl flex-grow">
-        <div><a href="" class="text-gray-500 text-sm">&larr; Go back</a></div>
+        <div><a href="/" class="text-gray-500 text-sm cursor-pointer">&larr; Go back</a></div>
        <div><h1 class="font-semibold text-2xl text-white m-0 border-b-4 border-green-700">Settings</h1></div>
        <div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
    </div>
--- a/views/signup.tpl.html
+++ b/views/signup.tpl.html
@ -3,10 +3,13 @@

 {{ template "head.tpl.html" . }}

-<body class="bg-gray-850 text-gray-700 p-4 pt-10 flex flex-col min-h-screen max-w-screen-xl mx-auto justify-center">
+<body class="bg-gray-850 text-gray-700 p-4 pt-10 flex flex-col min-h-screen max-w-screen-lg mx-auto justify-center">
+
+{{ template "header.tpl.html" . }}
+
 <div class="w-full flex justify-center">
-    <div class="flex items-center justify-between max-w-4xl flex-grow">
-        <div><a href="" class="text-gray-500 text-sm">&larr; Go back</a></div>
+    <div class="flex items-center justify-between max-w-lg flex-grow">
+        <div><a onclick="window.history.back()" class="text-gray-500 text-sm cursor-pointer">&larr; Go back</a></div>
        <div><h1 class="font-semibold text-2xl text-white m-0 border-b-4 border-green-700">Sign Up</h1></div>
        <div></div>
    </div>
--- a/views/summary.tpl.html
+++ b/views/summary.tpl.html
@ -45,12 +45,12 @@
    <form class="text-white flex flex-nowrap items-center justify-center self-center max-w-xl flex-wrap space-x-8">
        <div class="flex space-x-1">
            <label for="from-date-picker" class="text-gray-300 pl-1">▶️ Start:</label>
-            <input id="from-date-picker" type="date" name="from" class="text-sm text-gray-300 bg-gray-800 rounded-md text-center cursor-pointer"
+            <input id="from-date-picker" type="date" name="from" max="{{ .ToTime.T | simpledate }}" class="text-sm text-gray-300 bg-gray-800 rounded-md text-center cursor-pointer"
                   value="{{ .FromTime.T | simpledate }}" required>
        </div>
        <div class="flex space-x-1">
            <label for="to-date-picker" class="text-gray-300 pl-1">⏹️ End:</label>
-            <input id="to-date-picker" type="date" name="to" class="text-sm text-gray-300 bg-gray-800 rounded-md text-center cursor-pointer"
+            <input id="to-date-picker" type="date" name="to" min="{{ .FromTime.T | simpledate }}" class="text-sm text-gray-300 bg-gray-800 rounded-md text-center cursor-pointer"
                   value="{{ .ToTime.T | simpledate }}" required>
        </div>
        <div>
@ -88,11 +88,11 @@
    </span>

    <div class="flex flex-wrap justify-center">
-        <div class="w-full lg:w-1/2 p-1">
+        <div class="w-full lg:w-1/2 p-1" style="max-width: 100vw;">
            <div class="p-4 pb-10 bg-gray-900 border border-gray-700 text-gray-300 rounded-md shadow m-2 flex flex-col" id="project-container" style="height: 300px">
                <div class="flex justify-between">
                    <div class="w-1/4 flex-1"></div>
-                    <span class="font-semibold w-1/2 text-center flex-1">Projects</span>
+                    <span class="font-semibold w-1/2 text-center flex-1 whitespace-no-wrap">Projects</span>
                    <div class="flex justify-end flex-1 text-xs items-center">
                        <label for="project-top-picker" class="mr-1">Show:&nbsp;</label>
                        <input type="number" min="1" id="project-top-picker" data-entity="0" class="w-1/4 top-picker bg-gray-800 rounded-md text-center" value="10">
@ -104,11 +104,11 @@
                </div>
            </div>
        </div>
-        <div class="w-full lg:w-1/2 p-1">
+        <div class="w-full lg:w-1/2 p-1" style="max-width: 100vw;">
            <div class="p-4 pb-10 bg-gray-900 border border-gray-700 text-gray-300 rounded-md shadow m-2 flex flex-col" id="os-container" style="height: 300px">
                <div class="flex justify-between">
                    <div class="w-1/4 flex-1"></div>
-                    <span class="font-semibold w-1/2 text-center flex-1">Operating Systems</span>
+                    <span class="font-semibold w-1/2 text-center flex-1 whitespace-no-wrap">Operating Systems</span>
                    <div class="flex justify-end flex-1 text-xs items-center">
                        <label for="os-top-picker" class="mr-1">Show:&nbsp;</label>
                        <input type="number" min="1" id="os-top-picker" data-entity="1" class="w-1/4 top-picker bg-gray-800 rounded-md text-center" value="10">
@ -120,11 +120,11 @@
                </div>
            </div>
        </div>
-        <div class="w-full lg:w-1/2 p-1">
+        <div class="w-full lg:w-1/2 p-1" style="max-width: 100vw;">
            <div class="p-4 pb-10 bg-gray-900 border border-gray-700 text-gray-300 rounded-md shadow m-2 flex flex-col relative" id="language-container" style="height: 300px">
                <div class="flex justify-between">
                    <div class="w-1/4 flex-1"></div>
-                    <span class="font-semibold w-1/2 text-center flex-1">Languages</span>
+                    <span class="font-semibold w-1/2 text-center flex-1 whitespace-no-wrap">Languages</span>
                    <div class="flex justify-end flex-1 text-xs items-center">
                        <label for="language-top-picker" class="mr-1">Show:&nbsp;</label>
                        <input type="number" min="1" id="language-top-picker" data-entity="3" class="w-1/4 top-picker bg-gray-800 rounded-md text-center" value="10">
@ -136,11 +136,11 @@
                </div>
            </div>
        </div>
-        <div class="w-full lg:w-1/2 p-1">
+        <div class="w-full lg:w-1/2 p-1" style="max-width: 100vw;">
            <div class="p-4 pb-10 bg-gray-900 border border-gray-700 text-gray-300 rounded-md shadow m-2 flex flex-col" id="editor-container" style="height: 300px">
                <div class="flex justify-between">
                    <div class="w-1/4 flex-1"></div>
-                    <span class="font-semibold w-1/2 text-center flex-1">Editors</span>
+                    <span class="font-semibold w-1/2 text-center flex-1 whitespace-no-wrap">Editors</span>
                    <div class="flex justify-end flex-1 text-xs items-center">
                        <label for="editor-top-picker" class="mr-1">Show:&nbsp;</label>
                        <input type="number" min="1" id="editor-top-picker" data-entity="2" class="w-1/4 top-picker bg-gray-800 rounded-md text-center" value="10">
@ -152,11 +152,11 @@
                </div>
            </div>
        </div>
-        <div class="w-full lg:w-1/2 p-1">
+        <div class="w-full lg:w-1/2 p-1" style="max-width: 100vw;">
            <div class="p-4 pb-10 bg-gray-900 border border-gray-700 text-gray-300 rounded-md shadow m-2 flex flex-col" id="machine-container" style="height: 300px">
                <div class="flex justify-between">
                    <div class="w-1/4 flex-1"></div>
-                    <span class="font-semibold w-1/2 text-center flex-1">Machines</span>
+                    <span class="font-semibold w-1/2 text-center flex-1 whitespace-no-wrap">Machines</span>
                    <div class="flex justify-end flex-1 text-xs items-center">
                        <label for="machine-top-picker" class="mr-1">Show:&nbsp;</label>
                        <input type="number" min="1" id="machine-top-picker" data-entity="4" class="w-1/4 top-picker bg-gray-800 rounded-md text-center" value="10">
@ -209,8 +209,10 @@

 {{ template "foot.tpl.html" . }}

-<script type="text/javascript">
-    document.querySelector('#api-key-instruction').innerHTML = document.querySelector('#api-key-container').value
+<script>
+    document.addEventListener('load', function() {
+        document.getElementById('api-key-instruction').innerHTML = document.getElementById('api-key-container').value
+    })
 </script>

 <script>
@ -224,6 +226,17 @@
    wakapiData.editors = {{ .Editors | json }}
    wakapiData.languages = {{ .Languages | json }}
    wakapiData.machines = {{ .Machines | json }}
+
+    document.getElementById("to-date-picker").onchange = function () {
+        var input = document.getElementById("from-date-picker");
+        input.setAttribute("max", this.value);
+    }
+
+    document.getElementById("from-date-picker").onchange = function () {
+        var input = document.getElementById("to-date-picker");
+        input.setAttribute("min", this.value);
+    }
+
 </script>
 <script src="assets/app.js"></script>
Author	SHA1	Message	Date
Ferdinand Mütsch	2a9fbfdfd7	chore: send notification on successful import	2021-04-10 10:48:06 +02:00
Ferdinand Mütsch	56247b4e1e	fix: throttle wakatime api requests (attempt to fix #152 )	2021-04-10 10:18:09 +02:00
Ferdinand Mütsch	9d7afde6a9	chore: version	2021-04-10 00:34:37 +02:00
Ferdinand Mütsch	0df0168584	Merge branch '133-password-resets'	2021-04-10 00:34:20 +02:00
Ferdinand Mütsch	a6fe15d69b	chore: add support button	2021-04-10 00:27:01 +02:00
Ferdinand Mütsch	ae363c1c82	Merge remote-tracking branch 'origin/master'	2021-04-10 00:17:13 +02:00
Ferdinand Mütsch	127a614190	Merge pull request #163 from notarock/master Add Open Graph meta tags	2021-04-10 00:16:07 +02:00
Ferdinand Mütsch	b8cefeb595	chore: add html lang	2021-04-10 00:15:20 +02:00
Ferdinand Mütsch	ae97095688	chore: exclude health endpoint from sentry tracing	2021-04-10 00:10:16 +02:00
Ferdinand Mütsch	4706809170	feat: smtp mail provider implementation	2021-04-10 00:07:13 +02:00
Ferdinand Mütsch	ddc29f0414	chore: log mailwhale error	2021-04-09 22:51:03 +02:00
Roch D'Amour	f4af787ecf	Add Open Graph meta tags	2021-04-09 00:37:14 -04:00
Ferdinand Mütsch	da6a00fec5	fix: adapt tests	2021-04-05 23:00:21 +02:00
Ferdinand Mütsch	6ad33e3c3b	feat: password resets (resolve #133 )	2021-04-05 22:57:57 +02:00
Ferdinand Mütsch	e6e134678a	wip: password resets	2021-04-05 16:25:13 +02:00
Ferdinand Mütsch	1783858854	fix: minor fixes (resolve #151 ) (resolve #154 )	2021-04-04 10:42:27 +02:00
Ferdinand Mütsch	e1d040bd55	docs: mention wiki in docs	2021-04-04 10:23:35 +02:00
Ferdinand Mütsch	7f3a654b26	fix: import bug with small number of heartbeats (fix #160 )	2021-04-04 09:45:32 +02:00
Ferdinand Mütsch	2b57da224c	chore: write authenticated user to logs and sentry	2021-03-26 13:10:10 +01:00
Ferdinand Mütsch	01d51b78b1	chore: include postman collection (resolve #148 ) [ci-skip]	2021-03-25 15:50:47 +01:00
Ferdinand Mütsch	6b83600acc	fix: responsiveness in firefox mobile (resolve #137 )	2021-03-25 10:51:36 +01:00
Ferdinand Mütsch	65bbd744b5	chore: exclude static assets from sonarqube [ci skip]	2021-03-24 23:38:38 +01:00
Ferdinand Mütsch	81ca703501	fix: disable recompute caching (resolve #149 )	2021-03-24 23:31:04 +01:00
Ferdinand Mütsch	2d1010e9d9	chore: add caching to badge endpoint chore: add type index for summary items	2021-03-24 21:49:42 +01:00
Ferdinand Mütsch	5ca9a6a8be	test: add further tests for heartbeat augmentation (resolve #144 )	2021-03-24 20:43:49 +01:00
Tobias Dillig	caf87de887	fix: allow custom mappings with dot (resolve #144 )	2021-03-24 19:25:36 +01:00
Ferdinand Mütsch	9fc3c65efe	feat: sentry integration (resolve #142 )	2021-03-23 22:12:15 +01:00
Ferdinand Mütsch	f73285160d	fix: delete language mapping (resolve #143 )	2021-03-22 21:20:23 +01:00
Ferdinand Mütsch	1f557d562f	chore: remove integrity hashes from assets files since served locally anyway (resolve #141 )	2021-03-20 09:55:21 +01:00
Ferdinand Mütsch	3685f3a156	chore: add svelte language mapping	2021-03-13 21:01:24 +01:00
Ferdinand Mütsch	b3afe9bfa2	feat: gui for sample data generator script	2021-03-11 23:54:35 +01:00
Ferdinand Mütsch	9de2c20885	fix: enable strict slash mode for api router	2021-03-09 23:56:38 +01:00
Ferdinand Mütsch	2846748b26	hotfix: remove user agent check for shields.io	2021-03-09 23:15:35 +01:00
Ferdinand Mütsch	f2f6fe1483	Merge pull request #140 from notarock/master Prevent invalid dates ranges in summary page	2021-03-06 09:05:11 +01:00
Roch D'Amour	17ddd7ca76	Prevent invalid dates ranges in summary page It is currently possible to enter a "End" date that is before the start date, or a "start" date that is after the end date. This commit prevent the user from directly entering an invalid date by setting a "min" and "max" value on those two date picker. There are no validation or the server's side, but that shouldn't be a problem since the invalid date will not create an error, it will simply not return any data.	2021-03-06 02:38:28 -05:00
Ferdinand Mütsch	292ae41c58	fix: batch insert conflict bug (resolve #139 )	2021-03-05 21:39:21 +01:00
 @ -1 +1 @@
 .24.5
 .26.1