phoenix/schedtxt_auth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tsk-21: Disable registration (#27)

Browse Source 
Closes #21

Reviewed-on: phoenix/textsender-auth#27
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
phoenix
2025-11-27 01:01:32 +00:00
committed by phoenix
parent d01fae0775
commit 9f5029dd6e
26 changed files with 178 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/config/config.go
+32 -7
View File
@@ -5,7 +5,9 @@ import (
"fmt"
"log"
"os"
"path"
"strconv"
"strings"
"github.com/joho/godotenv"
@@ -13,9 +15,10 @@ import (
)
type Config struct {
DBConnString string
ServerPort string
ResetDB bool
DBConnString string
ServerPort string
ResetDB bool
EnableRegistration bool
}
type ConnectionInfo struct {
@@ -52,16 +55,24 @@ 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()
return &Config{
DBConnString: dbConnString,
ServerPort: *port,
ResetDB: *resetDb,
DBConnString: dbConnString,
ServerPort: *port,
ResetDB: *resetDb,
EnableRegistration: CheckRegistration(),
}
}
@@ -120,6 +131,20 @@ func UnpackDBConnString() (connInfo ConnectionInfo) {
return
}
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/login.go
+6 -5
View File
@@ -4,10 +4,10 @@ import (
"fmt"
"net/http"
"git.kundeng.us/phoenix/textsender-models/pkg/token"
"git.kundeng.us/phoenix/textsender-models/tx0/token"
"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"
)
@@ -22,11 +22,12 @@ type LoginResponse struct {
}
type LoginHandler struct {
UserStore model.UserStore
Config *config.Config
UserStore store.UserStore
}
func NewLoginHandler(userStore model.UserStore) *LoginHandler {
return &LoginHandler{UserStore: userStore}
func NewLoginHandler(cfg *config.Config, userStore store.UserStore) *LoginHandler {
return &LoginHandler{Config: cfg, UserStore: userStore}
}
// Login godoc
internal/handler/login_test.go
+2 -1
View File
@@ -17,8 +17,9 @@ import (
)
func TestLogin(t *testing.T) {
cfg := GetConfig()
mockstore := mock.NewMockUserStore()
handler := NewLoginHandler(mockstore)
handler := NewLoginHandler(cfg, mockstore)
testUser := GetTestUser()
unhashedPassword := testUser.Password
internal/handler/refresh.go
+5 -5
View File
@@ -3,21 +3,21 @@ package handler
import (
"net/http"
"git.kundeng.us/phoenix/textsender-models/pkg/token"
"git.kundeng.us/phoenix/textsender-models/tx0/token"
"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 RefreshHandler struct {
UserStore model.UserStore
Config *config.Config
UserStore store.UserStore
ServiceStore store.ServiceStore
}
func NewRefreshHandler(userStore model.UserStore, serviceStore store.ServiceStore) *RefreshHandler {
return &RefreshHandler{UserStore: userStore, ServiceStore: serviceStore}
func NewRefreshHandler(cfg *config.Config, userStore store.UserStore, serviceStore store.ServiceStore) *RefreshHandler {
return &RefreshHandler{Config: cfg, UserStore: userStore, ServiceStore: serviceStore}
}
type RefreshRequest struct {
internal/handler/refresh_test.go
+4 -3
View File
@@ -7,7 +7,7 @@ import (
"strings"
"testing"
"git.kundeng.us/phoenix/textsender-models/pkg/user"
"git.kundeng.us/phoenix/textsender-models/tx0/user"
"github.com/stretchr/testify/assert"
"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
@@ -35,7 +35,8 @@ func TestRefreshTokenWithMock(t *testing.T) {
assert.NoError(t, err, "Error creating service user: %v", err)
}
handler := NewServiceHandler(mockStore)
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")
@@ -56,7 +57,7 @@ func TestRefreshTokenWithMock(t *testing.T) {
jsonValue, err = json.Marshal(testReq)
assert.NoError(t, err, "Error marshaling request")
newHandler := NewRefreshHandler(userStore, mockStore)
newHandler := NewRefreshHandler(cfg, userStore, mockStore)
req, _ = http.NewRequest("POST", endpoint.TokenRefresh, strings.NewReader(string(jsonValue)))
rr = httptest.NewRecorder()
internal/handler/register.go
+14 -5
View File
@@ -4,10 +4,11 @@ import (
"fmt"
"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"
)
@@ -29,11 +30,12 @@ type RegisterResponse struct {
}
type UserHandler struct {
UserStore model.UserStore
Config *config.Config
UserStore store.UserStore
}
func NewUserHandler(userStore model.UserStore) *UserHandler {
return &UserHandler{UserStore: userStore}
func NewUserHandler(cfg *config.Config, userStore store.UserStore) *UserHandler {
return &UserHandler{Config: cfg, UserStore: userStore}
}
// Register godoc
@@ -46,6 +48,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 +63,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)
internal/handler/register_test.go
+2 -1
View File
@@ -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)
internal/handler/service.go
+12 -4
View File
@@ -3,8 +3,8 @@ package handler
import (
"net/http"
"git.kundeng.us/phoenix/textsender-models/pkg/token"
"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"
@@ -12,11 +12,12 @@ import (
)
type ServiceHandler struct {
Config *config.Config
ServiceStore store.ServiceStore
}
func NewServiceHandler(serviceStore store.ServiceStore) *ServiceHandler {
return &ServiceHandler{ServiceStore: serviceStore}
func NewServiceHandler(cfg *config.Config, serviceStore store.ServiceStore) *ServiceHandler {
return &ServiceHandler{Config: cfg, ServiceStore: serviceStore}
}
type ServiceCreationRequest struct {
@@ -39,6 +40,7 @@ type ServiceCreationResponse struct {
// @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) {
@@ -52,6 +54,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 {
internal/handler/service_test.go
+5 -3
View File
@@ -7,7 +7,7 @@ import (
"strings"
"testing"
"git.kundeng.us/phoenix/textsender-models/pkg/user"
"git.kundeng.us/phoenix/textsender-models/tx0/user"
"github.com/stretchr/testify/assert"
"git.kundeng.us/phoenix/textsender-auth/internal/handler/endpoint"
@@ -16,8 +16,9 @@ import (
)
func TestCreateServiceUserWithMock(t *testing.T) {
cfg := GetConfig()
mockStore := mock.NewMockServiceUserStore()
handler := NewServiceHandler(mockStore)
handler := NewServiceHandler(cfg, mockStore)
testService := ServiceCreationRequest{Username: "swoon", Passphrase: "ewrewr329n12y3x2!2"}
jsonValue, err := json.Marshal(testService)
@@ -53,7 +54,8 @@ func TestLoginServiceUserWithMock(t *testing.T) {
assert.NoError(t, err, "Error creating service user: %v", err)
}
handler := NewServiceHandler(mockStore)
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")
internal/handler/utility_test.go
+32 -1
View File
@@ -1,9 +1,40 @@
package handler
import (
"git.kundeng.us/phoenix/textsender-models/pkg/user"
"log"
"os"
"path"
"git.kundeng.us/phoenix/textsender-models/tx0/user"
"github.com/joho/godotenv"
"git.kundeng.us/phoenix/textsender-auth/internal/config"
)
func GetTestUser() user.User {
return user.User{Username: "ghost", PhoneNumber: "+1234567890", Password: "dfgdffddfd"}
}
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(),
}
}
internal/store/mock/service_store.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"fmt"
"sync"
"git.kundeng.us/phoenix/textsender-models/pkg/user"
"git.kundeng.us/phoenix/textsender-models/tx0/user"
"github.com/google/uuid"
)
internal/store/mock/store.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/google/uuid"
"git.kundeng.us/phoenix/textsender-models/pkg/user"
"git.kundeng.us/phoenix/textsender-models/tx0/user"
)
type MockUserStore struct {
internal/store/service.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
"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"
internal/model/user.go → internal/store/user.go
+2 -3
View File
@@ -1,4 +1,4 @@
package model
package store
import (
"context"
@@ -8,10 +8,9 @@ import (
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
"git.kundeng.us/phoenix/textsender-models/pkg/user"
"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)
internal/utility/token.go
+2 -2
View File
@@ -4,12 +4,12 @@ import (
"fmt"
"time"
"git.kundeng.us/phoenix/textsender-models/tx0/token"
"git.kundeng.us/phoenix/textsender-models/tx0/user"
"github.com/google/uuid"
"github.com/golang-jwt/jwt/v5"
"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"