Merge pull request #27 from Edmartt/edmartt/chore/updates-dockerfile

Edmartt/chore/updates dockerfile

Author: Edmartt

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine
+FROM golang:1.18-alpine as base
 
 RUN apk add build-base
 
@@ -9,16 +9,19 @@ ENV CGP_ENABLED=0
 ENV GOOS=linux
 ENV GOARCH=amd64
 
-COPY go.mod .
-COPY go.sum .
-
-RUN go mod download
-
-COPY *.go .
 COPY . .
 
 RUN go build ./... && go build
 
+#Second stage building
+
+FROM alpine
+RUN apk update upgrade
+WORKDIR /app
+
+COPY --from=base /app .
+RUN chmod +x go-authentication-api
+
 EXPOSE 8081
 
 CMD ["./go-authentication-api"]

internal/users/data/irepository.go

@@ -4,7 +4,7 @@ import "github.com/Edmartt/go-authentication-api/internal/users/models"
 
 var RepoAccessInterface IUserRepository
 
-type IUserRepository interface{
+type IUserRepository interface {
 	Find(id string) *models.User
-	Create(user models.User) string
+	Create(user *models.User) string
 }

internal/users/data/repository.go

@@ -2,61 +2,60 @@ package data
 
 import (
 	"log"
+
 	"github.com/Edmartt/go-authentication-api/internal/database"
 	"github.com/Edmartt/go-authentication-api/internal/users/models"
 )
 
-type UserRepository struct{
-	DB database.IConnection
-	user models.User
+type UserRepository struct {
+	DB   database.IConnection
+	user *models.User
 }
 
-
-func newRepository() database.IConnection{
+func newRepository() database.IConnection {
 	db := UserRepository{
 		DB: database.SQLite{},
 	}
 	return db.DB
 }
 
-
-func (data UserRepository) Find(username string) (*models.User){
+func (data UserRepository) Find(username string) *models.User {
 	connection, connError := newRepository().GetConnection()
-	if connError != nil{
+	if connError != nil {
 		log.Println("connection error")
 	}
-	
+
 	connection.Where("username = ?", username).First(&data.user)
-	
-	if data.user.Id == ""{
-		return &data.user
+
+	if data.user.Id == "" {
+		return data.user
 	}
 
-	return &data.user
+	return data.user
 }
 
-func (data UserRepository) Create(user models.User) string{
+func (data UserRepository) Create(user *models.User) string {
 	connection, connError := newRepository().GetConnection()
-	if connError != nil{
+	if connError != nil {
 		log.Println("connection error")
 	}
 	connection.Create(&user)
 	return user.Id
 }
 
-func (data UserRepository) Update(user models.User){
+func (data UserRepository) Update(user models.User) {
 	connection, connError := data.DB.GetConnection()
 
-	if connError != nil{
+	if connError != nil {
 		log.Println("connection error")
 	}
 	connection.Save(&user)
 }
 
-func (data UserRepository) Delete(user models.User, id string){
+func (data UserRepository) Delete(user models.User, id string) {
 	connection, connError := data.DB.GetConnection()
 
-	if connError != nil{
+	if connError != nil {
 		log.Println("connection error")
 	}
 	connection.Delete(&user, id)

internal/users/transport/handlers.go

@@ -19,36 +19,35 @@ import (
 
 //Handler struct gives access to user data access layer
 type Handlers struct {
-	user models.User
+	user        *models.User
 	logResponse LoginResponse
 	sigResponse SignupResponse
-	wrapper jwt.JWTWrapper
+	wrapper     jwt.JWTWrapper
 }
 
-func init(){
+func init() {
 	data.RepoAccessInterface = data.UserRepository{}
 }
 
 //Login endpoint
-func(h *Handlers) Login(w http.ResponseWriter, request *http.Request){
+func (h *Handlers) Login(w http.ResponseWriter, request *http.Request) {
 
 	reqBody, requestError := io.ReadAll(request.Body)
 
-	if requestError != nil{
+	if requestError != nil {
 		log.Println(requestError.Error())
 	}
 
 	json.Unmarshal(reqBody, &h.user)
 
 	searchedUser := data.RepoAccessInterface.Find(h.user.Username)
 
-
-	if searchedUser.Username == h.user.Username{
-		if hasher.CheckHash(searchedUser.Password, h.user.Password){
+	if searchedUser.Username == h.user.Username {
+		if hasher.CheckHash(searchedUser.Password, h.user.Password) {
 
 			newToken, err := h.wrapper.GenerateJWT(h.user.Username, 5)
 
-			if err != nil{
+			if err != nil {
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -67,10 +66,9 @@ func(h *Handlers) Login(w http.ResponseWriter, request *http.Request){
 	w.WriteHeader(http.StatusUnauthorized)
 	json.NewEncoder(w).Encode("Username or Password Wrong")
 
-	return
 }
 
-func (h *Handlers)Signup(w http.ResponseWriter, request *http.Request) {
+func (h *Handlers) Signup(w http.ResponseWriter, request *http.Request) {
 
 	h.user.Id = uuid.NewString()
 	requestError := json.NewDecoder(request.Body).Decode(&h.user)
@@ -83,15 +81,13 @@ func (h *Handlers)Signup(w http.ResponseWriter, request *http.Request) {
 		return
 	}
 
-
 	data.RepoAccessInterface.Create(h.user)
 	w.WriteHeader(http.StatusCreated)
 	h.sigResponse.Status = "User Created"
 	json.NewEncoder(w).Encode(h.sigResponse)
-	return
 }
 
-func (h *Handlers)GetUserData(w http.ResponseWriter, request *http.Request){
+func (h *Handlers) GetUserData(w http.ResponseWriter, request *http.Request) {
 
 	uName := request.Context().Value("username") // value from mux context took from ValidateToken middleware
 
@@ -101,9 +97,8 @@ func (h *Handlers)GetUserData(w http.ResponseWriter, request *http.Request){
 	h.user.Username = data.Username
 	h.user.Password = data.Password
 	h.user.CreatedAt = data.CreatedAt
-	
+
 	data.Password = ""
 	w.WriteHeader(http.StatusOK)
 	json.NewEncoder(w).Encode(&data)
-	return
 }

pkg/jwt/jwt.go

@@ -24,7 +24,7 @@ func (wrap *JWTWrapper) GenerateJWT(attribute string, quantity time.Duration) (t
 		Attribute: attribute,
 		StandardClaims: jwt.StandardClaims{
 			ExpiresAt: expirationTime.Unix(),
-			Issuer:    "Sam Sepiol",
+			Issuer:    "Edmartt",
 		},
 	}
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)