tsk-35: Update name of user (#38)

Closes #35

Reviewed-on: phoenix/textsender-auth#38
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

.env.docker.sample

@@ -5,3 +5,5 @@ DB_PASSWORD=password
 DB_HOST=auth_db
 DB_PORT=5432
 DB_SSLMODE=disable
+ENABLE_REGISTRATION=true
+ALLOWED_ORIGINS="http://textsender.com"

.env.sample

@@ -5,3 +5,5 @@ DB_PASSWORD=yEDjWZCH2vdctjn!
 DB_HOST=localhost
 DB_PORT=5432
 DB_SSLMODE=disable
+ENABLE_REGISTRATION=true
+ALLOWED_ORIGINS="http://textsender.com"

.gitea/workflows/workflow.yaml

@@ -14,9 +14,9 @@ jobs:
     - uses: actions/checkout@v5
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v6
       with:
-        go-version: '1.25.3' # You can specify a specific version or 'stable'
+        go-version: '1.25.4' # You can specify a specific version or 'stable'
 
     - name: Build
       run: |
@@ -24,7 +24,7 @@ jobs:
         mkdir -p ~/.ssh
         echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender_models_deploy_key
         chmod 600 ~/.ssh/textsender_models_deploy_key
-        ssh-keyscan ${{ vars.MY_HOST }} >> ~/.ssh/known_hosts
+        ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
  
         eval $(ssh-agent -s)
         ssh-add -v ~/.ssh/textsender_models_deploy_key
@@ -66,9 +66,9 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v6
         with:
-          go-version: '1.25.3'
+          go-version: '1.25.4'
 
       - name: Install PostgreSQL client
         run: sudo apt update && sudo apt-get install -y postgresql-client
@@ -99,19 +99,21 @@ jobs:
           echo "Parent directory"
           echo `pwd`
 
-          echo "SECRET_KEY=$SECRET_KEY" >> .env
-          echo "DB_NAME=$DB_NAME" > .env
+          echo "SECRET_KEY=$SECRET_KEY" > .env
+          echo "DB_NAME=$DB_NAME" >> .env
           echo "DB_USER=$DB_USER" >> .env
           echo "DB_PASSWORD=$DB_PASSWORD" >> .env
           echo "DB_HOST=$DB_HOST" >> .env
           echo "DB_PORT=$DB_PORT" >> .env
           echo "DB_SSLMODE=$DB_SSLMODE" >> .env
+          echo "ENABLE_REGISTRATION=true" >> .env
+          echo "ALLOWED_ORIGINS=http://localhost:9080" >> .env
 
           echo "Initializing config"
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender_models_deploy_key
           chmod 600 ~/.ssh/textsender_models_deploy_key
-          ssh-keyscan ${{ vars.MY_HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
    
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender_models_deploy_key

Dockerfile

@@ -1,5 +1,5 @@
 # Multi-stage Dockerfile for Go application
-FROM golang:1.25.3 AS builder
+FROM golang:1.25.4 AS builder
 
 WORKDIR /app
 

README.md

@@ -23,7 +23,6 @@ make build
 Generate API documentation
 ```
 go install github.com/swaggo/swag/cmd/swag@latest
-go get -u github.com/swaggo/http-swagger/v2
 
 swag init --generalInfo main.go --dir ./cmd/api,./internal/handler --output docs/ --parseDependency --parseInternal
 ```

cmd/api/main.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
+	"github.com/go-chi/cors"
 	"github.com/swaggo/http-swagger/v2"
 
 	_ "git.kundeng.us/phoenix/textsender-auth/docs"
@@ -20,7 +21,7 @@ import (
 	"git.kundeng.us/phoenix/textsender-auth/internal/handler"
 	"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
 	mdleware "git.kundeng.us/phoenix/textsender-auth/internal/middleware"
-	"git.kundeng.us/phoenix/textsender-auth/internal/model"
+	"git.kundeng.us/phoenix/textsender-auth/internal/services"
 	"git.kundeng.us/phoenix/textsender-auth/internal/store"
 )
 
@@ -73,15 +74,26 @@ func main() {
 	}
 
 	// Services
-	userStore := model.NewUserStore(db.Pool)
+	userStore := store.NewUserStore(db.Pool)
 	serviceStore := store.NewServiceStore(db.Pool)
 
-	userHandler := handler.NewUserHandler(userStore)
-	loginHandler := handler.NewLoginHandler(userStore)
-	serviceHandler := handler.NewServiceHandler(serviceStore)
+	userHandler := handler.NewUserHandler(cfg, userStore)
+	loginHandler := handler.NewLoginHandler(cfg, userStore)
+	serviceHandler := handler.NewServiceHandler(cfg, serviceStore)
+	refreshHandler := handler.NewRefreshHandler(cfg, userStore, serviceStore)
 
 	router := chi.NewRouter()
+	jwtService := services.NewJWTService(config.GetSecretKey())
 
+	// Configure CORS
+	router.Use(cors.Handler(cors.Options{
+		AllowedOrigins:   cfg.AllowedOrigins,
+		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"},
+		AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
+		ExposedHeaders:   []string{"Link", "X-Total-Count"},
+		AllowCredentials: true,
+		MaxAge:           300, // 5 minutes
+	}))
 	router.Use(middleware.Logger)
 	router.Use(middleware.Recoverer)
 	router.Use(middleware.Timeout(60 * time.Second))
@@ -90,6 +102,9 @@ func main() {
 	router.Method("Post", endpoint.Register, http.HandlerFunc(userHandler.Register))
 	router.Method("Post", endpoint.Login, http.HandlerFunc(loginHandler.Login))
 	router.Method("Post", endpoint.CreateServiceUser, http.HandlerFunc(serviceHandler.Register))
+	router.Method("Post", endpoint.LoginServiceUser, http.HandlerFunc(serviceHandler.Login))
+	router.Method("Post", endpoint.TokenRefresh, http.HandlerFunc(refreshHandler.Refresh))
+	router.Method("PATCH", endpoint.UpdatePassword, mdleware.AuthMiddleware(jwtService)(http.HandlerFunc(loginHandler.UpdatePassword)))
 
 	router.Method("GET", "/swagger/*", httpSwagger.Handler(
 		httpSwagger.URL(fmt.Sprintf("http://localhost:%s/swagger/doc.json", config.Port)),

cmd/api/main_test.go

@@ -4,22 +4,24 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"net/http"
 	"os"
 	"path"
 	"testing"
 
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
 	"github.com/joho/godotenv"
 
 	"git.kundeng.us/phoenix/textsender-auth/internal/config"
 	"git.kundeng.us/phoenix/textsender-auth/internal/db"
 	"git.kundeng.us/phoenix/textsender-auth/internal/handler"
 	"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
-	"git.kundeng.us/phoenix/textsender-auth/internal/model"
+	mdleware "git.kundeng.us/phoenix/textsender-auth/internal/middleware"
+	"git.kundeng.us/phoenix/textsender-auth/internal/services"
 	"git.kundeng.us/phoenix/textsender-auth/internal/store"
 )
 
-var testRouter *mux.Router
+var testRouter *chi.Mux
 
 func TestMain(m *testing.M) {
 	cfg := load()
@@ -38,16 +40,21 @@ func TestMain(m *testing.M) {
 		panic("Failed to initialize database")
 	}
 
-	userStore := model.NewUserStore(database.Pool)
+	userStore := store.NewUserStore(database.Pool)
 	serviceStore := store.NewServiceStore(database.Pool)
-	userHandler := handler.NewUserHandler(userStore)
-	loginHandler := handler.NewLoginHandler(userStore)
-	serviceHandler := handler.NewServiceHandler(serviceStore)
+	userHandler := handler.NewUserHandler(cfg, userStore)
+	loginHandler := handler.NewLoginHandler(cfg, userStore)
+	serviceHandler := handler.NewServiceHandler(cfg, serviceStore)
+	refreshHandler := handler.NewRefreshHandler(cfg, userStore, serviceStore)
 
-	testRouter = mux.NewRouter()
-	testRouter.HandleFunc(endpoint.Register, userHandler.Register).Methods("POST")
-	testRouter.HandleFunc(endpoint.Login, loginHandler.Login).Methods("POST")
-	testRouter.HandleFunc(endpoint.CreateServiceUser, serviceHandler.Register).Methods("POST")
+	testRouter = chi.NewRouter()
+	jwtService := services.NewJWTService(config.GetSecretKey())
+	testRouter.Method("POST", endpoint.Register, http.HandlerFunc(userHandler.Register))
+	testRouter.Method("POST", endpoint.Login, http.HandlerFunc(loginHandler.Login))
+	testRouter.Method("POST", endpoint.CreateServiceUser, http.HandlerFunc(serviceHandler.Register))
+	testRouter.Method("POST", endpoint.LoginServiceUser, http.HandlerFunc(serviceHandler.Login))
+	testRouter.Method("POST", endpoint.TokenRefresh, http.HandlerFunc(refreshHandler.Refresh))
+	testRouter.Method("PATCH", endpoint.UpdatePassword, mdleware.AuthMiddleware(jwtService)(http.HandlerFunc(loginHandler.UpdatePassword)))
 
 	code := m.Run()
 	os.Exit(code)
@@ -73,9 +80,10 @@ func load() *config.Config {
 	dbConnString := unpackedConnString.Parse()
 
 	return &config.Config{
-		DBConnString: dbConnString,
-		ServerPort:   *port,
-		ResetDB:      *resetDb,
+		DBConnString:       dbConnString,
+		ServerPort:         *port,
+		ResetDB:            *resetDb,
+		EnableRegistration: config.CheckRegistration(),
 	}
 }
 

docs/docs.go

@@ -108,6 +108,12 @@ const docTemplate = `{
                             "$ref": "#/definitions/handler.RegisterResponse"
                         }
                     },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RegisterResponse"
+                        }
+                    },
                     "500": {
                         "description": "Internal Server Error",
                         "schema": {
@@ -117,6 +123,51 @@ const docTemplate = `{
                 }
             }
         },
+        "/service/login": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "Servce login and be given an access token (requires JWT)",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "service users"
+                ],
+                "summary": "Service login",
+                "parameters": [
+                    {
+                        "description": "Data to obtain a service token",
+                        "name": "request",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/handler.ServiceLoginRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.ServiceLoginResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/handler.ServiceLoginResponse"
+                        }
+                    }
+                }
+            }
+        },
         "/service/register": {
             "post": {
                 "security": [
@@ -159,6 +210,12 @@ const docTemplate = `{
                             "$ref": "#/definitions/handler.ServiceCreationResponse"
                         }
                     },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/handler.ServiceCreationResponse"
+                        }
+                    },
                     "500": {
                         "description": "Internal Server Error",
                         "schema": {
@@ -167,9 +224,197 @@ const docTemplate = `{
                     }
                 }
             }
+        },
+        "/token/refresh": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "Refresh token endpoint (requires JWT)",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "refresh"
+                ],
+                "summary": "Obtain a refresh token",
+                "parameters": [
+                    {
+                        "description": "Data to refresh token",
+                        "name": "request",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/handler.RefreshRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RefreshResponse"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RefreshResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RefreshResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/user/name/update": {
+            "patch": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "Update the first or last name of a user (requires JWT)",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "users"
+                ],
+                "summary": "Update name of user",
+                "parameters": [
+                    {
+                        "description": "Data to update name of user",
+                        "name": "request",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdateNameRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdateNameResponse"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdateNameResponse"
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdateNameResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdateNameResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/user/password/update": {
+            "patch": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "Update the password of a regular account (requires JWT)",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "users"
+                ],
+                "summary": "Update Password",
+                "parameters": [
+                    {
+                        "description": "Needed data to update password",
+                        "name": "request",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdatePasswordRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdatePasswordResponse"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdatePasswordResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdatePasswordResponse"
+                        }
+                    }
+                }
+            }
         }
     },
     "definitions": {
+        "git_kundeng_us_phoenix_textsender-models_tx0_user.User": {
+            "type": "object",
+            "properties": {
+                "created": {
+                    "type": "string"
+                },
+                "first_name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "last_login": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "password": {
+                    "type": "string"
+                },
+                "phone_number": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
+                }
+            }
+        },
         "handler.LoginAccount": {
             "type": "object",
             "properties": {
@@ -195,6 +440,28 @@ const docTemplate = `{
                 }
             }
         },
+        "handler.RefreshRequest": {
+            "type": "object",
+            "properties": {
+                "access_token": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.RefreshResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/token.Login"
+                    }
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
         "handler.RegisterResponse": {
             "type": "object",
             "properties": {
@@ -262,6 +529,90 @@ const docTemplate = `{
                 }
             }
         },
+        "handler.ServiceLoginRequest": {
+            "type": "object",
+            "properties": {
+                "passphrase": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.ServiceLoginResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/token.Login"
+                    }
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.UpdateNameRequest": {
+            "type": "object",
+            "properties": {
+                "first_name": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "user_id": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.UpdateNameResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/git_kundeng_us_phoenix_textsender-models_tx0_user.User"
+                    }
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.UpdatePasswordRequest": {
+            "type": "object",
+            "properties": {
+                "confirmed_password": {
+                    "type": "string"
+                },
+                "current_password": {
+                    "type": "string"
+                },
+                "updated_password": {
+                    "type": "string"
+                },
+                "user_id": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.UpdatePasswordResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/git_kundeng_us_phoenix_textsender-models_tx0_user.User"
+                    }
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
         "token.Login": {
             "type": "object",
             "properties": {
@@ -271,24 +622,34 @@ const docTemplate = `{
                 "expires_in": {
                     "type": "integer"
                 },
+                "issued_at": {
+                    "type": "integer"
+                },
                 "token_type": {
                     "type": "string"
+                },
+                "user_id": {
+                    "type": "string"
                 }
             }
         },
         "user.ServiceUser": {
             "type": "object",
             "properties": {
-                "date_created": {
+                "created": {
                     "type": "string"
                 },
                 "id": {
                     "type": "string"
                 },
+                "last_login": {
+                    "type": "string"
+                },
                 "passphrase": {
                     "type": "string"
                 },
                 "username": {
+                    "description": "TODO: Remove the omitempty tags at a later point",
                     "type": "string"
                 }
             }

docs/swagger.json

@@ -102,6 +102,12 @@
                             "$ref": "#/definitions/handler.RegisterResponse"
                         }
                     },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RegisterResponse"
+                        }
+                    },
                     "500": {
                         "description": "Internal Server Error",
                         "schema": {
@@ -111,6 +117,51 @@
                 }
             }
         },
+        "/service/login": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "Servce login and be given an access token (requires JWT)",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "service users"
+                ],
+                "summary": "Service login",
+                "parameters": [
+                    {
+                        "description": "Data to obtain a service token",
+                        "name": "request",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/handler.ServiceLoginRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.ServiceLoginResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/handler.ServiceLoginResponse"
+                        }
+                    }
+                }
+            }
+        },
         "/service/register": {
             "post": {
                 "security": [
@@ -153,6 +204,12 @@
                             "$ref": "#/definitions/handler.ServiceCreationResponse"
                         }
                     },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/handler.ServiceCreationResponse"
+                        }
+                    },
                     "500": {
                         "description": "Internal Server Error",
                         "schema": {
@@ -161,9 +218,197 @@
                     }
                 }
             }
+        },
+        "/token/refresh": {
+            "post": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "Refresh token endpoint (requires JWT)",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "refresh"
+                ],
+                "summary": "Obtain a refresh token",
+                "parameters": [
+                    {
+                        "description": "Data to refresh token",
+                        "name": "request",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/handler.RefreshRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RefreshResponse"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RefreshResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RefreshResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/user/name/update": {
+            "patch": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "Update the first or last name of a user (requires JWT)",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "users"
+                ],
+                "summary": "Update name of user",
+                "parameters": [
+                    {
+                        "description": "Data to update name of user",
+                        "name": "request",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdateNameRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdateNameResponse"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdateNameResponse"
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdateNameResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdateNameResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/user/password/update": {
+            "patch": {
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
+                "description": "Update the password of a regular account (requires JWT)",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "users"
+                ],
+                "summary": "Update Password",
+                "parameters": [
+                    {
+                        "description": "Needed data to update password",
+                        "name": "request",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdatePasswordRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdatePasswordResponse"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdatePasswordResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/handler.UpdatePasswordResponse"
+                        }
+                    }
+                }
+            }
         }
     },
     "definitions": {
+        "git_kundeng_us_phoenix_textsender-models_tx0_user.User": {
+            "type": "object",
+            "properties": {
+                "created": {
+                    "type": "string"
+                },
+                "first_name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "last_login": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "password": {
+                    "type": "string"
+                },
+                "phone_number": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
+                }
+            }
+        },
         "handler.LoginAccount": {
             "type": "object",
             "properties": {
@@ -189,6 +434,28 @@
                 }
             }
         },
+        "handler.RefreshRequest": {
+            "type": "object",
+            "properties": {
+                "access_token": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.RefreshResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/token.Login"
+                    }
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
         "handler.RegisterResponse": {
             "type": "object",
             "properties": {
@@ -256,6 +523,90 @@
                 }
             }
         },
+        "handler.ServiceLoginRequest": {
+            "type": "object",
+            "properties": {
+                "passphrase": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.ServiceLoginResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/token.Login"
+                    }
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.UpdateNameRequest": {
+            "type": "object",
+            "properties": {
+                "first_name": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "user_id": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.UpdateNameResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/git_kundeng_us_phoenix_textsender-models_tx0_user.User"
+                    }
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.UpdatePasswordRequest": {
+            "type": "object",
+            "properties": {
+                "confirmed_password": {
+                    "type": "string"
+                },
+                "current_password": {
+                    "type": "string"
+                },
+                "updated_password": {
+                    "type": "string"
+                },
+                "user_id": {
+                    "type": "string"
+                }
+            }
+        },
+        "handler.UpdatePasswordResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/git_kundeng_us_phoenix_textsender-models_tx0_user.User"
+                    }
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
         "token.Login": {
             "type": "object",
             "properties": {
@@ -265,24 +616,34 @@
                 "expires_in": {
                     "type": "integer"
                 },
+                "issued_at": {
+                    "type": "integer"
+                },
                 "token_type": {
                     "type": "string"
+                },
+                "user_id": {
+                    "type": "string"
                 }
             }
         },
         "user.ServiceUser": {
             "type": "object",
             "properties": {
-                "date_created": {
+                "created": {
                     "type": "string"
                 },
                 "id": {
                     "type": "string"
                 },
+                "last_login": {
+                    "type": "string"
+                },
                 "passphrase": {
                     "type": "string"
                 },
                 "username": {
+                    "description": "TODO: Remove the omitempty tags at a later point",
                     "type": "string"
                 }
             }

docs/swagger.yaml

@@ -1,5 +1,24 @@
 basePath: /api/v1
 definitions:
+  git_kundeng_us_phoenix_textsender-models_tx0_user.User:
+    properties:
+      created:
+        type: string
+      first_name:
+        type: string
+      id:
+        type: string
+      last_login:
+        type: string
+      last_name:
+        type: string
+      password:
+        type: string
+      phone_number:
+        type: string
+      username:
+        type: string
+    type: object
   handler.LoginAccount:
     properties:
       password:
@@ -16,6 +35,20 @@ definitions:
       message:
         type: string
     type: object
+  handler.RefreshRequest:
+    properties:
+      access_token:
+        type: string
+    type: object
+  handler.RefreshResponse:
+    properties:
+      data:
+        items:
+          $ref: '#/definitions/token.Login'
+        type: array
+      message:
+        type: string
+    type: object
   handler.RegisterResponse:
     properties:
       data:
@@ -59,24 +92,85 @@ definitions:
       message:
         type: string
     type: object
+  handler.ServiceLoginRequest:
+    properties:
+      passphrase:
+        type: string
+      username:
+        type: string
+    type: object
+  handler.ServiceLoginResponse:
+    properties:
+      data:
+        items:
+          $ref: '#/definitions/token.Login'
+        type: array
+      message:
+        type: string
+    type: object
+  handler.UpdateNameRequest:
+    properties:
+      first_name:
+        type: string
+      last_name:
+        type: string
+      user_id:
+        type: string
+    type: object
+  handler.UpdateNameResponse:
+    properties:
+      data:
+        items:
+          $ref: '#/definitions/git_kundeng_us_phoenix_textsender-models_tx0_user.User'
+        type: array
+      message:
+        type: string
+    type: object
+  handler.UpdatePasswordRequest:
+    properties:
+      confirmed_password:
+        type: string
+      current_password:
+        type: string
+      updated_password:
+        type: string
+      user_id:
+        type: string
+    type: object
+  handler.UpdatePasswordResponse:
+    properties:
+      data:
+        items:
+          $ref: '#/definitions/git_kundeng_us_phoenix_textsender-models_tx0_user.User'
+        type: array
+      message:
+        type: string
+    type: object
   token.Login:
     properties:
       access_token:
         type: string
       expires_in:
         type: integer
+      issued_at:
+        type: integer
       token_type:
         type: string
+      user_id:
+        type: string
     type: object
   user.ServiceUser:
     properties:
-      date_created:
+      created:
         type: string
       id:
         type: string
+      last_login:
+        type: string
       passphrase:
         type: string
       username:
+        description: 'TODO: Remove the omitempty tags at a later point'
         type: string
     type: object
 host: localhost:9080
@@ -141,6 +235,10 @@ paths:
           description: Bad Request
           schema:
             $ref: '#/definitions/handler.RegisterResponse'
+        "403":
+          description: Forbidden
+          schema:
+            $ref: '#/definitions/handler.RegisterResponse'
         "500":
           description: Internal Server Error
           schema:
@@ -150,6 +248,34 @@ paths:
       summary: Register user
       tags:
       - users
+  /service/login:
+    post:
+      consumes:
+      - application/json
+      description: Servce login and be given an access token (requires JWT)
+      parameters:
+      - description: Data to obtain a service token
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/handler.ServiceLoginRequest'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/handler.ServiceLoginResponse'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/handler.ServiceLoginResponse'
+      security:
+      - BearerAuth: []
+      summary: Service login
+      tags:
+      - service users
   /service/register:
     post:
       consumes:
@@ -173,6 +299,10 @@ paths:
           description: Bad Request
           schema:
             $ref: '#/definitions/handler.ServiceCreationResponse'
+        "403":
+          description: Forbidden
+          schema:
+            $ref: '#/definitions/handler.ServiceCreationResponse'
         "500":
           description: Internal Server Error
           schema:
@@ -182,6 +312,106 @@ paths:
       summary: Register service user
       tags:
       - service users
+  /token/refresh:
+    post:
+      consumes:
+      - application/json
+      description: Refresh token endpoint (requires JWT)
+      parameters:
+      - description: Data to refresh token
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/handler.RefreshRequest'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/handler.RefreshResponse'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/handler.RefreshResponse'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/handler.RefreshResponse'
+      security:
+      - BearerAuth: []
+      summary: Obtain a refresh token
+      tags:
+      - refresh
+  /user/name/update:
+    patch:
+      consumes:
+      - application/json
+      description: Update the first or last name of a user (requires JWT)
+      parameters:
+      - description: Data to update name of user
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/handler.UpdateNameRequest'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/handler.UpdateNameResponse'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/handler.UpdateNameResponse'
+        "403":
+          description: Forbidden
+          schema:
+            $ref: '#/definitions/handler.UpdateNameResponse'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/handler.UpdateNameResponse'
+      security:
+      - BearerAuth: []
+      summary: Update name of user
+      tags:
+      - users
+  /user/password/update:
+    patch:
+      consumes:
+      - application/json
+      description: Update the password of a regular account (requires JWT)
+      parameters:
+      - description: Needed data to update password
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/handler.UpdatePasswordRequest'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/handler.UpdatePasswordResponse'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/handler.UpdatePasswordResponse'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/handler.UpdatePasswordResponse'
+      security:
+      - BearerAuth: []
+      summary: Update Password
+      tags:
+      - users
 securityDefinitions:
   BearerAuth:
     description: JWT Bearer Token

go.mod

@@ -1,13 +1,13 @@
 module git.kundeng.us/phoenix/textsender-auth
 
-go 1.25.3
+go 1.25.4
 
 require (
-	git.kundeng.us/phoenix/textsender-models v0.0.8-main-3ab81c2b6d-556
+	git.kundeng.us/phoenix/textsender-models v0.1.6
 	github.com/go-chi/chi/v5 v5.2.3
+	github.com/go-chi/cors v1.2.2
 	github.com/golang-jwt/jwt/v5 v5.3.0
 	github.com/google/uuid v1.6.0
-	github.com/gorilla/mux v1.8.1
 	github.com/jackc/pgx/v5 v5.7.5
 	github.com/joho/godotenv v1.5.1
 	github.com/stretchr/testify v1.11.1

go.sum

@@ -1,5 +1,5 @@
-git.kundeng.us/phoenix/textsender-models v0.0.8-main-3ab81c2b6d-556 h1:iVE8Dg3aYugoZseneN9tQtdV2cymukspShF7dfExSVw=
-git.kundeng.us/phoenix/textsender-models v0.0.8-main-3ab81c2b6d-556/go.mod h1:lx5MCnOgGgsdpwzrfi9uph5xmkeb6H8AuexUNGss2no=
+git.kundeng.us/phoenix/textsender-models v0.1.6 h1:d/rhvqjFSt1Ty/3UfwS21be+lYb9EtWEaDtkzfbzEp0=
+git.kundeng.us/phoenix/textsender-models v0.1.6/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -8,6 +8,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE=
 github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
+github.com/go-chi/cors v1.2.2 h1:Jmey33TE+b+rB7fT8MUy1u0I4L+NARQlK6LhzKPSyQE=
+github.com/go-chi/cors v1.2.2/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
@@ -24,8 +26,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
-github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=

internal/config/config.go

@@ -5,7 +5,9 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"path"
 	"strconv"
+	"strings"
 
 	"github.com/joho/godotenv"
 
@@ -13,9 +15,11 @@ import (
 )
 
 type Config struct {
-	DBConnString string
-	ServerPort   string
-	ResetDB      bool
+	DBConnString       string
+	ServerPort         string
+	ResetDB            bool
+	EnableRegistration bool
+	AllowedOrigins     []string
 }
 
 type ConnectionInfo struct {
@@ -52,16 +56,35 @@ func Load() *Config {
 
 	err := godotenv.Load()
 	if err != nil {
-		log.Fatal("Error loading .env file")
+		cwd, _ := os.Getwd()
+		envPath := path.Join(cwd, "../..", ".env")
+		if err = godotenv.Load(envPath); err != nil {
+			prevPath := path.Join(envPath, "../..", ".env")
+			if err = godotenv.Load(prevPath); err != nil {
+				log.Fatal("Error loading .env file")
+			}
+		}
 	}
 
 	unpackedConnString := UnpackDBConnString()
 	dbConnString := unpackedConnString.Parse()
+	allowedOrigins := unpackAllowedOrigin()
 
-	return &Config{
-		DBConnString: dbConnString,
-		ServerPort:   *port,
-		ResetDB:      *resetDb,
+	if len(allowedOrigins) > 0 {
+		return &Config{
+			DBConnString:       dbConnString,
+			ServerPort:         *port,
+			ResetDB:            *resetDb,
+			EnableRegistration: CheckRegistration(),
+			AllowedOrigins:     allowedOrigins,
+		}
+	} else {
+		return &Config{
+			DBConnString:       dbConnString,
+			ServerPort:         *port,
+			ResetDB:            *resetDb,
+			EnableRegistration: CheckRegistration(),
+		}
 	}
 }
 
@@ -120,6 +143,26 @@ func UnpackDBConnString() (connInfo ConnectionInfo) {
 	return
 }
 
+func unpackAllowedOrigin() []string {
+	allowedOriginsRaw := os.Getenv("ALLOWED_ORIGINS")
+	allowedOriginsSplit := strings.Split(allowedOriginsRaw, ",")
+	return allowedOriginsSplit
+}
+
+func CheckRegistration() bool {
+	if flagValue := os.Getenv("ENABLE_REGISTRATION"); flagValue != "" {
+		if val := strings.ToUpper(flagValue); val == "TRUE" {
+			return true
+		} else if val == "FALSE" {
+			return false
+		} else {
+			return true
+		}
+	} else {
+		return true
+	}
+}
+
 func (c *Config) GetDBConnString() string {
 	return c.DBConnString
 }

internal/handler/endpoint/endpoint.go

@@ -1,6 +1,14 @@
 package endpoint
 
-// Endpoint for registering a user
-const Register = "/api/v1/register"
-const Login = "/api/v1/login"
-const CreateServiceUser = "/api/v1/service/register"
+const (
+	// Endpoint for registering a user
+	Register       = "/api/v1/register"
+	Login          = "/api/v1/login"
+	UpdatePassword = "/api/v1/user/password/update"
+	UpdateName     = "/api/v1/user/name/update"
+
+	CreateServiceUser = "/api/v1/service/register"
+	LoginServiceUser  = "/api/v1/service/login"
+
+	TokenRefresh = "/api/v1/token/refresh"
+)

internal/handler/login.go

@@ -1,16 +1,28 @@
 package handler
 
 import (
-	"fmt"
+	"log"
 	"net/http"
+	"time"
 
-	"git.kundeng.us/phoenix/textsender-models/pkg/token"
+	"git.kundeng.us/phoenix/textsender-models/tx0/token"
+	"git.kundeng.us/phoenix/textsender-models/tx0/user"
+	"github.com/google/uuid"
 
 	"git.kundeng.us/phoenix/textsender-auth/internal/config"
-	"git.kundeng.us/phoenix/textsender-auth/internal/model"
+	"git.kundeng.us/phoenix/textsender-auth/internal/store"
 	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
 )
 
+type LoginHandler struct {
+	Config    *config.Config
+	UserStore store.UserStore
+}
+
+func NewLoginHandler(cfg *config.Config, userStore store.UserStore) *LoginHandler {
+	return &LoginHandler{Config: cfg, UserStore: userStore}
+}
+
 type LoginAccount struct {
 	Username string `json:"username"`
 	Password string `json:"password"`
@@ -21,14 +33,6 @@ type LoginResponse struct {
 	Data    []token.Login `json:"data"`
 }
 
-type LoginHandler struct {
-	UserStore model.UserStore
-}
-
-func NewLoginHandler(userStore model.UserStore) *LoginHandler {
-	return &LoginHandler{UserStore: userStore}
-}
-
 // Login godoc
 // @Summary      Login
 // @Description  Login and be given an access token (requires JWT)
@@ -54,7 +58,7 @@ func (l *LoginHandler) Login(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
 	if exists, err := l.UserStore.UserExists(ctx, req.Username); err != nil {
-		fmt.Printf("Error: %v", err)
+		log.Println("Error:", err)
 		statusCode = http.StatusInternalServerError
 		resp.Message = err.Error()
 	} else {
@@ -66,23 +70,36 @@ func (l *LoginHandler) Login(w http.ResponseWriter, r *http.Request) {
 				statusCode = http.StatusInternalServerError
 				resp.Message = err.Error()
 			} else {
-				hashing := utility.HashMash{Password: req.Password}
-				if hashing.CheckPasswordHash(req.Password, user.Password) {
-					var tokGen utility.TokenGenerator
-					secretKey := config.GetSecretKey()
-					tokGen.SetSecretKey(secretKey)
-					if myToken, err := tokGen.GenerateToken(*user); err != nil {
-						fmt.Println(err.Error())
-						statusCode = http.StatusInternalServerError
-						resp.Message = "Error generating token"
-					} else {
-						statusCode = http.StatusOK
-						resp.Data = append(resp.Data, *myToken)
-						resp.Message = "Successful"
-					}
+				hashing := utility.HashMash{}
+				if err := hashing.SetPassword(req.Password); err != nil {
+					statusCode = http.StatusInternalServerError
+					resp.Message = err.Error()
 				} else {
-					statusCode = http.StatusNotFound
-					resp.Message = "User not found"
+					if hashing.CheckPasswordHash(req.Password, user.Password) {
+						lastLogin := time.Now()
+						var tokGen utility.TokenGenerator
+						secretKey := config.GetSecretKey()
+						tokGen.SetSecretKey(secretKey)
+						if myToken, err := tokGen.GenerateToken(*user); err != nil {
+							log.Println(err.Error())
+							statusCode = http.StatusInternalServerError
+							resp.Message = "Error generating token"
+						} else {
+							log.Println("Updating user's last login")
+							if rowsAffected, err := l.UserStore.UpdateLastLogin(ctx, user.Id, lastLogin); err != nil {
+								statusCode = http.StatusInternalServerError
+								resp.Message = err.Error()
+							} else {
+								log.Println("Rows updated:", rowsAffected)
+								statusCode = http.StatusOK
+								resp.Data = append(resp.Data, *myToken)
+								resp.Message = "Successful"
+							}
+						}
+					} else {
+						statusCode = http.StatusNotFound
+						resp.Message = "User not found"
+					}
 				}
 			}
 		}
@@ -90,3 +107,85 @@ func (l *LoginHandler) Login(w http.ResponseWriter, r *http.Request) {
 
 	RespondWithJson(w, statusCode, &resp)
 }
+
+type UpdatePasswordRequest struct {
+	UserId            uuid.UUID `json:"user_id"`
+	CurrentPassword   string    `json:"current_password"`
+	UpdatedPassword   string    `json:"updated_password"`
+	ConfirmedPassword string    `json:"confirmed_password"`
+}
+
+type UpdatePasswordResponse struct {
+	Message string      `json:"message"`
+	Data    []user.User `json:"data"`
+}
+
+// UpdatePassword godoc
+// @Summary      Update Password
+// @Description  Update the password of a regular account (requires JWT)
+// @Tags         users
+// @Accept       json
+// @Produce      json
+// @Security     BearerAuth
+// @Param        request body      UpdatePasswordRequest true  "Needed data to update password"
+// @Success      200  {object}  UpdatePasswordResponse
+// @Failure      400  {object}  UpdatePasswordResponse
+// @Failure      500  {object}  UpdatePasswordResponse
+// @Router       /user/password/update [patch]
+func (l *LoginHandler) UpdatePassword(w http.ResponseWriter, r *http.Request) {
+	var req UpdatePasswordRequest
+	if err := ExtractFromRequest(r, &req); err != nil {
+		http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
+	}
+	defer r.Body.Close()
+
+	var statusCode int
+	var resp UpdatePasswordResponse
+
+	ctx := r.Context()
+
+	if usr, err := l.UserStore.GetUserByID(ctx, req.UserId); err != nil {
+		log.Println("Error:", err)
+		statusCode = http.StatusInternalServerError
+		resp.Message = err.Error()
+	} else {
+		hashing := utility.HashMash{}
+		if err := hashing.SetPassword(req.CurrentPassword); err != nil {
+			statusCode = http.StatusInternalServerError
+			resp.Message = err.Error()
+		} else {
+			if hashing.CheckPasswordHash(req.CurrentPassword, usr.Password) {
+				if req.UpdatedPassword == req.ConfirmedPassword {
+					// Hash password
+					err := hashing.SetPassword(req.UpdatedPassword)
+					hashedPassword, err := hashing.HashPassword()
+					if err != nil {
+						statusCode = http.StatusInternalServerError
+						resp.Message = err.Error()
+					} else {
+						// Update user password
+						usr.Password = hashedPassword
+						// Save user in DB
+						if rowsAffected, err := l.UserStore.UpdatePassword(ctx, usr.Id, usr.Password); err != nil {
+							statusCode = http.StatusInternalServerError
+							resp.Message = err.Error()
+						} else {
+							log.Println("Rows affected:", rowsAffected)
+							statusCode = http.StatusOK
+							resp.Message = "Successful"
+							resp.Data = append(resp.Data, *usr)
+						}
+					}
+				} else {
+					statusCode = http.StatusBadRequest
+					resp.Message = "Passwords do not match"
+				}
+			} else {
+				statusCode = http.StatusBadRequest
+				resp.Message = "User not found"
+			}
+		}
+	}
+
+	RespondWithJson(w, statusCode, &resp)
+}

internal/handler/login_test.go

@@ -13,27 +13,20 @@ import (
 
 	"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
 	"git.kundeng.us/phoenix/textsender-auth/internal/store/mock"
-	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
 )
 
 func TestLogin(t *testing.T) {
+	cfg := GetConfig()
 	mockstore := mock.NewMockUserStore()
-	handler := NewLoginHandler(mockstore)
-
-	testUser := GetTestUser()
-	unhashedPassword := testUser.Password
-	hashing := utility.HashMash{Password: testUser.Password}
-	hashedPassword, err := hashing.HashPassword()
-	assert.NoError(t, err)
-
-	testUser.Password = hashedPassword
+	handler := NewLoginHandler(cfg, mockstore)
 
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
 
-	mockstore.CreateUser(ctx, &testUser)
+	testUser, unhashedPassword, err := createUser(ctx, mockstore)
+	assert.NoError(t, err, "Error Creating user")
 
-	loginUser := LoginAccount{Username: testUser.Username, Password: unhashedPassword}
+	loginUser := LoginAccount{Username: testUser.Username, Password: *unhashedPassword}
 	jsonValue, _ := json.Marshal(loginUser)
 
 	req, _ := http.NewRequest("POST", endpoint.Login, strings.NewReader(string(jsonValue)))
@@ -49,3 +42,29 @@ func TestLogin(t *testing.T) {
 
 	assert.NotEmpty(t, response.Data, "An access token should have been returned")
 }
+
+func TestUpdatePassword(t *testing.T) {
+	cfg := GetConfig()
+	mockstore := mock.NewMockUserStore()
+	handler := NewLoginHandler(cfg, mockstore)
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
+	testUser, unhashedPassword, err := createUser(ctx, mockstore)
+	assert.NoError(t, err, "Error Creating user")
+	assert.NotNil(t, testUser, "User should not be nil")
+
+	updatedPassword := "TakeATrip2yonder!"
+	newPassword := UpdatePasswordRequest{UserId: testUser.Id, CurrentPassword: *unhashedPassword, UpdatedPassword: updatedPassword, ConfirmedPassword: updatedPassword}
+	jsonValue, _ := json.Marshal(newPassword)
+
+	req, _ := http.NewRequest("PATCH", endpoint.UpdatePassword, strings.NewReader(string(jsonValue)))
+	rr := httptest.NewRecorder()
+
+	handler.UpdatePassword(rr, req)
+	assert.Equal(t, http.StatusOK, rr.Code)
+
+	var response UpdatePasswordResponse
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
+	assert.NoError(t, err)
+}

internal/handler/refresh.go

@@ -0,0 +1,100 @@
+package handler
+
+import (
+	"net/http"
+
+	"git.kundeng.us/phoenix/textsender-models/tx0/token"
+
+	"git.kundeng.us/phoenix/textsender-auth/internal/config"
+	"git.kundeng.us/phoenix/textsender-auth/internal/store"
+	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
+)
+
+type RefreshHandler struct {
+	Config       *config.Config
+	UserStore    store.UserStore
+	ServiceStore store.ServiceStore
+}
+
+func NewRefreshHandler(cfg *config.Config, userStore store.UserStore, serviceStore store.ServiceStore) *RefreshHandler {
+	return &RefreshHandler{Config: cfg, UserStore: userStore, ServiceStore: serviceStore}
+}
+
+type RefreshRequest struct {
+	AccessToken string `json:"access_token"`
+}
+
+type RefreshResponse struct {
+	Message string         `json:"message"`
+	Data    []*token.Login `json:"data"`
+}
+
+// Refresh godoc
+// @Summary      Obtain a refresh token
+// @Description  Refresh token endpoint (requires JWT)
+// @Tags         refresh
+// @Accept       json
+// @Produce      json
+// @Security     BearerAuth
+// @Param        request body      RefreshRequest true  "Data to refresh token"
+// @Success      200  {object}  RefreshResponse
+// @Failure      400  {object}  RefreshResponse
+// @Failure      500  {object}  RefreshResponse
+// @Router       /token/refresh [post]
+func (rh *RefreshHandler) Refresh(w http.ResponseWriter, r *http.Request) {
+	var req RefreshRequest
+	if err := ExtractFromRequest(r, &req); err != nil {
+		http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
+	}
+	defer r.Body.Close()
+
+	var statusCode int
+	var resp RefreshResponse
+
+	secretKey := config.GetSecretKey()
+	tokGen := utility.TokenGenerator{}
+	tokGen.SetSecretKey(secretKey)
+	tokGen.SetHourOffset(12)
+	if verified, err := tokGen.VerifyToken(req.AccessToken); err != nil {
+		statusCode = http.StatusInternalServerError
+		resp.Message = err.Error()
+	} else {
+		if verified {
+			if id, err := tokGen.ExtractIdFromToken(req.AccessToken); err != nil {
+				statusCode = http.StatusInternalServerError
+				resp.Message = err.Error()
+			} else {
+				ctx := r.Context()
+				if usr, err := rh.UserStore.GetUserByID(ctx, id); err != nil || usr == nil {
+					if serviceUsr, err := rh.ServiceStore.GetWithId(ctx, id); err != nil || serviceUsr == nil {
+						statusCode = http.StatusInternalServerError
+						resp.Message = err.Error()
+					} else {
+						if myToken, err := tokGen.GenerateToken(serviceUsr); err != nil {
+							statusCode = http.StatusInternalServerError
+							resp.Message = err.Error()
+						} else {
+							statusCode = http.StatusOK
+							resp.Data = append(resp.Data, myToken)
+							resp.Message = "Successful"
+						}
+					}
+				} else {
+					if myToken, err := tokGen.GenerateToken(usr); err != nil {
+						statusCode = http.StatusInternalServerError
+						resp.Message = err.Error()
+					} else {
+						statusCode = http.StatusOK
+						resp.Data = append(resp.Data, myToken)
+						resp.Message = "Successful"
+					}
+				}
+			}
+		} else {
+			statusCode = http.StatusBadRequest
+			resp.Message = "Unverified"
+		}
+	}
+
+	RespondWithJson(w, statusCode, &resp)
+}

internal/handler/refresh_test.go

@@ -0,0 +1,70 @@
+package handler
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"git.kundeng.us/phoenix/textsender-models/tx0/user"
+	"github.com/stretchr/testify/assert"
+
+	"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
+	"git.kundeng.us/phoenix/textsender-auth/internal/store/mock"
+	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
+)
+
+func TestRefreshTokenWithMock(t *testing.T) {
+	var serviceUser user.ServiceUser
+	var hashedPassword string
+	var err error
+	unhashed := "A9328nr29nudx3292m320!"
+	hashing := utility.HashMash{}
+	if err := hashing.SetPassword(unhashed); err != nil {
+		assert.NoError(t, err, "Error setting password")
+	}
+
+	if hashedPassword, err = hashing.HashPassword(); err != nil {
+		assert.NoError(t, err, "Error hashing password: %v", err)
+	} else {
+		serviceUser.Passphrase = hashedPassword
+	}
+	serviceUser.Username = "swoon"
+	ctx := t.Context()
+	mockStore := mock.NewMockServiceUserStore()
+	userStore := mock.NewMockUserStore()
+
+	if err := mockStore.Create(ctx, &serviceUser); err != nil {
+		assert.NoError(t, err, "Error creating service user: %v", err)
+	}
+
+	cfg := GetConfig()
+	handler := NewServiceHandler(cfg, mockStore)
+	testService := ServiceLoginRequest{Username: serviceUser.Username, Passphrase: unhashed}
+	jsonValue, err := json.Marshal(testService)
+	assert.NoError(t, err, "Error marshaling request")
+
+	req, _ := http.NewRequest("POST", endpoint.LoginServiceUser, strings.NewReader(string(jsonValue)))
+	rr := httptest.NewRecorder()
+
+	handler.Login(rr, req)
+	assert.Equal(t, http.StatusOK, rr.Code)
+
+	var response ServiceLoginResponse
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
+	assert.NoError(t, err)
+
+	accessToken := response.Data[0].AccessToken
+
+	testReq := RefreshRequest{AccessToken: accessToken}
+	jsonValue, err = json.Marshal(testReq)
+	assert.NoError(t, err, "Error marshaling request")
+
+	newHandler := NewRefreshHandler(cfg, userStore, mockStore)
+	req, _ = http.NewRequest("POST", endpoint.TokenRefresh, strings.NewReader(string(jsonValue)))
+	rr = httptest.NewRecorder()
+
+	newHandler.Refresh(rr, req)
+	assert.Equal(t, http.StatusOK, rr.Code)
+}

internal/handler/register.go

@@ -2,15 +2,26 @@ package handler
 
 import (
 	"fmt"
+	"log"
 	"net/http"
 
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
+	"git.kundeng.us/phoenix/textsender-models/tx0/user"
 	"github.com/google/uuid"
 
-	"git.kundeng.us/phoenix/textsender-auth/internal/model"
+	"git.kundeng.us/phoenix/textsender-auth/internal/config"
+	"git.kundeng.us/phoenix/textsender-auth/internal/store"
 	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
 )
 
+type UserHandler struct {
+	Config    *config.Config
+	UserStore store.UserStore
+}
+
+func NewUserHandler(cfg *config.Config, userStore store.UserStore) *UserHandler {
+	return &UserHandler{Config: cfg, UserStore: userStore}
+}
+
 type RegisterUser struct {
 	PhoneNumber string `json:"phone_number"`
 	Username    string `json:"username"`
@@ -28,14 +39,6 @@ type RegisterResponse struct {
 	Data    []RegisterResponseItem `json:"data"`
 }
 
-type UserHandler struct {
-	UserStore model.UserStore
-}
-
-func NewUserHandler(userStore model.UserStore) *UserHandler {
-	return &UserHandler{UserStore: userStore}
-}
-
 // Register godoc
 // @Summary      Register user
 // @Description  Create a user that can send texts (requires JWT)
@@ -46,6 +49,7 @@ func NewUserHandler(userStore model.UserStore) *UserHandler {
 // @Param        request body      RegisterUser true  "Data to add user"
 // @Success      200  {object}  RegisterResponse
 // @Failure      400  {object}  RegisterResponse
+// @Failure      403  {object}  RegisterResponse
 // @Failure      500  {object}  RegisterResponse
 // @Router       /register [post]
 func (u *UserHandler) Register(w http.ResponseWriter, r *http.Request) {
@@ -60,6 +64,12 @@ func (u *UserHandler) Register(w http.ResponseWriter, r *http.Request) {
 
 	var statusCode int
 	var resp RegisterResponse
+	if !u.Config.EnableRegistration {
+		statusCode = http.StatusForbidden
+		resp.Message = "Registration disabled"
+		RespondWithJson(w, statusCode, &resp)
+		return
+	}
 	user := user.User{Username: req.Username, Password: req.Password, PhoneNumber: req.PhoneNumber}
 
 	fmt.Println("Username:", user.Username)
@@ -76,20 +86,25 @@ func (u *UserHandler) Register(w http.ResponseWriter, r *http.Request) {
 			statusCode = http.StatusBadRequest
 			resp.Message = "Failure in creating User"
 		} else {
-			hashing := utility.HashMash{Password: user.Password}
-			if hashedPassword, err := hashing.HashPassword(); err != nil {
+			hashing := utility.HashMash{}
+			if err := hashing.SetPassword(req.Password); err != nil {
 				statusCode = http.StatusInternalServerError
 				resp.Message = err.Error()
 			} else {
-				user.Password = hashedPassword
-				err := u.UserStore.CreateUser(ctx, &user)
-				if err != nil {
+				if hashedPassword, err := hashing.HashPassword(); err != nil {
 					statusCode = http.StatusInternalServerError
 					resp.Message = err.Error()
 				} else {
-					resp.Message = "Successful"
-					statusCode = http.StatusOK
-					resp.Data = append(resp.Data, RegisterResponseItem{Id: user.Id, PhoneNumber: user.PhoneNumber, Username: user.Username})
+					user.Password = hashedPassword
+					err := u.UserStore.CreateUser(ctx, &user)
+					if err != nil {
+						statusCode = http.StatusInternalServerError
+						resp.Message = err.Error()
+					} else {
+						resp.Message = "Successful"
+						statusCode = http.StatusOK
+						resp.Data = append(resp.Data, RegisterResponseItem{Id: user.Id, PhoneNumber: user.PhoneNumber, Username: user.Username})
+					}
 				}
 			}
 		}
@@ -98,3 +113,76 @@ func (u *UserHandler) Register(w http.ResponseWriter, r *http.Request) {
 
 	RespondWithJson(w, statusCode, &resp)
 }
+
+type UpdateNameRequest struct {
+	Firstname *string   `json:"first_name,omitempty"`
+	Lastname  *string   `json:"last_name,omitempty"`
+	UserId    uuid.UUID `json:"user_id"`
+}
+
+type UpdateNameResponse struct {
+	Message string       `json:"message"`
+	Data    []*user.User `json:"data"`
+}
+
+// UpdateName godoc
+// @Summary      Update name of user
+// @Description  Update the first or last name of a user (requires JWT)
+// @Tags         users
+// @Accept       json
+// @Produce      json
+// @Security     BearerAuth
+// @Param        request body      UpdateNameRequest true  "Data to update name of user"
+// @Success      200  {object}  UpdateNameResponse
+// @Failure      400  {object}  UpdateNameResponse
+// @Failure      403  {object}  UpdateNameResponse
+// @Failure      500  {object}  UpdateNameResponse
+// @Router       /user/name/update [patch]
+func (u *UserHandler) UpdateName(w http.ResponseWriter, r *http.Request) {
+	var req UpdateNameRequest
+	err := ExtractFromRequest(r, &req)
+	if err != nil {
+		http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	defer r.Body.Close()
+
+	var statusCode int
+	var resp UpdateNameResponse
+	updateFirstname := req.Firstname != nil && len(*req.Firstname) > 0
+	updateLastname := req.Lastname != nil && len(*req.Lastname) > 0
+
+	if req.UserId == uuid.Nil {
+		statusCode = http.StatusBadRequest
+		resp.Message = "User Id not provided"
+	} else if !updateFirstname && !updateLastname {
+		statusCode = http.StatusBadRequest
+		resp.Message = "No name provided"
+	} else {
+		ctx := r.Context()
+		if usr, err := u.UserStore.GetUserByID(ctx, req.UserId); err != nil {
+			log.Println("Error:", err)
+			statusCode = http.StatusInternalServerError
+			resp.Message = err.Error()
+		} else {
+			if usr == nil {
+				statusCode = http.StatusNotFound
+				resp.Message = "User not found"
+			} else {
+				// Add query to update names
+				if rowsAffected, err := u.UserStore.UpdateName(ctx, req.Firstname, req.Lastname, usr); err != nil {
+					statusCode = http.StatusInternalServerError
+					resp.Message = err.Error()
+				} else {
+					log.Println("Rows updated:", rowsAffected)
+					statusCode = http.StatusOK
+					resp.Message = "Successful"
+					resp.Data = append(resp.Data, usr)
+				}
+			}
+		}
+	}
+
+	RespondWithJson(w, statusCode, &resp)
+}

internal/handler/register_test.go

@@ -14,8 +14,9 @@ import (
 )
 
 func TestCreateUserWithMock(t *testing.T) {
+	cfg := GetConfig()
 	mockstore := mock.NewMockUserStore()
-	handler := NewUserHandler(mockstore)
+	handler := NewUserHandler(cfg, mockstore)
 
 	testUser := GetTestUser()
 	jsonValue, _ := json.Marshal(testUser)
@@ -33,3 +34,32 @@ func TestCreateUserWithMock(t *testing.T) {
 
 	assert.NotNil(t, response.Data[0].Id, "Id should not be nil")
 }
+
+func TestUpdateNameOfUser(t *testing.T) {
+	ctx := t.Context()
+	cfg := GetConfig()
+	userStore := mock.NewMockUserStore()
+
+	usr := GetTestUser()
+	if err := userStore.CreateUser(ctx, &usr); err != nil {
+		assert.NoError(t, err, "Error creating user")
+	}
+
+	testNameChange := UpdateNameRequest{}
+	testNameChange.Firstname = &[]string{"Bob"}[0]
+	testNameChange.Lastname = &[]string{"De-Buildor"}[0]
+	testNameChange.UserId = usr.Id
+	jsonValue, _ := json.Marshal(testNameChange)
+
+	req, _ := http.NewRequest("PATCH", endpoint.UpdateName, strings.NewReader(string(jsonValue)))
+	rr := httptest.NewRecorder()
+
+	handler := NewUserHandler(cfg, userStore)
+	handler.UpdateName(rr, req)
+
+	assert.Equal(t, http.StatusOK, rr.Code)
+
+	var response UpdateNameResponse
+	err := json.Unmarshal(rr.Body.Bytes(), &response)
+	assert.NoError(t, err)
+}

internal/handler/service.go

@@ -1,14 +1,27 @@
 package handler
 
 import (
+	"log"
 	"net/http"
+	"time"
 
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
+	"git.kundeng.us/phoenix/textsender-models/tx0/token"
+	"git.kundeng.us/phoenix/textsender-models/tx0/user"
 
+	"git.kundeng.us/phoenix/textsender-auth/internal/config"
 	"git.kundeng.us/phoenix/textsender-auth/internal/store"
 	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
 )
 
+type ServiceHandler struct {
+	Config       *config.Config
+	ServiceStore store.ServiceStore
+}
+
+func NewServiceHandler(cfg *config.Config, serviceStore store.ServiceStore) *ServiceHandler {
+	return &ServiceHandler{Config: cfg, ServiceStore: serviceStore}
+}
+
 type ServiceCreationRequest struct {
 	Username   string `json:"username"`
 	Passphrase string `json:"passphrase"`
@@ -19,14 +32,6 @@ type ServiceCreationResponse struct {
 	Data    []*user.ServiceUser `json:"data"`
 }
 
-type ServiceHandler struct {
-	ServiceStore store.ServiceStore
-}
-
-func NewServiceHandler(serviceStore store.ServiceStore) *ServiceHandler {
-	return &ServiceHandler{ServiceStore: serviceStore}
-}
-
 // Register godoc
 // @Summary      Register service user
 // @Description  Create a service user that can send texts (requires JWT)
@@ -37,6 +42,7 @@ func NewServiceHandler(serviceStore store.ServiceStore) *ServiceHandler {
 // @Param        request body      ServiceCreationRequest true  "Data to add user"
 // @Success      200  {object}  ServiceCreationResponse
 // @Failure      400  {object}  ServiceCreationResponse
+// @Failure      403  {object}  ServiceCreationResponse
 // @Failure      500  {object}  ServiceCreationResponse
 // @Router       /service/register [post]
 func (s *ServiceHandler) Register(w http.ResponseWriter, r *http.Request) {
@@ -50,6 +56,12 @@ func (s *ServiceHandler) Register(w http.ResponseWriter, r *http.Request) {
 
 	var statusCode int
 	var resp ServiceCreationResponse
+	if !s.Config.EnableRegistration {
+		statusCode = http.StatusForbidden
+		resp.Message = "Registration disabled"
+		RespondWithJson(w, statusCode, &resp)
+		return
+	}
 
 	ctx := r.Context()
 	if exists, err := s.ServiceStore.CheckWithUsername(ctx, req.Username); err != nil {
@@ -60,19 +72,110 @@ func (s *ServiceHandler) Register(w http.ResponseWriter, r *http.Request) {
 			statusCode = http.StatusBadRequest
 			resp.Message = "Service user already exists"
 		} else {
-			hashing := utility.HashMash{Password: req.Passphrase}
-			if hashedPassword, err := hashing.HashPassword(); err != nil {
+			hashing := utility.HashMash{}
+			if err := hashing.SetPassword(req.Passphrase); err != nil {
 				statusCode = http.StatusInternalServerError
 				resp.Message = err.Error()
 			} else {
-				serviceUser := user.ServiceUser{Username: req.Username, Passphrase: hashedPassword}
-				if err := s.ServiceStore.Create(ctx, &serviceUser); err != nil {
+				if hashedPassword, err := hashing.HashPassword(); err != nil {
 					statusCode = http.StatusInternalServerError
 					resp.Message = err.Error()
 				} else {
-					statusCode = http.StatusCreated
-					resp.Message = "Successful"
-					resp.Data = append(resp.Data, &serviceUser)
+					serviceUser := user.ServiceUser{Username: req.Username, Passphrase: hashedPassword}
+					if err := s.ServiceStore.Create(ctx, &serviceUser); err != nil {
+						statusCode = http.StatusInternalServerError
+						resp.Message = err.Error()
+					} else {
+						statusCode = http.StatusCreated
+						resp.Message = "Successful"
+						resp.Data = append(resp.Data, &serviceUser)
+					}
+				}
+			}
+		}
+	}
+
+	RespondWithJson(w, statusCode, &resp)
+}
+
+type ServiceLoginRequest struct {
+	Username   string `json:"username"`
+	Passphrase string `json:"passphrase"`
+}
+
+type ServiceLoginResponse struct {
+	Message string         `json:"message"`
+	Data    []*token.Login `json:"data"`
+}
+
+// Login godoc
+// @Summary      Service login
+// @Description  Servce login and be given an access token (requires JWT)
+// @Tags         service users
+// @Accept       json
+// @Produce      json
+// @Security     BearerAuth
+// @Param        request body      ServiceLoginRequest true  "Data to obtain a service token"
+// @Success      200  {object}  ServiceLoginResponse
+// @Failure      500  {object}  ServiceLoginResponse
+// @Router       /service/login [post]
+func (s *ServiceHandler) Login(w http.ResponseWriter, r *http.Request) {
+	var req ServiceLoginRequest
+	if err := ExtractFromRequest(r, &req); err != nil {
+		http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
+	}
+	defer r.Body.Close()
+
+	var statusCode int
+	var resp ServiceLoginResponse
+
+	if len(req.Username) == 0 || len(req.Passphrase) == 0 {
+		statusCode = http.StatusBadRequest
+		resp.Message = "Invalid request"
+		RespondWithJson(w, statusCode, &resp)
+		return
+	}
+
+	ctx := r.Context()
+
+	if serviceUser, err := s.ServiceStore.GetWithUsername(ctx, req.Username); err != nil {
+		statusCode = http.StatusInternalServerError
+		resp.Message = err.Error()
+	} else {
+		if serviceUser == nil {
+			statusCode = http.StatusNotFound
+			resp.Message = "Not found"
+		} else {
+			hashing := utility.HashMash{}
+			if err := hashing.SetPassword(req.Passphrase); err != nil {
+				statusCode = http.StatusInternalServerError
+				resp.Message = err.Error()
+			} else {
+				if !hashing.CheckPasswordHash(req.Passphrase, serviceUser.Passphrase) {
+					statusCode = http.StatusInternalServerError
+					resp.Message = "Not valid"
+				} else {
+					lastLogin := time.Now()
+					var tokGen utility.TokenGenerator
+					tokGen.SetHourOffset(8)
+					secretKey := config.GetSecretKey()
+					tokGen.SetSecretKey(secretKey)
+
+					if myToken, err := tokGen.GenerateToken(*serviceUser); err != nil {
+						statusCode = http.StatusInternalServerError
+						resp.Message = err.Error()
+					} else {
+						log.Println("Updating service user's last login")
+						if rowsAffected, err := s.ServiceStore.UpdateLastLogin(ctx, serviceUser.Id, lastLogin); err != nil {
+							statusCode = http.StatusInternalServerError
+							resp.Message = err.Error()
+						} else {
+							log.Println("Rows updated:", rowsAffected)
+							statusCode = http.StatusOK
+							resp.Data = append(resp.Data, myToken)
+							resp.Message = "Successful"
+						}
+					}
 				}
 			}
 		}

internal/handler/service_test.go

@@ -7,17 +7,20 @@ import (
 	"strings"
 	"testing"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/user"
 	"github.com/stretchr/testify/assert"
 
 	"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
 	"git.kundeng.us/phoenix/textsender-auth/internal/store/mock"
+	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
 )
 
 func TestCreateServiceUserWithMock(t *testing.T) {
+	cfg := GetConfig()
 	mockStore := mock.NewMockServiceUserStore()
-	handler := NewServiceHandler(mockStore)
+	handler := NewServiceHandler(cfg, mockStore)
 
-	testService := ServiceCreationRequest{Username: "swoon", Passphrase: "ewrewr329n12y3x2!2"}
+	testService := ServiceCreationRequest{Username: "swoon", Passphrase: "Ewrewr329n12y3x2!2"}
 	jsonValue, err := json.Marshal(testService)
 	assert.NoError(t, err, "Error marshaling request")
 
@@ -31,3 +34,43 @@ func TestCreateServiceUserWithMock(t *testing.T) {
 	err = json.Unmarshal(rr.Body.Bytes(), &response)
 	assert.NoError(t, err)
 }
+
+func TestLoginServiceUserWithMock(t *testing.T) {
+	var serviceUser user.ServiceUser
+	var hashedPassword string
+	var err error
+	unhashed := "A9328nr29nudx3292m320!"
+	hashing := utility.HashMash{}
+	if err := hashing.SetPassword(unhashed); err != nil {
+		assert.NoError(t, err, "Error setting password")
+	}
+
+	if hashedPassword, err = hashing.HashPassword(); err != nil {
+		assert.NoError(t, err, "Error hashing password: %v", err)
+	} else {
+		serviceUser.Passphrase = hashedPassword
+	}
+	serviceUser.Username = "swoon"
+	ctx := t.Context()
+	mockStore := mock.NewMockServiceUserStore()
+
+	if err := mockStore.Create(ctx, &serviceUser); err != nil {
+		assert.NoError(t, err, "Error creating service user: %v", err)
+	}
+
+	cfg := GetConfig()
+	handler := NewServiceHandler(cfg, mockStore)
+	testService := ServiceLoginRequest{Username: serviceUser.Username, Passphrase: unhashed}
+	jsonValue, err := json.Marshal(testService)
+	assert.NoError(t, err, "Error marshaling request")
+
+	req, _ := http.NewRequest("POST", endpoint.LoginServiceUser, strings.NewReader(string(jsonValue)))
+	rr := httptest.NewRecorder()
+
+	handler.Login(rr, req)
+	assert.Equal(t, http.StatusOK, rr.Code)
+
+	var response ServiceLoginResponse
+	err = json.Unmarshal(rr.Body.Bytes(), &response)
+	assert.NoError(t, err)
+}

internal/handler/utility_test.go

@@ -1,9 +1,63 @@
 package handler
 
 import (
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
+	"context"
+	"fmt"
+	"log"
+	"os"
+	"path"
+
+	"git.kundeng.us/phoenix/textsender-models/tx0/user"
+	"github.com/joho/godotenv"
+
+	"git.kundeng.us/phoenix/textsender-auth/internal/config"
+	"git.kundeng.us/phoenix/textsender-auth/internal/store/mock"
+	"git.kundeng.us/phoenix/textsender-auth/internal/utility"
 )
 
 func GetTestUser() user.User {
-	return user.User{Username: "ghost", PhoneNumber: "+1234567890", Password: "dfgdffddfd"}
+	return user.User{Username: "ghost", PhoneNumber: "+1234567890", Password: "Dfgdffd343dfd!"}
+}
+
+func GetConfig() *config.Config {
+	err := godotenv.Load()
+	if err != nil {
+		cwd, _ := os.Getwd()
+		envPath := path.Join(cwd, "../..", ".env")
+		if err = godotenv.Load(envPath); err != nil {
+			prevPath := path.Join(envPath, "../..", ".env")
+			if err = godotenv.Load(prevPath); err != nil {
+				log.Fatal("Error loading .env file")
+			}
+		}
+	}
+
+	unpackedConnString := config.UnpackDBConnString()
+	dbConnString := unpackedConnString.Parse()
+
+	return &config.Config{
+		DBConnString:       dbConnString,
+		ServerPort:         config.Port,
+		ResetDB:            false,
+		EnableRegistration: config.CheckRegistration(),
+	}
+}
+
+func createUser(ctx context.Context, userStore *mock.MockUserStore) (*user.User, *string, error) {
+	testUser := GetTestUser()
+	unhashedPassword := testUser.Password
+	hashing := utility.HashMash{}
+	if err := hashing.SetPassword(testUser.Password); err != nil {
+		return nil, nil, fmt.Errorf("Error setting password: %v", err)
+	}
+
+	hashedPassword, err := hashing.HashPassword()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	testUser.Password = hashedPassword
+	userStore.CreateUser(ctx, &testUser)
+
+	return &testUser, &unhashedPassword, nil
 }

internal/middleware/auth.go

@@ -0,0 +1,47 @@
+package middleware
+
+import (
+	"context"
+	"net/http"
+	"strings"
+
+	"git.kundeng.us/phoenix/textsender-auth/internal/services"
+)
+
+type contextKey string
+
+const (
+	UserContextKey contextKey = "user"
+)
+
+func AuthMiddleware(authService *services.JWTService) func(http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			authHeader := r.Header.Get("Authorization")
+			if authHeader == "" {
+				http.Error(w, "Authorization header required", http.StatusUnauthorized)
+				return
+			}
+
+			// Extract token from "Bearer <token>"
+			parts := strings.Split(authHeader, " ")
+			if len(parts) != 2 || parts[0] != "Bearer" {
+				http.Error(w, "Invalid authorization header format", http.StatusUnauthorized)
+				return
+			}
+
+			token := parts[1]
+
+			// Validate token with auth service
+			user, err := authService.ValidateToken(token)
+			if err != nil {
+				http.Error(w, "Invalid token", http.StatusUnauthorized)
+				return
+			}
+
+			// Add user to context
+			ctx := context.WithValue(r.Context(), UserContextKey, user)
+			next.ServeHTTP(w, r.WithContext(ctx))
+		})
+	}
+}

internal/model/user.go

@@ -1,116 +0,0 @@
-package model
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgxpool"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
-)
-
-
-type UserStore interface {
-	CreateUser(ctx context.Context, user *user.User) error
-	GetUserByID(ctx context.Context, id uuid.UUID) (*user.User, error)
-	GetUserByUsername(ctx context.Context, username string) (*user.User, error)
-	GetAllUsers(ctx context.Context) ([]*user.User, error)
-	UserExists(ctx context.Context, username string) (bool, error)
-}
-
-type PGUserStore struct {
-	db *pgxpool.Pool
-}
-
-func NewUserStore(db *pgxpool.Pool) *PGUserStore {
-	return &PGUserStore{db: db}
-}
-
-func (s *PGUserStore) CreateUser(ctx context.Context, user *user.User) error {
-	query := `
-		INSERT INTO users (phone_number, username, password)
-		VALUES ($1, $2, $3)
-		RETURNING id, phone_number, username
-	`
-
-	return s.db.QueryRow(ctx, query, user.PhoneNumber, user.Username, user.Password).Scan(
-		&user.Id, &user.PhoneNumber, &user.Username,
-	)
-}
-
-func (s *PGUserStore) GetUserByID(ctx context.Context, id uuid.UUID) (*user.User, error) {
-	query := `SELECT id, username, password, phone_number FROM users WHERE id = $1`
-
-	var user user.User
-	err := s.db.QueryRow(ctx, query, id).Scan(
-		&user.Id, &user.Username, &user.Password, &user.PhoneNumber,
-	)
-
-	if err == pgx.ErrNoRows {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, fmt.Errorf("getting user by ID: %w", err)
-	}
-
-	return &user, nil
-}
-
-func (s *PGUserStore) GetUserByUsername(ctx context.Context, username string) (*user.User, error) {
-	query := `SELECT id, username, password, phone_number FROM users WHERE username = $1`
-
-	var user user.User
-	err := s.db.QueryRow(ctx, query, username).Scan(
-		&user.Id, &user.Username, &user.Password, &user.PhoneNumber,
-	)
-
-	if err == pgx.ErrNoRows {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, fmt.Errorf("getting user by ID: %w", err)
-	}
-
-	return &user, nil
-}
-
-func (s *PGUserStore) GetAllUsers(ctx context.Context) ([]*user.User, error) {
-	query := `SELECT id, username, password, phone_number FROM users`
-
-	rows, err := s.db.Query(ctx, query)
-	if err != nil {
-		return nil, fmt.Errorf("querying all users: %w", err)
-	}
-	defer rows.Close()
-
-	var users []*user.User
-	for rows.Next() {
-		var user user.User
-		if err := rows.Scan(
-			&user.Id, &user.Username, &user.Password, &user.PhoneNumber,
-		); err != nil {
-			return nil, fmt.Errorf("scanning user row: %w", err)
-		}
-		users = append(users, &user)
-	}
-
-	if err := rows.Err(); err != nil {
-		return nil, fmt.Errorf("iterating user rows: %w", err)
-	}
-
-	return users, nil
-}
-
-func (s *PGUserStore) UserExists(ctx context.Context, username string) (bool, error) {
-	query := `SELECT EXISTS(SELECT 1 FROM users WHERE username = $1)`
-
-	var exists bool
-	err := s.db.QueryRow(ctx, query, username).Scan(&exists)
-	if err != nil {
-		return false, fmt.Errorf("checking if user exists: %w", err)
-	}
-
-	return exists, nil
-}

internal/services/jwt_service.go

@@ -0,0 +1,49 @@
+package services
+
+import (
+	"time"
+
+	txtmodels_token "git.kundeng.us/phoenix/textsender-models/tx0/token"
+	txtmodels_user "git.kundeng.us/phoenix/textsender-models/tx0/user"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+type JWTService struct {
+	secretKey []byte
+}
+
+func NewJWTService(secretKey string) *JWTService {
+	return &JWTService{
+		secretKey: []byte(secretKey),
+	}
+}
+
+func (s *JWTService) ValidateToken(tokenString string) (*txtmodels_user.User, error) {
+	// TODO: Include more user information in the claims to populate user
+	claims := &txtmodels_token.Claims{}
+
+	token, err := jwt.ParseWithClaims(tokenString, claims, func(token *jwt.Token) (interface{}, error) {
+		// Validate the signing method
+		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
+			return nil, jwt.ErrSignatureInvalid
+		}
+		return s.secretKey, nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	if !token.Valid {
+		return nil, jwt.ErrSignatureInvalid
+	}
+
+	// Check token expiration
+	if time.Now().After(claims.ExpiresAt.Time) {
+		return nil, jwt.ErrTokenExpired
+	}
+
+	return &txtmodels_user.User{
+		Id: claims.UserId,
+	}, nil
+}

internal/store/mock/service_store.go

@@ -3,11 +3,12 @@ package mock
 import (
 	"context"
 	"errors"
+	"fmt"
 	"sync"
+	"time"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/user"
 	"github.com/google/uuid"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
 )
 
 type MockServiceUserStore struct {
@@ -53,10 +54,6 @@ func (m *MockServiceUserStore) CheckWithUsername(ctx context.Context, username s
 		return false, m.Error
 	}
 
-	if m.Error != nil {
-		return false, m.Error
-	}
-
 	var exists bool
 
 	for _, serviceUser := range m.ServiceUsers {
@@ -72,3 +69,57 @@ func (m *MockServiceUserStore) CheckWithUsername(ctx context.Context, username s
 		return exists, nil
 	}
 }
+
+func (m *MockServiceUserStore) GetWithUsername(ctx context.Context, username string) (*user.ServiceUser, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	if m.Error != nil {
+		return nil, m.Error
+	}
+
+	serviceUser := m.ServiceUsersByUsername[username]
+	if serviceUser != nil {
+		return serviceUser, nil
+	} else {
+		return nil, fmt.Errorf("User not found")
+	}
+}
+
+func (m *MockServiceUserStore) GetWithId(ctx context.Context, id uuid.UUID) (*user.ServiceUser, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	if m.Error != nil {
+		return nil, m.Error
+	}
+
+	for _, serviceUser := range m.ServiceUsers {
+		if serviceUser.Id == id {
+			return serviceUser, nil
+		}
+	}
+
+	return nil, nil
+}
+
+func (m *MockServiceUserStore) UpdateLastLogin(ctx context.Context, id uuid.UUID, lastLogin time.Time) (int64, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	if m.Error != nil {
+		return 0, m.Error
+	}
+
+	serviceUser, exists := m.ServiceUsers[id]
+	if !exists {
+		return 0, errors.New("Service user not found")
+	}
+
+	serviceUser.LastLogin = &lastLogin
+
+	m.ServiceUsers[id] = serviceUser
+	m.ServiceUsersByUsername[serviceUser.Username] = serviceUser
+
+	return 1, nil
+}

internal/store/mock/user_store.go

@@ -3,11 +3,13 @@ package mock
 import (
 	"context"
 	"errors"
+	"fmt"
 	"sync"
+	"time"
 
 	"github.com/google/uuid"
 
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
+	"git.kundeng.us/phoenix/textsender-models/tx0/user"
 )
 
 type MockUserStore struct {
@@ -37,9 +39,11 @@ func (m *MockUserStore) CreateUser(ctx context.Context, user *user.User) error {
 	}
 
 	if _, exists := m.UsersByUsername[user.Username]; exists {
-		return errors.New("User with email already exists")
+		return errors.New("User with username already exists")
 	}
 
+	user.Created = time.Now()
+
 	m.Users[user.Id] = user
 	m.UsersByUsername[user.Username] = user
 	return nil
@@ -112,3 +116,77 @@ func (m *MockUserStore) UserExists(ctx context.Context, username string) (bool,
 		return exists, nil
 	}
 }
+
+func (m *MockUserStore) UpdatePassword(ctx context.Context, id uuid.UUID, password string) (int64, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	if m.Error != nil {
+		return 0, m.Error
+	}
+
+	user, exists := m.Users[id]
+	if !exists {
+		return 0, errors.New("User not found")
+	}
+
+	user.Password = password
+
+	m.Users[id] = user
+	m.UsersByUsername[user.Username] = user
+
+	return 1, nil
+}
+
+func (m *MockUserStore) UpdateLastLogin(ctx context.Context, id uuid.UUID, lastLogin time.Time) (int64, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	if m.Error != nil {
+		return 0, m.Error
+	}
+
+	user, exists := m.Users[id]
+	if !exists {
+		return 0, errors.New("User not found")
+	}
+
+	user.LastLogin = &lastLogin
+
+	m.Users[id] = user
+	m.UsersByUsername[user.Username] = user
+
+	return 1, nil
+}
+
+func (m *MockUserStore) UpdateName(ctx context.Context, firstname *string, lastname *string, usr *user.User) (int64, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	if m.Error != nil {
+		return 0, m.Error
+	}
+
+	if firstname == nil && lastname == nil {
+		return 0, fmt.Errorf("Names not provided")
+	}
+
+	user, exists := m.Users[usr.Id]
+	if !exists {
+		return 0, errors.New("User not found")
+	}
+
+	if firstname != nil && lastname != nil {
+		user.Firstname = firstname
+		user.Lastname = lastname
+	} else if firstname != nil {
+		user.Firstname = firstname
+	} else {
+		user.Lastname = lastname
+	}
+
+	m.Users[usr.Id] = user
+	m.UsersByUsername[user.Username] = user
+
+	return 1, nil
+}

internal/store/service.go

@@ -3,15 +3,21 @@ package store
 import (
 	"context"
 	"fmt"
+	"time"
 
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
+	"git.kundeng.us/phoenix/textsender-models/tx0/user"
+	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
+// TODO: Rename this to ServiceUserStore
 type ServiceStore interface {
 	CheckWithUsername(ctx context.Context, username string) (bool, error)
+	GetWithUsername(ctx context.Context, username string) (*user.ServiceUser, error)
+	GetWithId(ctx context.Context, id uuid.UUID) (*user.ServiceUser, error)
 	Create(ctx context.Context, serviceUser *user.ServiceUser) error
+	UpdateLastLogin(ctx context.Context, id uuid.UUID, lastLogin time.Time) (int64, error)
 }
 
 type PGServiceStore struct {
@@ -37,6 +43,36 @@ func (s *PGServiceStore) CheckWithUsername(ctx context.Context, username string)
 	}
 }
 
+func (s *PGServiceStore) GetWithUsername(ctx context.Context, username string) (*user.ServiceUser, error) {
+	var serviceUser user.ServiceUser
+	query := `SELECT id, username, passphrase, created FROM service_users WHERE username = $1`
+
+	if err := s.db.QueryRow(ctx, query, username).Scan(&serviceUser.Id, &serviceUser.Username, &serviceUser.Passphrase, &serviceUser.Created); err != nil {
+		if err == pgx.ErrNoRows {
+			return nil, nil
+		} else {
+			return nil, fmt.Errorf("Error querying row: %v", err)
+		}
+	} else {
+		return &serviceUser, nil
+	}
+}
+
+func (s *PGServiceStore) GetWithId(ctx context.Context, id uuid.UUID) (*user.ServiceUser, error) {
+	var serviceUser user.ServiceUser
+	query := `SELECT id, username, passphrase, created FROM service_users WHERE id = $1`
+
+	if err := s.db.QueryRow(ctx, query, id).Scan(&serviceUser.Id, &serviceUser.Username, &serviceUser.Passphrase, &serviceUser.Created); err != nil {
+		if err == pgx.ErrNoRows {
+			return nil, nil
+		} else {
+			return nil, fmt.Errorf("Error querying row: %v", err)
+		}
+	} else {
+		return &serviceUser, nil
+	}
+}
+
 func (s *PGServiceStore) Create(ctx context.Context, serviceUser *user.ServiceUser) error {
 	query := `
 		INSERT INTO service_users (username, passphrase)
@@ -48,3 +84,12 @@ func (s *PGServiceStore) Create(ctx context.Context, serviceUser *user.ServiceUs
 		&serviceUser.Id, &serviceUser.Created,
 	)
 }
+
+func (s *PGServiceStore) UpdateLastLogin(ctx context.Context, id uuid.UUID, lastLogin time.Time) (int64, error) {
+	query := `UPDATE service_users SET last_login = $1 WHERE id = $2`
+	if affected, err := s.db.Exec(ctx, query, lastLogin, id); err != nil {
+		return 0, err
+	} else {
+		return affected.RowsAffected(), nil
+	}
+}

internal/store/user.go

@@ -0,0 +1,173 @@
+package store
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgxpool"
+
+	"git.kundeng.us/phoenix/textsender-models/tx0/user"
+)
+
+type UserStore interface {
+	CreateUser(ctx context.Context, user *user.User) error
+	GetUserByID(ctx context.Context, id uuid.UUID) (*user.User, error)
+	GetUserByUsername(ctx context.Context, username string) (*user.User, error)
+	GetAllUsers(ctx context.Context) ([]*user.User, error)
+	UserExists(ctx context.Context, username string) (bool, error)
+	UpdatePassword(ctx context.Context, id uuid.UUID, password string) (int64, error)
+	UpdateLastLogin(ctx context.Context, id uuid.UUID, lastLogin time.Time) (int64, error)
+	UpdateName(ctx context.Context, firstname *string, lastname *string, usr *user.User) (int64, error)
+}
+
+type PGUserStore struct {
+	db *pgxpool.Pool
+}
+
+func NewUserStore(db *pgxpool.Pool) *PGUserStore {
+	return &PGUserStore{db: db}
+}
+
+func (s *PGUserStore) CreateUser(ctx context.Context, user *user.User) error {
+	query := `
+		INSERT INTO users (phone_number, username, password)
+		VALUES ($1, $2, $3)
+		RETURNING id, phone_number, username, created
+	`
+
+	return s.db.QueryRow(ctx, query, user.PhoneNumber, user.Username, user.Password).Scan(
+		&user.Id, &user.PhoneNumber, &user.Username, &user.Created,
+	)
+}
+
+func (s *PGUserStore) GetUserByID(ctx context.Context, id uuid.UUID) (*user.User, error) {
+	query := `SELECT id, username, password, phone_number, created FROM users WHERE id = $1`
+
+	var user user.User
+	err := s.db.QueryRow(ctx, query, id).Scan(
+		&user.Id, &user.Username, &user.Password, &user.PhoneNumber, &user.Created,
+	)
+
+	if err == pgx.ErrNoRows {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, fmt.Errorf("getting user by ID: %w", err)
+	}
+
+	return &user, nil
+}
+
+func (s *PGUserStore) GetUserByUsername(ctx context.Context, username string) (*user.User, error) {
+	query := `SELECT id, username, password, phone_number, created FROM users WHERE username = $1`
+
+	var user user.User
+	err := s.db.QueryRow(ctx, query, username).Scan(
+		&user.Id, &user.Username, &user.Password, &user.PhoneNumber, &user.Created,
+	)
+
+	if err == pgx.ErrNoRows {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, fmt.Errorf("getting user by ID: %w", err)
+	}
+
+	return &user, nil
+}
+
+func (s *PGUserStore) GetAllUsers(ctx context.Context) ([]*user.User, error) {
+	query := `SELECT id, username, password, phone_number, created FROM users`
+
+	rows, err := s.db.Query(ctx, query)
+	if err != nil {
+		return nil, fmt.Errorf("querying all users: %w", err)
+	}
+	defer rows.Close()
+
+	var users []*user.User
+	for rows.Next() {
+		var user user.User
+		if err := rows.Scan(
+			&user.Id, &user.Username, &user.Password, &user.PhoneNumber, &user.Created,
+		); err != nil {
+			return nil, fmt.Errorf("scanning user row: %w", err)
+		}
+		users = append(users, &user)
+	}
+
+	if err := rows.Err(); err != nil {
+		return nil, fmt.Errorf("iterating user rows: %w", err)
+	}
+
+	return users, nil
+}
+
+func (s *PGUserStore) UserExists(ctx context.Context, username string) (bool, error) {
+	query := `SELECT EXISTS(SELECT 1 FROM users WHERE username = $1)`
+
+	var exists bool
+	err := s.db.QueryRow(ctx, query, username).Scan(&exists)
+	if err != nil {
+		return false, fmt.Errorf("checking if user exists: %w", err)
+	}
+
+	return exists, nil
+}
+
+func (s *PGUserStore) UpdatePassword(ctx context.Context, id uuid.UUID, password string) (int64, error) {
+	query := `UPDATE users SET password = $1 WHERE id = $2`
+	if affected, err := s.db.Exec(ctx, query, password, id); err != nil {
+		return 0, err
+	} else {
+		return affected.RowsAffected(), nil
+	}
+}
+
+func (s *PGUserStore) UpdateLastLogin(ctx context.Context, id uuid.UUID, lastLogin time.Time) (int64, error) {
+	query := `UPDATE users SET last_login = $1 WHERE id = $2`
+	if affected, err := s.db.Exec(ctx, query, lastLogin, id); err != nil {
+		return 0, err
+	} else {
+		return affected.RowsAffected(), nil
+	}
+}
+
+func (s *PGUserStore) UpdateName(ctx context.Context, firstname *string, lastname *string, usr *user.User) (int64, error) {
+	var query string
+
+	if firstname == nil && lastname == nil {
+		return 0, fmt.Errorf("Provided names are empty")
+	} else {
+		tableName := "users"
+		if firstname != nil && lastname != nil {
+			query = fmt.Sprintf("UPDATE %s SET first_name = $1, last_name = $2 WHERE id = $3", tableName)
+			if affected, err := s.db.Exec(ctx, query, firstname, lastname, usr.Id); err != nil {
+				return 0, err
+			} else {
+				usr.Firstname = firstname
+				usr.Lastname = lastname
+				return affected.RowsAffected(), nil
+			}
+		} else if firstname != nil {
+			query = fmt.Sprintf("UPDATE %s SET first_name = $1 WHERE id = $2", tableName)
+			if affected, err := s.db.Exec(ctx, query, firstname, usr.Id); err != nil {
+				return 0, err
+			} else {
+				usr.Firstname = firstname
+				return affected.RowsAffected(), nil
+			}
+		} else {
+			query = fmt.Sprintf("UPDATE %s SET last_name = $1 WHERE id = $2", tableName)
+			if affected, err := s.db.Exec(ctx, query, lastname, usr.Id); err != nil {
+				return 0, err
+			} else {
+				usr.Lastname = lastname
+				return affected.RowsAffected(), nil
+			}
+		}
+	}
+}

internal/utility/hashing.go

@@ -1,23 +1,62 @@
 package utility
 
 import (
+	"fmt"
+	"strings"
+	"unicode"
+
 	"golang.org/x/crypto/bcrypt"
 )
 
 type HashMash struct {
-	Password string
+	password string
 }
 
-func (h HashMash) HashPassword() (string, error) {
-	bytes, err := bcrypt.GenerateFromPassword([]byte(h.Password), bcrypt.DefaultCost)
+func (h *HashMash) HashPassword() (string, error) {
+	bytes, err := bcrypt.GenerateFromPassword([]byte(h.password), bcrypt.DefaultCost)
 	return string(bytes), err
 }
 
-func (h HashMash) CheckPasswordHash(password string, hash string) bool {
+func (h *HashMash) CheckPasswordHash(password string, hash string) bool {
 	err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
 	return err == nil
 }
 
-func (h *HashMash) SetPassword(password string) {
-	h.Password = password
+func (h *HashMash) SetPassword(password string) error {
+	if len(password) < 8 {
+		return fmt.Errorf("Password length is not enought")
+	} else if len(password) > 32 {
+		return fmt.Errorf("Password length is too long")
+	} else {
+		specialCharacters := "!@#$%^&*?"
+		numbers := "0123456789"
+		if strings.ContainsAny(password, specialCharacters) && strings.ContainsAny(password, numbers) {
+			var hasAtleastOneUpper, hasAtleastOneLower bool
+
+			for _, c := range password {
+				if unicode.IsUpper(c) {
+					hasAtleastOneUpper = true
+				} else if unicode.IsLower(c) {
+					hasAtleastOneLower = true
+				}
+
+				if hasAtleastOneLower && hasAtleastOneUpper {
+					break
+				}
+			}
+
+			if hasAtleastOneUpper && hasAtleastOneLower {
+				h.password = password
+				return nil
+			} else {
+				if !hasAtleastOneUpper {
+					return fmt.Errorf("Password requires at least one upper case letter")
+				} else {
+					return fmt.Errorf("Password requires at least one lower case letter")
+				}
+			}
+		} else {
+			return fmt.Errorf("Password should contain special characters and numbers")
+		}
+	}
 }

internal/utility/token.go

@@ -1,47 +1,139 @@
 package utility
 
 import (
+	"fmt"
 	"time"
 
+	"git.kundeng.us/phoenix/textsender-models/tx0/token"
+	"git.kundeng.us/phoenix/textsender-models/tx0/user"
 	"github.com/golang-jwt/jwt/v5"
+	"github.com/google/uuid"
 
 	"git.kundeng.us/phoenix/textsender-auth/internal/config"
-	"git.kundeng.us/phoenix/textsender-models/pkg/token"
-	"git.kundeng.us/phoenix/textsender-models/pkg/user"
 )
 
 const ROLE_TYPE = "regular"
 const TOKEN_TYPE = "Bearer"
 
 type TokenGenerator struct {
-	SecretKey []byte
+	SecretKey  []byte
+	hourOffset time.Duration
 }
 
 func (t *TokenGenerator) SetSecretKey(secretKey string) {
 	t.SecretKey = []byte(secretKey)
 }
 
-func (t *TokenGenerator) GenerateToken(user user.User) (*token.Login, error) {
-	issuedAt := time.Now()
-	expirationTime := time.Now().Add(4 * time.Hour)
-	claims := t.generateClaims(user, TOKEN_TYPE, issuedAt, expirationTime)
-
-	myToken := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
-	if tokenString, err := myToken.SignedString(t.SecretKey); err != nil {
-		return nil, err
+func (t *TokenGenerator) SetHourOffset(offset time.Duration) error {
+	if offset < 48 {
+		t.hourOffset = offset
+		return nil
 	} else {
-		return &token.Login{AccessToken: tokenString, TokenType: TOKEN_TYPE, ExpiresIn: expirationTime.Unix()}, nil
+		return fmt.Errorf("No change")
 	}
 }
 
-func (t *TokenGenerator) generateClaims(user user.User, role string, issuedAt time.Time, expiredAt time.Time) token.Claims {
-	return token.Claims{
-		UserId: user.Id,
+func (t *TokenGenerator) GenerateToken(usr any) (*token.Login, error) {
+	issuedAt := time.Now()
+	if t.hourOffset == 0 {
+		t.hourOffset = 4
+	}
+
+	expirationTime := time.Now().Add(t.hourOffset * time.Hour)
+
+	if claims, err := t.generateClaims(usr, TOKEN_TYPE, issuedAt, expirationTime); err != nil {
+		return nil, fmt.Errorf("Error generating claims: %v", err)
+	} else {
+		myToken := jwt.NewWithClaims(jwt.SigningMethodHS256, *claims)
+		if tokenString, err := myToken.SignedString(t.SecretKey); err != nil {
+			return nil, err
+		} else {
+			return &token.Login{UserId: claims.UserId, AccessToken: tokenString, TokenType: TOKEN_TYPE, ExpiresIn: expirationTime.Unix()}, nil
+		}
+	}
+}
+
+func (t *TokenGenerator) VerifyToken(accessToken string) (bool, error) {
+	clms := &token.Claims{}
+
+	if tken, err := t.parseTokenWithClaims(accessToken, clms); err != nil {
+		return false, nil
+	} else {
+		if tken.Valid {
+			if clms != nil {
+				if clms.UserId != uuid.Nil {
+					return true, nil
+				} else {
+					return false, fmt.Errorf("User Id was not set")
+				}
+			} else {
+				return false, fmt.Errorf("Claims not parsed")
+			}
+		} else {
+			return false, fmt.Errorf("Invalid access token")
+		}
+	}
+}
+
+func (t *TokenGenerator) ExtractIdFromToken(accessToken string) (uuid.UUID, error) {
+	clms := &token.Claims{}
+
+	if tken, err := t.parseTokenWithClaims(accessToken, clms); err != nil {
+		return uuid.Nil, nil
+	} else {
+		if tken.Valid {
+			if clms != nil {
+				if clms.UserId != uuid.Nil {
+					return clms.UserId, nil
+				} else {
+					return uuid.Nil, fmt.Errorf("User Id was not set")
+				}
+			} else {
+				return uuid.Nil, fmt.Errorf("Claims not parsed")
+			}
+		} else {
+			return uuid.Nil, fmt.Errorf("Invalid access token")
+		}
+	}
+}
+
+func (t *TokenGenerator) parseTokenWithClaims(accessToken string, claims *token.Claims) (*jwt.Token, error) {
+	tken, err := jwt.ParseWithClaims(accessToken, claims, func(tken *jwt.Token) (any, error) {
+		if _, ok := tken.Method.(*jwt.SigningMethodHMAC); !ok {
+			return nil, fmt.Errorf("unexpected signing method: %v", tken.Header["alg"])
+		}
+		return t.SecretKey, nil
+	}, jwt.WithValidMethods([]string{jwt.SigningMethodHS256.Alg()}))
+
+	if err != nil {
+		return nil, err
+	} else {
+		return tken, nil
+	}
+}
+
+func (t *TokenGenerator) generateClaims(usr any, role string, issuedAt time.Time, expiredAt time.Time) (*token.Claims, error) {
+	var id uuid.UUID
+	switch val := usr.(type) {
+	case user.User:
+		id = val.Id
+	case *user.User:
+		id = val.Id
+	case user.ServiceUser:
+		id = val.Id
+	case *user.ServiceUser:
+		id = val.Id
+	default:
+		return nil, fmt.Errorf("Invalid type")
+	}
+
+	return &token.Claims{
+		UserId: id,
 		Role:   role,
 		RegisteredClaims: jwt.RegisteredClaims{
 			Issuer:    config.App_Name,
 			ExpiresAt: jwt.NewNumericDate(expiredAt),
 			IssuedAt:  jwt.NewNumericDate(issuedAt),
 		},
-	}
+	}, nil
 }

migrations/schema.sql

@@ -5,14 +5,19 @@ DROP TABLE IF EXISTS service_users CASCADE;
 
 CREATE TABLE users (
     id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+    first_name TEXT NULL,
+    last_name TEXT NULL,
     phone_number TEXT NOT NULL,
     username TEXT NOT NULL,
-    password TEXT NOT NULL
+    password TEXT NOT NULL,
+    created timestamptz DEFAULT now(),
+    last_login timestamptz NULL
 );
 
 CREATE TABLE service_users (
     id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
     username TEXT NOT NULL,
     passphrase TEXT NOT NULL,
-    created timestamptz DEFAULT now()
+    created timestamptz DEFAULT now(),
+    last_login timestamptz NULL
 );