Expanded token generation

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

.gitignore

@@ -1,3 +1,6 @@
 /textsender-auth
+
 .env
+.env.local
+
 /vendor

Makefile

@@ -0,0 +1,21 @@
+VERSION ?= $(shell git describe --tags 2>/dev/null || echo "dev")
+COMMIT ?= $(shell git rev-parse --short HEAD)
+BUILD_TIME ?= $(shell date -u +%Y-%m-%dT%H:%M:%SZ)
+GO_VERSION ?= $(shell go version | awk '{print $$3}')
+
+.PHONY: build
+build:
+	go build -ldflags="\
+		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.Version=$(VERSION)' \
+		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.BuildTime=$(BUILD_TIME)' \
+		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.Commit=$(COMMIT)' \
+		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.GoVersion=$(GO_VERSION)'" \
+		-o textsender-auth cmd/api/main.go
+
+.PHONY: install
+install:
+	go install -ldflags="\
+		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.Version=$(VERSION)' \
+		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.BuildTime=$(BUILD_TIME)' \
+		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.Commit=$(COMMIT)' \
+		-X 'git.kundeng.us/phoenix/textsender-auth/internal/version.GoVersion=$(GO_VERSION)'"

README.md

@@ -1,2 +1,20 @@
 # textsender-auth
-A service that handles the authorization aspect of the textsender project.
+A service that handles the authorization aspect of the textsender project.
+
+
+## Getting started
+Assumes that the postgresql database has already been created with privileges to
+create and drop databases. Copy the `.env.sample` file to `.env`. Within the `.env`
+file, update the database keys. The `SECRET_KEY` is used for token generation.
+
+
+### Building api
+```
+make build
+```
+
+
+### Resetting the database
+```
+./textsender-auth -reset-db
+```

cmd/api/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"flag"
 	"fmt"
 	"log"
 	"net/http"
@@ -19,10 +20,17 @@ import (
 	"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/version"
 )
 
 func main() {
-	fmt.Println("textsender-auth")
+	versionFlag := flag.Bool("version", false, "Print version information")
+	flag.Parse()
+	if *versionFlag {
+		fmt.Println(version.String())
+		return
+	}
+	fmt.Println(config.App_Name)
 
 	cfg := config.Load()
 

go.mod

@@ -1,6 +1,6 @@
 module git.kundeng.us/phoenix/textsender-auth
 
-go 1.25.1
+go 1.25.3
 
 require (
 	github.com/go-chi/chi/v5 v5.2.3

internal/config/config.go

@@ -27,6 +27,8 @@ type ConnectionInfo struct {
 
 const Port = "9080"
 
+const App_Name = "textsender_auth"
+
 func (ci ConnectionInfo) Parse() string {
 	return fmt.Sprintf("postgres://%s:%s@%s:%d/%s?sslmode=%s", ci.Username, ci.Password, ci.Host, ci.Port, ci.Database, ci.SslMode)
 }

internal/model/token.go

@@ -12,4 +12,6 @@ type Claims struct {
 
 type Login struct {
 	AccessToken string `json:"access_token"`
+	TokenType   string `json:"token_type"`
+	ExpiresIn   int64  `json:"expires_in"`
 }

internal/utility/token.go

@@ -5,9 +5,13 @@ import (
 
 	"github.com/golang-jwt/jwt/v5"
 
+	"git.kundeng.us/phoenix/textsender-auth/internal/config"
 	"git.kundeng.us/phoenix/textsender-auth/internal/model"
 )
 
+const ROLE_TYPE = "regular"
+const TOKEN_TYPE = "Bearer"
+
 type TokenGenerator struct {
 	SecretKey []byte
 }
@@ -17,24 +21,26 @@ func (t *TokenGenerator) SetSecretKey(secretKey string) {
 }
 
 func (t *TokenGenerator) GenerateToken(user model.User) (*model.Login, error) {
-	claims := t.generateClaims(user, "regular")
+	issuedAt := time.Now()
+	expirationTime := time.Now().Add(4 * time.Hour)
+	claims := t.generateClaims(user, TOKEN_TYPE, issuedAt, expirationTime)
 
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
 	if tokenString, err := token.SignedString(t.SecretKey); err != nil {
 		return nil, err
 	} else {
-		return &model.Login{AccessToken: tokenString}, nil
+		return &model.Login{AccessToken: tokenString, TokenType: TOKEN_TYPE, ExpiresIn: expirationTime.Unix()}, nil
 	}
 }
 
-func (t *TokenGenerator) generateClaims(user model.User, role string) model.Claims {
+func (t *TokenGenerator) generateClaims(user model.User, role string, issuedAt time.Time, expiredAt time.Time) model.Claims {
 	return model.Claims{
 		UserId: user.Id.String(),
 		Role:   role,
 		RegisteredClaims: jwt.RegisteredClaims{
-			Issuer:    "textsender-auth",
-			ExpiresAt: jwt.NewNumericDate(time.Now().Add(24 * time.Hour)),
-			IssuedAt:  jwt.NewNumericDate(time.Now()),
+			Issuer:    config.App_Name,
+			ExpiresAt: jwt.NewNumericDate(expiredAt),
+			IssuedAt:  jwt.NewNumericDate(issuedAt),
 		},
 	}
 }

internal/version/version.go

@@ -0,0 +1,17 @@
+package version
+
+import "fmt"
+
+var (
+	Version   = "dev"
+	BuildTime = "unknown"
+	Commit    = "unknown"
+	GoVersion = "unknown"
+)
+
+func String() string {
+	return fmt.Sprintf(
+		"Version: %s\nBuild Date: %s\nCommit: %s\nGo Version: %s",
+		Version, BuildTime, Commit, GoVersion,
+	)
+}