Update to latest Mailslurper 1.14.1

.gitignore

@@ -1 +1,3 @@
 *.swp
+*.iml
+.idea

README.md

@@ -14,22 +14,29 @@ The image contains a default MailSlurper config file (`config.json`). A custom c
 Example custom config file `custom-config.json`:
 ```
 {
-    "wwwAddress": "0.0.0.0",
-    "wwwPort": 8080,
-    "serviceAddress": "0.0.0.0",
-    "servicePort": 8085,
-    "smtpAddress": "0.0.0.0",
-    "smtpPort": 2500,
-    "dbEngine": "SQLite",
-    "dbHost": "",
-    "dbPort": 0,
-    "dbDatabase": "./mailslurper.db",
-    "dbUserName": "",
-    "dbPassword": "",
-    "maxWorkers": 1000,
-    "autoStartBrowser": false,
-    "keyFile": "",
-    "certFile": ""
+	"wwwAddress": "0.0.0.0",
+	"wwwPort": 8080,
+	"serviceAddress": "0.0.0.0",
+	"servicePort": 8085,
+	"smtpAddress": "0.0.0.0",
+	"smtpPort": 2500,
+	"dbEngine": "SQLite",
+	"dbHost": "",
+	"dbPort": 0,
+	"dbDatabase": "./mailslurper.db",
+	"dbUserName": "",
+	"dbPassword": "",
+	"maxWorkers": 1000,
+	"autoStartBrowser": false,
+	"keyFile": "",
+	"certFile": "",
+	"adminKeyFile": "",
+	"adminCertFile": "",
+	"authenticationScheme": "",
+	"authSecret": "",
+	"authSalt": "",
+	"authTimeoutInMinutes": 120,
+	"credentials": {}
 }
 ```
 

custom-config.json

@@ -14,5 +14,12 @@
 	"maxWorkers": 1000,
 	"autoStartBrowser": false,
 	"keyFile": "",
-	"certFile": ""
+	"certFile": "",
+	"adminKeyFile": "",
+	"adminCertFile": "",
+	"authenticationScheme": "",
+	"authSecret": "",
+	"authSalt": "",
+	"authTimeoutInMinutes": 120,
+	"credentials": {}
 }

mailslurper/LICENSE

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2013-2016 Adam Presley
+Copyright (c) 2013-2018 Adam Presley
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software

mailslurper/README.md

@@ -1,3 +1,5 @@
+<p align="center"><img src="logo/horizontal.png" alt="mailslurper" height="100px"></p>
+
 MailSlurper
 ===========
 
@@ -7,17 +9,16 @@ Compiling
 ---------
 The following are general instructions for compiling MailSlurper. Your details may vary a bit here and there. The below example is based on a Unix-style system, such as Ubuntu or OSX. Furthermore for instructional purposes it is assumed that your GOPATH is set to *~/code/go*, and that you have a folder in your source directory called **github.com**. Your setup may vary. The instructions below also assume you have the following already installed.
 
-* Go 1.5 (or higher)
+* Go 1.10 (or higher)
 * Git
 
 ```bash
 $ cd ~/code/go/src/github.com
 $ mkdir mailslurper
 $ cd mailslurper
-$ git clone https://github.com/mailslurper/libmailslurper.git
 $ git clone https://github.com/mailslurper/mailslurper.git
 $ go get github.com/mjibson/esc
-$ cd mailslurper
+$ cd mailslurper/cmd/mailslurper
 $ go get
 $ go generate
 $ go build
@@ -27,39 +28,41 @@ Library and Framework Credits
 -----------------------------
 This application uses a lot of great open source libraries.
 
-* [Gorilla Mux](http://www.gorillatoolkit.org/pkg/mux)
-* [Gorilla Context](http://www.gorillatoolkit.org/pkg/context)
-* [Gorilla Websocket](https://github.com/gorilla/websocket)
-* [Alice](https://github.com/justinas/alice)
-* [GoHttpService](https://github.com/adampresley/GoHttpService)
-* [Logging](https://github.com/adampresley/logging)
-* [GoUUID](https://github.com/nu7hatch/gouuid)
-* [bluemonday](https://github.com/microcosm-cc/bluemonday) - BSD 3 Clause. Copyright (c) 2014, David Kitchen david@buro9.com
-* [go-mssqldb](https://github.com/denisenkom/go-mssqldb)
-* [Go-MySQL-Driver](https://github.com/go-sql-driver/mysql) - Mozilla Public License Version 2.0
-* [go-sqlite3](https://github.com/mattn/go-sqlite3) - MIT
-* [esc](https://github.com/mjibson/esc) - MIT
 * [BlockUI](http://jquery.malsup.com/block/) - MIT
+* [bluemonday](https://github.com/microcosm-cc/bluemonday) - BSD 3-Clause
 * [Bootstrap](http://getbootstrap.com/) - MIT
-* [Date Range Picker for Bootstrap](http://www.daterangepicker.com) - MIT
 * [bootstrap-dialog](https://github.com/nakupanda/bootstrap3-dialog) - MIT
 * [bootstrap-growl](https://github.com/ifightcrime/bootstrap-growl) - MIT
+* [Date Range Picker for Bootstrap](http://www.daterangepicker.com) - MIT
+* [Gorilla Context](https://github.com/gorilla/context) - BSD 3-Clause
+* [Gorilla Secure Cookie](https://github.com/gorilla/securecookie) - BSD 3-Clause
+* [Gorilla Sessions](https://github.com/gorilla/sessions) - BSD 3-Clause
+* [Copier](https://github.com/jinzhu/copier) - MIT
+* [Echo](https://github.com/labstack/echo) - MIT
+* [errors](https://github.com/pkg/errors) - BSD 2-Clause
+* [esc](https://github.com/mjibson/esc) - MIT
 * [Font Awesome](http://fortawesome.github.io/Font-Awesome/) - Fonts under OFL License, CSS under MIT license
+* [GoUUID](https://github.com/nu7hatch/gouuid) - MIT
+* [go-cache](https://github.com/patrickmn/go-cache) - MIT
+* [go-mssqldb](https://github.com/denisenkom/go-mssqldb)
+* [Go-MySQL-Driver](https://github.com/go-sql-driver/mysql) - Mozilla Public License Version 2.0
+* [go-sqlite3](https://github.com/mattn/go-sqlite3) - MIT
 * [Handlebars](http://handlebarsjs.com) - MIT
 * [jQuery](http://jquery.com/) - MIT
+* [jwt-go](https://github.com/dgrijalva/jwt-go) - MIT
 * [lightbox2](http://lokeshdhakar.com/projects/lightbox2/) - MIT
+* [Logrus](https://github.com/sirupsen/logrus) - MIT
 * [Moment.js](http://momentjs.com) - MIT
-* [Promiscuous](https://github.com/RubenVerborgh/promiscuous) - MIT
-* [RequireJS Handlebars Plugin](https://github.com/SlexAxton/require-handlebars-plugin) - WTFPL License
-* [RequireJS](http://requirejs.org) - MIT
+* [NPO](https://github.com/getify/native-promise-only) - MIT
+* [open](https://github.com/skratchdot/open-golang) - MIT
 
 Themes by Thomas Park at [Bootswatch](http://bootswatch.com/).
 
 License
 -------
 The MIT License (MIT)
 
-Copyright (c) 2013-2016 Adam Presley
+Copyright (c) 2013-2018 Adam Presley
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

mailslurper/config.json

@@ -14,5 +14,12 @@
 	"maxWorkers": 1000,
 	"autoStartBrowser": false,
 	"keyFile": "",
-	"certFile": ""
+	"certFile": "",
+	"adminKeyFile": "",
+	"adminCertFile": "",
+	"authenticationScheme": "",
+	"authSecret": "",
+	"authSalt": "",
+	"authTimeoutInMinutes": 120,
+	"credentials": {}
 }