From 76d3111a7223790d24d14ca01e0a85e28be65673 Mon Sep 17 00:00:00 2001 From: mrhid6 Date: Fri, 24 Jul 2026 13:42:44 +0100 Subject: [PATCH] refactor(server): use shared models, provision and indexes Also removes the duplicate Slugify in stepscan.go; workflow step slugs now use the shared definition too. --- server/go.mod | 21 +++++------ server/go.sum | 34 +++++++++--------- server/internal/models/org.go | 17 +++------ server/internal/models/settings.go | 44 ++++------------------- server/internal/models/user.go | 34 ++++-------------- server/internal/services/defaults.go | 3 +- server/internal/services/migrate.go | 18 ++++------ server/internal/services/orgs.go | 54 +++++++--------------------- server/internal/services/stepscan.go | 9 ++--- server/internal/services/users.go | 38 +++++--------------- 10 files changed, 75 insertions(+), 197 deletions(-) diff --git a/server/go.mod b/server/go.mod index 757e4b2..a8bc080 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,6 +1,6 @@ module github.com/mrhid6/vantage/server -go 1.26 +go 1.26.4 require ( github.com/coreos/go-oidc/v3 v3.18.0 @@ -8,7 +8,8 @@ require ( github.com/google/uuid v1.6.0 github.com/redis/go-redis/v9 v9.20.1 github.com/wwt/guac v1.3.2 - go.mongodb.org/mongo-driver/v2 v2.2.2 + go.mongodb.org/mongo-driver/v2 v2.8.0 + golang.org/x/crypto v0.54.0 golang.org/x/oauth2 v0.36.0 google.golang.org/grpc v1.64.0 ) @@ -26,10 +27,9 @@ require ( github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.20.0 // indirect github.com/goccy/go-json v0.10.2 // indirect - github.com/golang/snappy v1.0.0 // indirect github.com/gorilla/websocket v1.4.1 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.16.7 // indirect + github.com/klauspost/compress v1.17.6 // indirect github.com/klauspost/cpuid/v2 v2.2.10 // indirect github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect github.com/leodido/go-urn v1.4.0 // indirect @@ -41,17 +41,18 @@ require ( github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect - github.com/xdg-go/scram v1.1.2 // indirect + github.com/xdg-go/scram v1.2.0 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect go.uber.org/atomic v1.11.0 // indirect golang.org/x/arch v0.8.0 // indirect - golang.org/x/crypto v0.33.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sync v0.11.0 // indirect - golang.org/x/sys v0.30.0 // indirect - golang.org/x/text v0.22.0 // indirect + golang.org/x/net v0.56.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/mrhid6/vantage/shared => ../shared diff --git a/server/go.sum b/server/go.sum index 54c1a12..474a8d4 100644 --- a/server/go.sum +++ b/server/go.sum @@ -35,8 +35,6 @@ github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBEx github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs= -github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= 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/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -47,8 +45,8 @@ github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvK github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI= +github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= @@ -94,8 +92,8 @@ github.com/wwt/guac v1.3.2 h1:sH6OFGa/1tBs7ieWBVlZe7t6F5JAOWBry/tqQL/Vup4= github.com/wwt/guac v1.3.2/go.mod h1:eKm+NrnK7A88l4UBEcYNpZQGMpZRryYKoz4D/0/n1C0= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= -github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= +github.com/xdg-go/scram v1.2.0 h1:bYKF2AEwG5rqd1BumT4gAnvwU/M9nBp2pTSxeZw7Wvs= +github.com/xdg-go/scram v1.2.0/go.mod h1:3dlrS0iBaWKYVt2ZfA4cj48umJZ+cAEbR6/SjLA88I8= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM= @@ -103,8 +101,8 @@ github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfS github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.mongodb.org/mongo-driver/v2 v2.2.2 h1:9cYuS3fl1Xhqwpfazso10V7BHQD58kCgtzhfAmJYz9c= -go.mongodb.org/mongo-driver/v2 v2.2.2/go.mod h1:qQkDMhCGWl3FN509DfdPd4GRBLU/41zqF/k8eTRceps= +go.mongodb.org/mongo-driver/v2 v2.8.0 h1:CxWDGQYY8QQwNjAl/aq2sfWakdnWZynnqJ9F4DhHbP8= +go.mongodb.org/mongo-driver/v2 v2.8.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= @@ -112,20 +110,20 @@ golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= -golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= +golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw= +golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o= +golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= -golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -133,16 +131,16 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= -golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= -golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= diff --git a/server/internal/models/org.go b/server/internal/models/org.go index 0a863a6..b22816f 100644 --- a/server/internal/models/org.go +++ b/server/internal/models/org.go @@ -1,15 +1,8 @@ package models -import ( - "time" +import shared "github.com/mrhid6/vantage/shared/models" - "go.mongodb.org/mongo-driver/v2/bson" -) - -type Org struct { - ID bson.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"` - OrgID string `bson:"org_id" json:"org_id"` - Name string `bson:"name" json:"name"` - Slug string `bson:"slug" json:"slug"` - CreatedAt time.Time `bson:"created_at" json:"created_at"` -} +// Org is defined in the shared module because sitesvc writes the same +// documents. Aliased rather than re-declared so existing call sites are +// unchanged and the two services cannot drift. +type Org = shared.Org diff --git a/server/internal/models/settings.go b/server/internal/models/settings.go index 3e4b767..9a74317 100644 --- a/server/internal/models/settings.go +++ b/server/internal/models/settings.go @@ -1,42 +1,10 @@ package models -import ( - "time" +import shared "github.com/mrhid6/vantage/shared/models" - "go.mongodb.org/mongo-driver/v2/bson" +type ( + Settings = shared.Settings + AlertSettings = shared.AlertSettings + EmailSettings = shared.EmailSettings + SecretsSettings = shared.SecretsSettings ) - -type AlertSettings struct { - Enabled bool `bson:"enabled" json:"enabled"` - WebhookURL string `bson:"webhook_url" json:"webhook_url"` - OfflineThresholdMinutes int `bson:"offline_threshold_minutes" json:"offline_threshold_minutes"` -} - -type EmailSettings struct { - Enabled bool `bson:"enabled" json:"enabled"` - SMTPHost string `bson:"smtp_host" json:"smtp_host"` - SMTPPort int `bson:"smtp_port" json:"smtp_port"` - Username string `bson:"username" json:"username"` - Password string `bson:"password" json:"password"` - FromAddr string `bson:"from_addr" json:"from_addr"` - ToAddrs []string `bson:"to_addrs" json:"to_addrs"` - UseTLS bool `bson:"use_tls" json:"use_tls"` -} - - - -type SecretsSettings struct { - ReadTokenHash string `bson:"read_token_hash,omitempty" json:"-"` - ReadTokenSet bool `bson:"-" json:"read_token_set"` - RotatedAt time.Time `bson:"rotated_at,omitempty" json:"rotated_at,omitempty"` -} - -type Settings struct { - ID bson.ObjectID `bson:"_id,omitempty" json:"-"` - OrgID string `bson:"org_id" json:"org_id"` - Alerts AlertSettings `bson:"alerts" json:"alerts"` - Email EmailSettings `bson:"email" json:"email"` - Secrets SecretsSettings `bson:"secrets" json:"secrets"` - - WorkflowLogRetentionDays *int `bson:"workflow_log_retention_days,omitempty" json:"workflow_log_retention_days,omitempty"` -} diff --git a/server/internal/models/user.go b/server/internal/models/user.go index 1a4707c..6c5a8e5 100644 --- a/server/internal/models/user.go +++ b/server/internal/models/user.go @@ -1,35 +1,13 @@ package models -import ( - "time" - - "go.mongodb.org/mongo-driver/v2/bson" -) - +import shared "github.com/mrhid6/vantage/shared/models" +type User = shared.User const ( - RoleOwner = "owner" - RoleAdmin = "admin" - RoleMember = "member" + RoleOwner = shared.RoleOwner + RoleAdmin = shared.RoleAdmin + RoleMember = shared.RoleMember ) -func ValidRole(role string) bool { - switch role { - case RoleOwner, RoleAdmin, RoleMember: - return true - } - return false -} - -type User struct { - ID bson.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"` - UserID string `bson:"user_id" json:"user_id"` - OrgID string `bson:"org_id" json:"org_id"` - Email string `bson:"email" json:"email"` - PasswordHash string `bson:"password_hash,omitempty" json:"-"` - Role string `bson:"role" json:"role"` - AuthSource string `bson:"auth_source" json:"auth_source"` - CreatedAt time.Time `bson:"created_at" json:"created_at"` - LastLogin *time.Time `bson:"last_login,omitempty" json:"last_login,omitempty"` -} +func ValidRole(role string) bool { return shared.ValidRole(role) } diff --git a/server/internal/services/defaults.go b/server/internal/services/defaults.go index 8ccb9c6..305dd4a 100644 --- a/server/internal/services/defaults.go +++ b/server/internal/services/defaults.go @@ -8,6 +8,7 @@ import ( "github.com/google/uuid" "github.com/mrhid6/vantage/server/internal/db" "github.com/mrhid6/vantage/server/internal/models" + "github.com/mrhid6/vantage/shared/provision" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo/options" ) @@ -41,7 +42,7 @@ func readDefaultStepFiles() ([]models.WorkflowStep, error) { continue } s.Source = "default" - s.Slug = Slugify(s.Name) + s.Slug = provision.Slugify(s.Name) if s.Slug == "" { continue } diff --git a/server/internal/services/migrate.go b/server/internal/services/migrate.go index 061a8e9..36fc170 100644 --- a/server/internal/services/migrate.go +++ b/server/internal/services/migrate.go @@ -9,6 +9,7 @@ import ( "github.com/google/uuid" "github.com/mrhid6/vantage/server/internal/db" "github.com/mrhid6/vantage/server/internal/models" + "github.com/mrhid6/vantage/shared/indexes" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" "go.mongodb.org/mongo-driver/v2/mongo/options" @@ -22,21 +23,16 @@ var scopedCollections = []string{ } func EnsureAuthIndexes() error { - ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) defer cancel() - if _, err := db.Col("users").Indexes().CreateOne(ctx, mongo.IndexModel{ - Keys: bson.D{{Key: "email", Value: 1}}, - Options: options.Index().SetUnique(true), - }); err != nil { - return err - } - if _, err := db.Col("orgs").Indexes().CreateOne(ctx, mongo.IndexModel{ - Keys: bson.D{{Key: "slug", Value: 1}}, - Options: options.Index().SetUnique(true), - }); err != nil { + // users.email and orgs.slug are declared in the shared module so the + // control plane and sitesvc cannot disagree about them. + if err := indexes.EnsureCoreIndexes(ctx, db.Database); err != nil { return err } + + // org_oidc is control-plane only, so its index stays here. if _, err := db.Col("org_oidc").Indexes().CreateOne(ctx, mongo.IndexModel{ Keys: bson.D{{Key: "org_id", Value: 1}}, Options: options.Index().SetUnique(true), diff --git a/server/internal/services/orgs.go b/server/internal/services/orgs.go index 49edfc2..da36f0b 100644 --- a/server/internal/services/orgs.go +++ b/server/internal/services/orgs.go @@ -6,18 +6,13 @@ import ( "log" "time" - "github.com/google/uuid" "github.com/mrhid6/vantage/server/internal/db" "github.com/mrhid6/vantage/server/internal/models" + "github.com/mrhid6/vantage/shared/provision" "go.mongodb.org/mongo-driver/v2/bson" "go.mongodb.org/mongo-driver/v2/mongo" ) -var reservedSlugs = map[string]bool{ - "www": true, "api": true, "app": true, "admin": true, "auth": true, - "install": true, "static": true, "_next": true, "default": true, -} - func GetOrg(orgID string) (*models.Org, error) { ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() @@ -86,11 +81,11 @@ func AdoptOrg(orgID, name string) (*models.Org, error) { set := bson.M{"name": name} - slug := Slugify(name) - if len(slug) > 40 { - slug = slug[:40] + slug := provision.Slugify(name) + if len(slug) > provision.MaxSlugLength { + slug = slug[:provision.MaxSlugLength] } - if len(slug) >= 3 && !reservedSlugs[slug] { + if len(slug) >= provision.MinSlugLength && !provision.ReservedSlugs[slug] { n, err := db.Col("orgs").CountDocuments(ctx, bson.M{"slug": slug, "org_id": bson.M{"$ne": orgID}}) if err != nil { return nil, err @@ -109,45 +104,20 @@ func AdoptOrg(orgID, name string) (*models.Org, error) { return GetOrg(orgID) } +// CreateOrg creates an organisation and seeds its default workflow steps. +// +// The creation rules live in shared/provision because sitesvc creates +// organisations too. Seeding stays here: shared must not know about workflow +// steps. func CreateOrg(name string) (*models.Org, error) { - base := Slugify(name) - if len(base) < 3 { - return nil, fmt.Errorf("organization name too short (slug must be >= 3 chars)") - } - if len(base) > 40 { - base = base[:40] - } - if reservedSlugs[base] { - return nil, fmt.Errorf("organization name is reserved") - } - ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() - - slug := base - for i := 2; ; i++ { - n, err := db.Col("orgs").CountDocuments(ctx, bson.M{"slug": slug}) - if err != nil { - return nil, err - } - if n == 0 { - break - } - slug = fmt.Sprintf("%s-%d", base, i) - } - - o := &models.Org{OrgID: uuid.NewString(), Name: name, Slug: slug, CreatedAt: time.Now()} - if _, err := db.Col("orgs").InsertOne(ctx, o); err != nil { - if mongo.IsDuplicateKeyError(err) { - return nil, fmt.Errorf("organization slug already taken") - } + o, err := provision.CreateOrg(ctx, db.Database, name) + if err != nil { return nil, err } - - - if created, updated, err := SeedDefaultSteps(o.OrgID); err != nil { log.Printf("warning: failed to seed default steps for new org %s: %v", o.OrgID, err) } else { diff --git a/server/internal/services/stepscan.go b/server/internal/services/stepscan.go index 9fb3828..ccc2236 100644 --- a/server/internal/services/stepscan.go +++ b/server/internal/services/stepscan.go @@ -34,11 +34,6 @@ func DeriveOutputs(script string) []string { return out } -var slugStrip = regexp.MustCompile(`[^a-z0-9]+`) +// Slugify lived here and was mirrored by hand in sitesvc. It now has a single +// definition in shared/provision, which both services import. - -func Slugify(name string) string { - s := strings.ToLower(name) - s = slugStrip.ReplaceAllString(s, "-") - return strings.Trim(s, "-") -} diff --git a/server/internal/services/users.go b/server/internal/services/users.go index ceb326b..6f8a5b0 100644 --- a/server/internal/services/users.go +++ b/server/internal/services/users.go @@ -7,11 +7,10 @@ import ( "strings" "time" - "github.com/google/uuid" "github.com/mrhid6/vantage/server/internal/db" "github.com/mrhid6/vantage/server/internal/models" + "github.com/mrhid6/vantage/shared/provision" "go.mongodb.org/mongo-driver/v2/bson" - "go.mongodb.org/mongo-driver/v2/mongo" "golang.org/x/crypto/bcrypt" ) @@ -58,37 +57,16 @@ func GetUserInOrg(orgID, userID string) (*models.User, error) { } func CreateUser(orgID, email, password, role, authSource string) (*models.User, error) { - email = strings.ToLower(strings.TrimSpace(email)) - if email == "" { - return nil, fmt.Errorf("email required") - } - if !models.ValidRole(role) { - return nil, fmt.Errorf("invalid role %q", role) - } - u := &models.User{ - UserID: uuid.NewString(), - OrgID: orgID, - Email: email, - Role: role, - AuthSource: authSource, - CreatedAt: time.Now(), - } - if password != "" { - hash, err := bcrypt.GenerateFromPassword([]byte(password), 12) - if err != nil { - return nil, err - } - u.PasswordHash = string(hash) - } ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() - if _, err := db.Col("users").InsertOne(ctx, u); err != nil { - if mongo.IsDuplicateKeyError(err) { - return nil, fmt.Errorf("email already registered") - } - return nil, err + + u, err := provision.CreateUser(ctx, db.Database, orgID, email, password, role, authSource) + if errors.Is(err, provision.ErrEmailTaken) { + // Preserve the exact error string the API returned before this call + // was delegated to the shared module. + return nil, fmt.Errorf("email already registered") } - return u, nil + return u, err } func GetUserByEmail(email string) (*models.User, error) {