chore: update fiber-goth

ZEISS · Jul 3, 2024 · f8ab9c6 · f8ab9c6
1 parent 5dfe757
commit f8ab9c6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/cmd/accounts/cmd/cfg.go b/cmd/accounts/cmd/cfg.go
@@ -25,11 +25,7 @@ type Flags struct {
 
 // NewFlags ...
 func NewFlags() *Flags {
-	return &Flags{
-		Addr:                ":8084",
-		DatabaseURI:         "host=host.docker.internal user=example password=example dbname=example port=5432 sslmode=disable",
-		DatabaseTablePrefix: "typhoon_",
-	}
+	return &Flags{}
 }
 
 // New ...

diff --git a/cmd/web/cmd/cfg.go b/cmd/web/cmd/cfg.go
@@ -18,24 +18,20 @@ type DB struct {
 
 // Flags contains the command line flags.
 type Flags struct {
-	Addr                    string `envconfig:"TYPHOON_WEB_ADDR" default:":3000"`
+	Addr                    string `envconfig:"TYPHOON_WEB_ADDR" default:":8080"`
 	DatabaseURI             string `envconfig:"TYPHOON_WEB_DATABASE_URI" default:""`
 	DatabaseTablePrefix     string `envconfig:"TYPHOON_WEB_DATABASE_TABLE_PREFIX" default:"typhoon_"`
 	FGAApiUrl               string `envconfig:"TYPHOON_WEB_FGA_API_URL" default:"http://host.docker.internal:8080"`
 	FGAStoreID              string `envconfig:"TYPHOON_WEB_FGA_STORE_ID" default:""`
 	FGAAuthorizationModelID string `envconfig:"TYPHOON_WEB_FGA_AUTHORIZATION_MODEL_ID" default:""`
 	GothGitbubKey           string `envconfig:"TYPHOON_WEB_GITHUB_CLIENT_ID" default:""`
 	GothGithubSecret        string `envconfig:"TYPHOON_WEB_GITHUB_SECRET" default:""`
-	GothGithubCallback      string `envconfig:"TYPHOON_WEB_GITHUB_CALLBACK" default:"http://localhost:3000/auth/github/callback"`
+	GothGithubCallback      string `envconfig:"TYPHOON_WEB_GITHUB_CALLBACK" default:"http://localhost:8080/auth/github/callback"`
 }
 
 // NewFlags ...
 func NewFlags() *Flags {
-	return &Flags{
-		Addr:                ":3000",
-		DatabaseURI:         "host=host.docker.internal user=example password=example dbname=example port=5432 sslmode=disable",
-		DatabaseTablePrefix: "typhoon_",
-	}
+	return &Flags{}
 }
 
 // New ...

diff --git a/go.mod b/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/google/cel-go v0.17.7
 	github.com/google/uuid v1.6.0
 	github.com/itchyny/gojq v0.12.14
-	github.com/katallaxie/pkg v0.6.5
+	github.com/katallaxie/pkg v0.6.6
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/logzio/logzio-go v1.0.6
 	github.com/nats-io/jwt v1.2.2
@@ -36,7 +36,7 @@ require (
 	github.com/wamuir/go-xslt v0.1.5
 	github.com/xdg-go/scram v1.0.2
 	github.com/zeiss/fiber-authz v1.0.31
-	github.com/zeiss/fiber-goth v1.2.5
+	github.com/zeiss/fiber-goth v1.2.6
 	github.com/zeiss/fiber-htmx v1.3.18-0.20240628131553-334787f154e5
 	github.com/zeiss/gorm-seed v0.1.2
 	github.com/zeiss/snow-go v0.0.0-20240312201415-88f059622cff

diff --git a/go.sum b/go.sum
@@ -732,8 +732,8 @@ github.com/julz/importas v0.1.0 h1:F78HnrsjY3cR7j0etXy5+TU1Zuy7Xt08X/1aJnH5xXY=
 github.com/julz/importas v0.1.0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0=
 github.com/karamaru-alpha/copyloopvar v1.1.0 h1:x7gNyKcC2vRBO1H2Mks5u1VxQtYvFiym7fCjIP8RPos=
 github.com/karamaru-alpha/copyloopvar v1.1.0/go.mod h1:u7CIfztblY0jZLOQZgH3oYsJzpC2A7S6u/lfgSXHy0k=
-github.com/katallaxie/pkg v0.6.5 h1:r4umTg9eZ4S+aJtGZ7Wtofu9v5HIQM7FAok+j/HDM3I=
-github.com/katallaxie/pkg v0.6.5/go.mod h1:FJNit/KFQGJ5o0XEJN711gfLVxNU1RlXFTboctkVP4A=
+github.com/katallaxie/pkg v0.6.6 h1:+qQBCoz5vRYENaL/uwTlks15Px4GDCdhybAZFg8s79c=
+github.com/katallaxie/pkg v0.6.6/go.mod h1:FJNit/KFQGJ5o0XEJN711gfLVxNU1RlXFTboctkVP4A=
 github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
 github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
@@ -1227,8 +1227,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 github.com/zeiss/fiber-authz v1.0.31 h1:tcD9zkKHZNSVN6BYgKJ2cYwpbfT5p1+FyKqX1fx+xlM=
 github.com/zeiss/fiber-authz v1.0.31/go.mod h1:kpmrBtJ23crBOwT7u0LwwnNywmDYhV4ez6L6oDCWkPA=
-github.com/zeiss/fiber-goth v1.2.5 h1:QM4HPg2mfUyacJkA31/WzjFhuHs76r8CGRW/XirkLI8=
-github.com/zeiss/fiber-goth v1.2.5/go.mod h1:tz8jwl78pU0ZyDiPEmx6ZvNoWzzU8LWgN+LkomJV/xE=
+github.com/zeiss/fiber-goth v1.2.6 h1:fhdD/HkSaatewnULxBICJj7ZamIzCefFdllfpX70Xo4=
+github.com/zeiss/fiber-goth v1.2.6/go.mod h1:tYxywhiORkOUB2gRktCAgwz9i0Y+CTgBEwnQ3QZsAxU=
 github.com/zeiss/fiber-htmx v1.3.18-0.20240628131553-334787f154e5 h1:hIbpyz6aRg6QtXnmhsmlkEYVlX1b8UJ29Jc3g25LXIw=
 github.com/zeiss/fiber-htmx v1.3.18-0.20240628131553-334787f154e5/go.mod h1:CvbT2DdAGkfOF9m24mHREMFcnrHctEDrqttncEdGScU=
 github.com/zeiss/gorm-seed v0.1.2 h1:XksLz/IXC1ejUgbl5dHC2/vQAqD2LNZMhZMz2w+E7fY=