Removed the absolute useless package names

.gitignore

@@ -1,4 +1,4 @@
 .DS_Store
 creds.json
 .idea
-./oauth-sample
+oauth-sample

Makefile

@@ -14,7 +14,7 @@ GO_LDFLAGS_STATIC="-s -w $(CTIMEVAR) -extldflags -static"
 ##@ Build
 
 build: ## Builds a single binary given the current OS
-	go build -o $(NAME) main.go
+	go build -o $(NAME) ./...
 
 ##@ Testing
 

middleware/authorize.go → authorize.go

@@ -1,4 +1,4 @@
-package middleware
+package main
 
 import (
 	"net/http"

handlers/handlers.go → handlers.go

@@ -1,4 +1,4 @@
-package handlers
+package main
 
 import (
 	"context"
@@ -11,8 +11,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/Skarlso/google-oauth-go-sample/database"
-	"github.com/Skarlso/google-oauth-go-sample/structs"
 	"github.com/gin-gonic/contrib/sessions"
 	"github.com/gin-gonic/gin"
 	"golang.org/x/oauth2"
@@ -113,7 +111,7 @@ func (h *Handlers) AuthHandler(c *gin.Context) {
 		return
 	}
 
-	u := structs.User{}
+	u := User{}
 	if err = json.Unmarshal(data, &u); err != nil {
 		log.Println(err)
 		c.HTML(http.StatusBadRequest, "error.tmpl", gin.H{"message": "Error marshalling response. Please try again."})
@@ -129,7 +127,7 @@ func (h *Handlers) AuthHandler(c *gin.Context) {
 	}
 
 	seen := false
-	db := &database.MongoDBConnection{}
+	db := &MongoDBConnection{}
 	if _, mongoErr := db.LoadUser(u.Email); mongoErr == nil {
 		seen = true
 	} else {

main.go

@@ -3,15 +3,13 @@ package main
 import (
 	"log"
 
-	"github.com/Skarlso/google-oauth-go-sample/handlers"
-	"github.com/Skarlso/google-oauth-go-sample/middleware"
 	"github.com/gin-gonic/contrib/sessions"
 	"github.com/gin-gonic/gin"
 )
 
 func main() {
 	router := gin.Default()
-	token, err := handlers.RandToken(64)
+	token, err := RandToken(64)
 	if err != nil {
 		log.Fatal("unable to generate random token: ", err)
 	}
@@ -27,7 +25,7 @@ func main() {
 	router.Static("/img", "./static/img")
 	router.LoadHTMLGlob("templates/*")
 
-	handler, err := handlers.NewHandler()
+	handler, err := NewHandler()
 	if err != nil {
 		log.Fatal("unable to load credentials: %w", err)
 	}
@@ -36,7 +34,7 @@ func main() {
 	router.GET("/auth", handler.AuthHandler)
 
 	authorized := router.Group("/battle")
-	authorized.Use(middleware.AuthorizeRequest())
+	authorized.Use(AuthorizeRequest())
 	{
 		authorized.GET("/field", handler.FieldHandler)
 	}

database/mongo.go → mongo.go

@@ -1,9 +1,8 @@
-package database
+package main
 
 import (
 	"fmt"
 
-	"github.com/Skarlso/google-oauth-go-sample/structs"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
 )
@@ -13,7 +12,7 @@ type MongoDBConnection struct {
 }
 
 // SaveUser register a user so we know that we saw that user already.
-func (mdb *MongoDBConnection) SaveUser(u *structs.User) error {
+func (mdb *MongoDBConnection) SaveUser(u *User) error {
 	session, err := mdb.GetSession()
 	if err != nil {
 		return fmt.Errorf("failed to get session: %w", err)
@@ -28,14 +27,14 @@ func (mdb *MongoDBConnection) SaveUser(u *structs.User) error {
 }
 
 // LoadUser get data from a user.
-func (mdb *MongoDBConnection) LoadUser(Email string) (*structs.User, error) {
+func (mdb *MongoDBConnection) LoadUser(Email string) (*User, error) {
 	session, err := mdb.GetSession()
 	if err != nil {
 		return nil, fmt.Errorf("failed to get session: %w", err)
 	}
 	defer session.Close()
 
-	result := &structs.User{}
+	result := &User{}
 	c := session.DB("webadventure").C("users")
 	err = c.Find(bson.M{"email": Email}).One(&result)
 

structs/user.go → user.go

@@ -1,4 +1,4 @@
-package structs
+package main
 
 // User is a retrieved and authenticated user.
 type User struct {