From 89e70a1e622630b54197144ff740116c9b738cfd Mon Sep 17 00:00:00 2001
From: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
Date: Sun, 1 Oct 2023 11:29:09 +0200
Subject: [PATCH] Removed the absolute useless package names

---
 .gitignore                              | 2 +-
 Makefile                                | 2 +-
 middleware/authorize.go => authorize.go | 2 +-
 handlers/handlers.go => handlers.go     | 8 +++-----
 main.go                                 | 8 +++-----
 database/mongo.go => mongo.go           | 9 ++++-----
 structs/user.go => user.go              | 2 +-
 7 files changed, 14 insertions(+), 19 deletions(-)
 rename middleware/authorize.go => authorize.go (95%)
 rename handlers/handlers.go => handlers.go (96%)
 rename database/mongo.go => mongo.go (82%)
 rename structs/user.go => user.go (96%)

diff --git a/.gitignore b/.gitignore
index 2cab349..af0cad9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 .DS_Store
 creds.json
 .idea
-./oauth-sample
+oauth-sample
diff --git a/Makefile b/Makefile
index 808e166..62bf389 100644
--- a/Makefile
+++ b/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
 
diff --git a/middleware/authorize.go b/authorize.go
similarity index 95%
rename from middleware/authorize.go
rename to authorize.go
index effb874..22a5251 100644
--- a/middleware/authorize.go
+++ b/authorize.go
@@ -1,4 +1,4 @@
-package middleware
+package main
 
 import (
 	"net/http"
diff --git a/handlers/handlers.go b/handlers.go
similarity index 96%
rename from handlers/handlers.go
rename to handlers.go
index fdd5cfb..842f00e 100644
--- a/handlers/handlers.go
+++ b/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 {
diff --git a/main.go b/main.go
index 6efd722..2242e09 100644
--- a/main.go
+++ b/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)
 	}
diff --git a/database/mongo.go b/mongo.go
similarity index 82%
rename from database/mongo.go
rename to mongo.go
index 80510c8..9d5990c 100644
--- a/database/mongo.go
+++ b/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)
 
diff --git a/structs/user.go b/user.go
similarity index 96%
rename from structs/user.go
rename to user.go
index 402a6d4..bc5325b 100644
--- a/structs/user.go
+++ b/user.go
@@ -1,4 +1,4 @@
-package structs
+package main
 
 // User is a retrieved and authenticated user.
 type User struct {