Skip to content

Commit 3ee5142

Browse files
committed
Updated auth endpoint
1 parent 8609208 commit 3ee5142

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

cmd/server/service.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ import (
1010
// Packages
1111
server "github.com/mutablelogic/go-server"
1212
helloworld "github.com/mutablelogic/go-server/npm/helloworld"
13-
auth_schema "github.com/mutablelogic/go-server/pkg/auth/schema"
14-
cert_schema "github.com/mutablelogic/go-server/pkg/cert/schema"
1513
httpresponse "github.com/mutablelogic/go-server/pkg/httpresponse"
16-
pgmanager_schema "github.com/mutablelogic/go-server/pkg/pgmanager/schema"
17-
pgqueue_schema "github.com/mutablelogic/go-server/pkg/pgqueue/schema"
1814
provider "github.com/mutablelogic/go-server/pkg/provider"
1915
ref "github.com/mutablelogic/go-server/pkg/ref"
2016
types "github.com/mutablelogic/go-server/pkg/types"
@@ -116,7 +112,6 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
116112
pgpool := config.(*pg.Config)
117113

118114
// Set router
119-
pgpool.Prefix = pgmanager_schema.APIPrefix
120115
if router, ok := provider.Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
121116
return httpresponse.ErrInternalError.With("Invalid router")
122117
} else {
@@ -141,7 +136,6 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
141136
auth := config.(*auth.Config)
142137

143138
// Set the router
144-
auth.Prefix = auth_schema.APIPrefix
145139
if router, ok := ref.Provider(ctx).Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
146140
return httpresponse.ErrInternalError.With("Invalid router")
147141
} else {
@@ -162,7 +156,6 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
162156
pgqueue := config.(*pgqueue.Config)
163157

164158
// Set the router
165-
pgqueue.Prefix = pgqueue_schema.APIPrefix
166159
if router, ok := ref.Provider(ctx).Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
167160
return httpresponse.ErrInternalError.With("Invalid router")
168161
} else {
@@ -182,7 +175,6 @@ func (cmd *ServiceRunCommand) Run(app server.Cmd) error {
182175
certmanager := config.(*cert.Config)
183176

184177
// Set the router
185-
certmanager.Prefix = cert_schema.APIPrefix
186178
if router, ok := ref.Provider(ctx).Task(ctx, "httprouter.main").(server.HTTPRouter); !ok || router == nil {
187179
return httpresponse.ErrInternalError.With("Invalid router")
188180
} else {

pkg/auth/cmd/run.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ import (
66
// Packages
77
server "github.com/mutablelogic/go-server"
88
client "github.com/mutablelogic/go-server/pkg/auth/client"
9+
schema "github.com/mutablelogic/go-server/pkg/auth/schema"
910
)
1011

1112
///////////////////////////////////////////////////////////////////////////////
1213
// PRIVATE METHODS
1314

1415
func run(ctx server.Cmd, fn func(context.Context, *client.Client) error) error {
1516
// Create a client
16-
if endpoint, err := ctx.GetEndpoint(); err != nil {
17+
if endpoint, err := ctx.GetEndpoint(schema.APIPrefix); err != nil {
1718
return err
1819
} else if provider, err := client.New(endpoint.String(), ctx.GetClientOpts()...); err != nil {
1920
return err

0 commit comments

Comments
 (0)