Deployment changes, add monolith binary

Makefile

@@ -7,5 +7,5 @@ test:
 	go test ./...
 
 build:
-		CGO_ENABLED=0 GOOS=linux go build -o cholibot ./cmd/cholibot/main.go
+		CGO_ENABLED=0 GOOS=linux go build -o cholibot ./cmd/monolith/main.go
 

cmd/cholibot/main.go

@@ -11,7 +11,6 @@ import (
 const version = "v0.0.1"
 
 func main() {
-	//go webserver.Start()
 	log.Info("Version: " + version)
 	go discord.Start()
 	sc := make(chan os.Signal, 1)

cmd/choliserver/main.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"github.com/heshoots/cholibot/pkg/webserver"
+	log "github.com/sirupsen/logrus"
+	"os"
+	"os/signal"
+	"syscall"
+)
+
+const version = "v0.0.1"
+
+func main() {
+	log.Info("Version: " + version)
+	go webserver.Start()
+	sc := make(chan os.Signal, 1)
+	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill)
+	log.Info("Server is now running.  Press CTRL-C to exit.")
+	<-sc
+}

cmd/monolith/main.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"github.com/heshoots/cholibot/pkg/discord"
+	"github.com/heshoots/cholibot/pkg/webserver"
+	log "github.com/sirupsen/logrus"
+	"os"
+	"os/signal"
+	"syscall"
+)
+
+const version = "v0.0.1"
+
+func main() {
+	log.Info("Version: " + version)
+	go webserver.Start()
+	go discord.Start()
+	sc := make(chan os.Signal, 1)
+	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill)
+	log.Info("Bot is now running.  Press CTRL-C to exit.")
+	<-sc
+}

pkg/models/types.go

@@ -38,7 +38,6 @@ func GetClient() *ModelClient {
 			DB:       Config.Redis.DB,
 		})}
 		return client
-
 	} else {
 		return client
 	}

pkg/webserver/router.go

@@ -0,0 +1,13 @@
+package webserver
+
+import (
+	"github.com/gorilla/mux"
+)
+
+func getRouter() *mux.Router {
+	r := mux.NewRouter()
+	r.HandleFunc("/login", login)
+	r.HandleFunc("/auth/discord/callback", callback)
+	r.HandleFunc("/guild/add", addToGuild)
+	return r
+}

pkg/webserver/server.go

@@ -0,0 +1,172 @@
+package webserver
+
+import (
+	"encoding/json"
+	"github.com/jinzhu/configor"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"net/url"
+	"os"
+	"strconv"
+	"strings"
+)
+
+var discordRedirect string
+
+var Config = struct {
+	WebServer struct {
+		Port         string `default:"3000"`
+		ClientID     string `required:"true"`
+		ClientSecret string `required:"true"`
+		Redirect     string `required:"true"`
+		Scope        string `required:"true"`
+		Base         string `required:"true"`
+	}
+}{}
+
+type TokenResponse struct {
+	AccessToken  string `json:"access_token"`
+	TokenType    string `json:"token_type"`
+	ExpiresIn    int64  `json:"expires_in"`
+	RefreshToken string `json:"refresh_token"`
+	Scope        string `json:"scope"`
+}
+
+type GuildRole struct {
+	ID          string `json:"id"`
+	Name        string `json:"name"`
+	Color       int64  `json:"color"`
+	Hoist       bool   `json:"hoist"`
+	Position    int64  `json:"position"`
+	Permissions int64  `json:"permissions"`
+	Managed     bool   `json:"managed"`
+	Mentionable bool   `json:"mentionable"`
+}
+
+type GuildRoles []GuildRole
+
+type UserResponse struct {
+	ID string `json:"id"`
+}
+
+type UserGuildResponse []UserGuild
+
+type UserGuild struct {
+	ID          string `json:"id"`
+	Name        string `json:"name"`
+	Icon        string `json:"icon"`
+	Owner       bool   `json:"owner"`
+	Permissions int64  `json:"permissions"`
+	BotJoined   bool
+}
+
+func init() {
+	environment, envSet := os.LookupEnv("ENV")
+	if !envSet {
+		environment = "development"
+	}
+	err := configor.Load(&Config, "./config/"+environment+".yaml")
+	if err != nil {
+		log.Fatal(err)
+	}
+	var escapedRedirect string = url.QueryEscape(Config.WebServer.Base + Config.WebServer.Redirect)
+	var scope = url.QueryEscape(Config.WebServer.Scope)
+	discordRedirect = "https://discordapp.com/api/oauth2/authorize?client_id=" + Config.WebServer.ClientID + "&redirect_uri=" + escapedRedirect + "&response_type=code&scope=" + scope
+
+}
+
+func login(w http.ResponseWriter, r *http.Request) {
+	http.Redirect(w, r, discordRedirect, 307)
+}
+
+func addToGuild(w http.ResponseWriter, r *http.Request) {
+	var manage_roles = strconv.Itoa(0x10000000)
+	http.Redirect(w, r, "https://discordapp.com/api/oauth2/authorize?client_id="+Config.WebServer.ClientID+"&scope=bot&permissions="+manage_roles, 307)
+
+}
+
+func createData(api_key string) url.Values {
+	data := url.Values{}
+	data.Set("client_id", Config.WebServer.ClientID)
+	data.Set("client_secret", Config.WebServer.ClientSecret)
+	data.Set("grant_type", "authorization_code")
+	data.Set("code", api_key)
+	data.Set("redirect_uri", Config.WebServer.Base+Config.WebServer.Redirect)
+	data.Set("scope", "identify email connections")
+	return data
+}
+
+func getUrl() string {
+	apiUrl := "https://discordapp.com"
+	resource := "/api/oauth2/token"
+	u, _ := url.ParseRequestURI(apiUrl)
+	u.Path = resource
+	urlStr := u.String()
+	return urlStr
+}
+
+func genericDataResponse(url, api_key string, data interface{}) error {
+	client := &http.Client{}
+	r, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return err
+	}
+	r.Header.Add("Authorization", "Bearer "+api_key)
+	resp, _ := client.Do(r)
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+	err = json.Unmarshal(body, &data)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func readTokenResponse(resp *http.Response) TokenResponse {
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		panic(err.Error())
+	}
+	var jsondata TokenResponse // TopTracks
+	err = json.Unmarshal(body, &jsondata)
+	if err != nil {
+		panic(err.Error())
+	}
+	return jsondata
+}
+
+func callback(w http.ResponseWriter, r *http.Request) {
+	api_key := r.URL.Query()["code"]
+	if api_key != nil && len(api_key) == 0 {
+		log.Fatal("No api_key returned")
+		return
+	}
+	data := createData(api_key[0])
+	urlStr := getUrl()
+
+	client := &http.Client{}
+	r, _ = http.NewRequest("POST", urlStr, strings.NewReader(data.Encode())) // URL-encoded payload
+
+	r.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+
+	resp, _ := client.Do(r)
+	jsondata := readTokenResponse(resp)
+	cookie := http.Cookie{
+		Name:  "session",
+		Value: jsondata.AccessToken,
+		//Domain:   "localhost:3000",
+		Path:     "/",
+		MaxAge:   60 * 60,
+		HttpOnly: true,
+	}
+	http.SetCookie(w, &cookie)
+	http.Redirect(w, r, "/", 301)
+}
+
+func Start() {
+	router := getRouter()
+	log.Fatal(http.ListenAndServe(":"+Config.WebServer.Port, router))
+}