From 77d69a9954ec8873cedbfb9b7d267d5f6b039730 Mon Sep 17 00:00:00 2001
From: Michel Vocks <michelvocks@gmail.com>
Date: Tue, 26 Jun 2018 17:12:13 +0200
Subject: [PATCH] Prepared gaia for first release and added new steps to make
 file

---
 .gitignore                          |   2 ++
 Makefile                            |  23 ++++++++++++++++++-----
 cmd/gaia/main.go                    |  12 ++++++++++++
 frontend/build/webpack.dev.conf.js  |   2 +-
 frontend/build/webpack.prod.conf.js |   2 +-
 frontend/client/assets/favicon.ico  | Bin 0 -> 15086 bytes
 gaia.go                             |   2 ++
 handlers/User.go                    |   7 ++-----
 handlers/handler.go                 |  27 ++++++++++++++++++++++++---
 9 files changed, 62 insertions(+), 15 deletions(-)
 create mode 100644 frontend/client/assets/favicon.ico

diff --git a/.gitignore b/.gitignore
index c28723a9..67b8bb3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 *.so
 *.dylib
 *.db
+rice-box.go
+gaia-linux-amd64
 
 # Test binary, build with `go test -c`
 *.test
diff --git a/Makefile b/Makefile
index 17a36525..52f859cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,20 @@
-default: run
+default: dev
 
-build: ./cmd/gaia/main.go
-	go install ./cmd/gaia/
+dev:
+	go run ./cmd/gaia/main.go -homepath=${PWD}/tmp -dev true
 
-run: build
-	gaia -homepath=${PWD}/tmp
\ No newline at end of file
+compile_frontend:
+	cd ./frontend && \
+	rm -rf dist && \
+	npm install && \
+	npm run build
+
+static_assets:
+	go get github.com/GeertJohan/go.rice && \
+	go get github.com/GeertJohan/go.rice/rice && \
+	cd ./handlers && \
+	rm -f rice-box.go && \
+	rice embed-go
+
+release: compile_frontend static_assets
+	env GOOS=linux GOARCH=amd64 go build -o gaia-linux-amd64 ./cmd/gaia/main.go
\ No newline at end of file
diff --git a/cmd/gaia/main.go b/cmd/gaia/main.go
index 1cba1020..690949d0 100644
--- a/cmd/gaia/main.go
+++ b/cmd/gaia/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"os"
 	"path/filepath"
 
@@ -19,6 +20,9 @@ var (
 )
 
 const (
+	// Version is the current version of gaia.
+	Version = "0.1.1"
+
 	dataFolder      = "data"
 	pipelinesFolder = "pipelines"
 	workspaceFolder = "workspace"
@@ -31,6 +35,8 @@ func init() {
 	flag.StringVar(&gaia.Cfg.ListenPort, "port", "8080", "Listen port for gaia")
 	flag.StringVar(&gaia.Cfg.HomePath, "homepath", "", "Path to the gaia home folder")
 	flag.IntVar(&gaia.Cfg.Workers, "workers", 2, "Number of workers gaia will use to execute pipelines in parallel")
+	flag.BoolVar(&gaia.Cfg.DevMode, "dev", false, "If true, gaia will be started in development mode. Don't use this in production!")
+	flag.BoolVar(&gaia.Cfg.VersionSwitch, "version", false, "If true, will print the version and immediately exit")
 
 	// Default values
 	gaia.Cfg.Bolt.Mode = 0600
@@ -40,6 +46,12 @@ func main() {
 	// Parse command line flgs
 	flag.Parse()
 
+	// Check version switch
+	if gaia.Cfg.VersionSwitch {
+		fmt.Printf("Gaia Version: V%s\n", Version)
+		os.Exit(0)
+	}
+
 	// Initialize shared logger
 	gaia.Cfg.Logger = hclog.New(&hclog.LoggerOptions{
 		Level:  hclog.Trace,
diff --git a/frontend/build/webpack.dev.conf.js b/frontend/build/webpack.dev.conf.js
index 38908de3..0a626587 100755
--- a/frontend/build/webpack.dev.conf.js
+++ b/frontend/build/webpack.dev.conf.js
@@ -36,7 +36,7 @@ module.exports = merge(baseWebpackConfig, {
       filename: 'index.html',
       template: 'index.html',
       inject: true,
-      favicon: 'client/assets/logo.png'
+      favicon: 'client/assets/favicon.ico'
     })
   ]
 })
diff --git a/frontend/build/webpack.prod.conf.js b/frontend/build/webpack.prod.conf.js
index 1077fc53..a099bfa6 100755
--- a/frontend/build/webpack.prod.conf.js
+++ b/frontend/build/webpack.prod.conf.js
@@ -57,7 +57,7 @@ const webpackConfig = merge(baseWebpackConfig, {
         : config.build.index,
       template: 'index.html',
       inject: true,
-      favicon: 'client/assets/logo.png',
+      favicon: 'client/assets/favicon.ico',
       minify: {
         removeComments: true,
         collapseWhitespace: true,
diff --git a/frontend/client/assets/favicon.ico b/frontend/client/assets/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..08a348a9852070ce1f5a2b23420d4594bf2ea850
GIT binary patch
literal 15086
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
bI)<yze_%R#oWuF?9~{m-Owd-k#NqrOR7K_}

literal 0
HcmV?d00001

diff --git a/gaia.go b/gaia.go
index d57b4abe..07dda288 100644
--- a/gaia.go
+++ b/gaia.go
@@ -145,6 +145,8 @@ var Cfg *Config
 
 // Config holds all config options
 type Config struct {
+	DevMode       bool
+	VersionSwitch bool
 	ListenPort    string
 	HomePath      string
 	DataPath      string
diff --git a/handlers/User.go b/handlers/User.go
index 66acdcbe..11761622 100644
--- a/handlers/User.go
+++ b/handlers/User.go
@@ -30,11 +30,8 @@ func UserLogin(c echo.Context) error {
 
 	// Authenticate user
 	user, err := storeService.UserAuth(u, true)
-	if err != nil {
-		gaia.Cfg.Logger.Error("error during UserAuth", "error", err.Error())
-		return c.String(http.StatusInternalServerError, err.Error())
-	}
-	if user == nil {
+	if err != nil || user == nil {
+		gaia.Cfg.Logger.Error("invalid credentials provided", "message", err.Error())
 		return c.String(http.StatusForbidden, "invalid username and/or password")
 	}
 
diff --git a/handlers/handler.go b/handlers/handler.go
index cf784501..5965a803 100644
--- a/handlers/handler.go
+++ b/handlers/handler.go
@@ -7,7 +7,10 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/GeertJohan/go.rice"
+
 	jwt "github.com/dgrijalva/jwt-go"
+	"github.com/gaia-pipeline/gaia"
 	scheduler "github.com/gaia-pipeline/gaia/scheduler"
 	"github.com/gaia-pipeline/gaia/store"
 	"github.com/labstack/echo"
@@ -64,7 +67,7 @@ func InitHandlers(e *echo.Echo, store *store.Store, scheduler *scheduler.Schedul
 	// Define prefix
 	p := "/api/" + apiVersion + "/"
 
-	// --- Register handlers at iris instance ---
+	// --- Register handlers at echo instance ---
 
 	// Users
 	e.POST(p+"login", UserLogin)
@@ -98,6 +101,24 @@ func InitHandlers(e *echo.Echo, store *store.Store, scheduler *scheduler.Schedul
 	// Extra options
 	e.HideBanner = true
 
+	// Are we in production mode?
+	if !gaia.Cfg.DevMode {
+		staticAssets, err := rice.FindBox("../frontend/dist")
+		if err != nil {
+			gaia.Cfg.Logger.Error("Cannot find assets in production mode.")
+			return err
+		}
+
+		// Register handler for static assets
+		assetHandler := http.FileServer(staticAssets.HTTPBox())
+		e.GET("/", echo.WrapHandler(assetHandler))
+		e.GET("/favicon.ico", echo.WrapHandler(assetHandler))
+		e.GET("/assets/css/*", echo.WrapHandler(http.StripPrefix("/", assetHandler)))
+		e.GET("/assets/js/*", echo.WrapHandler(http.StripPrefix("/", assetHandler)))
+		e.GET("/assets/fonts/*", echo.WrapHandler(http.StripPrefix("/", assetHandler)))
+		e.GET("/assets/img/*", echo.WrapHandler(http.StripPrefix("/", assetHandler)))
+	}
+
 	return nil
 }
 
@@ -106,8 +127,8 @@ func InitHandlers(e *echo.Echo, store *store.Store, scheduler *scheduler.Schedul
 // TODO: Role based access
 func authBarrier(next echo.HandlerFunc) echo.HandlerFunc {
 	return func(c echo.Context) error {
-		// Login resource is open
-		if strings.Contains(c.Path(), "login") {
+		// Login and static resources are open
+		if strings.Contains(c.Path(), "/login") || c.Path() == "/" || strings.Contains(c.Path(), "/assets/") || c.Path() == "/favicon.ico" {
 			return next(c)
 		}