Skip to content

Commit ba556e1

Browse files
authored
NOISSUE - Fix return role on user creation (#2551)
Signed-off-by: Felix Gateru <[email protected]>
1 parent 8d4e752 commit ba556e1

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

cmd/certs/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func main() {
110110
return
111111
}
112112
defer authnClient.Close()
113-
logger.Info("AutN successfully connected to auth gRPC server " + authnClient.Secure())
113+
logger.Info("AuthN successfully connected to auth gRPC server " + authnClient.Secure())
114114

115115
tp, err := jaegerclient.NewProvider(ctx, svcName, cfg.JaegerURL, cfg.InstanceID, cfg.TraceRatio)
116116
if err != nil {

cmd/journal/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func main() {
109109
return
110110
}
111111
defer authnHandler.Close()
112-
logger.Info("Authn successfully connected to auth gRPC server " + authnHandler.Secure())
112+
logger.Info("AuthN successfully connected to auth gRPC server " + authnHandler.Secure())
113113

114114
authz, authzHandler, err := authsvcAuthz.NewAuthorization(ctx, authClientCfg)
115115
if err != nil {
@@ -118,7 +118,7 @@ func main() {
118118
return
119119
}
120120
defer authzHandler.Close()
121-
logger.Info("Authz successfully connected to auth gRPC server " + authzHandler.Secure())
121+
logger.Info("AuthZ successfully connected to auth gRPC server " + authzHandler.Secure())
122122

123123
tp, err := jaegerclient.NewProvider(ctx, svcName, cfg.JaegerURL, cfg.InstanceID, cfg.TraceRatio)
124124
if err != nil {

cmd/postgres-reader/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func main() {
9999
return
100100
}
101101
defer authzHandler.Close()
102-
logger.Info("Authz successfully connected to auth gRPC server " + authzHandler.Secure())
102+
logger.Info("AuthZ successfully connected to auth gRPC server " + authzHandler.Secure())
103103

104104
authn, authnHandler, err := authsvcAuthn.NewAuthentication(ctx, clientCfg)
105105
if err != nil {
@@ -108,7 +108,7 @@ func main() {
108108
return
109109
}
110110
defer authnHandler.Close()
111-
logger.Info("Authn successfully connected to auth gRPC server " + authnHandler.Secure())
111+
logger.Info("AuthN successfully connected to auth gRPC server " + authnHandler.Secure())
112112

113113
thingsClientCfg := grpcclient.Config{}
114114
if err := env.ParseWithOptions(&thingsClientCfg, env.Options{Prefix: envPrefixThings}); err != nil {

cmd/things/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func main() {
160160
exitCode = 1
161161
return
162162
}
163-
logger.Info("Policy Evaluator and Policy manager are successfully connected to SpiceDB gRPC server")
163+
logger.Info("Policy evaluator and Policy manager are successfully connected to SpiceDB gRPC server")
164164

165165
grpcCfg := grpcclient.Config{}
166166
if err := env.ParseWithOptions(&grpcCfg, env.Options{Prefix: envPrefixAuth}); err != nil {

cmd/timescale-reader/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func main() {
9999
return
100100
}
101101
defer authzHandler.Close()
102-
logger.Info("Authz successfully connected to auth gRPC server " + authzHandler.Secure())
102+
logger.Info("AuthZ successfully connected to auth gRPC server " + authzHandler.Secure())
103103

104104
authn, authnHandler, err := authsvcAuthn.NewAuthentication(ctx, clientCfg)
105105
if err != nil {
@@ -108,7 +108,7 @@ func main() {
108108
return
109109
}
110110
defer authnHandler.Close()
111-
logger.Info("Authn successfully connected to auth gRPC server " + authnHandler.Secure())
111+
logger.Info("AuthN successfully connected to auth gRPC server " + authnHandler.Secure())
112112

113113
thingsClientCfg := grpcclient.Config{}
114114
if err := env.ParseWithOptions(&thingsClientCfg, env.Options{Prefix: envPrefixThings}); err != nil {
@@ -125,7 +125,7 @@ func main() {
125125
}
126126
defer thingsHandler.Close()
127127

128-
logger.Info("ThingsService gRPC client successfully connected to things gRPC server " + thingsHandler.Secure())
128+
logger.Info("Things service gRPC client successfully connected to things gRPC server " + thingsHandler.Secure())
129129

130130
httpServerConfig := server.Config{Port: defSvcHTTPPort}
131131
if err := env.ParseWithOptions(&httpServerConfig, env.Options{Prefix: envPrefixHTTP}); err != nil {

cmd/users/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func main() {
185185
return
186186
}
187187
defer authnHandler.Close()
188-
logger.Info("Authn successfully connected to auth gRPC server " + authnHandler.Secure())
188+
logger.Info("AuthN successfully connected to auth gRPC server " + authnHandler.Secure())
189189

190190
authz, authzHandler, err := authsvcAuthz.NewAuthorization(ctx, clientConfig)
191191
if err != nil {
@@ -194,7 +194,7 @@ func main() {
194194
return
195195
}
196196
defer authzHandler.Close()
197-
logger.Info("Authz successfully connected to auth gRPC server " + authzHandler.Secure())
197+
logger.Info("AuthZ successfully connected to auth gRPC server " + authzHandler.Secure())
198198

199199
domainsClient, domainsHandler, err := grpcclient.SetupDomainsClient(ctx, clientConfig)
200200
if err != nil {

internal/groups/middleware/logging.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,10 @@ func (lm *loggingMiddleware) Unassign(ctx context.Context, session authn.Session
225225
}
226226
if err != nil {
227227
args = append(args, slog.Any("error", err))
228-
lm.logger.Warn("Unassign member to group failed", args...)
228+
lm.logger.Warn("Unassign member from group failed", args...)
229229
return
230230
}
231-
lm.logger.Info("Unassign member to group completed successfully", args...)
231+
lm.logger.Info("Unassign member from group completed successfully", args...)
232232
}(time.Now())
233233

234234
return lm.svc.Unassign(ctx, session, groupID, relation, memberKind, memberIDs...)

users/postgres/users.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func NewRepository(db postgres.Database) users.Repository {
3333
func (repo *userRepo) Save(ctx context.Context, c users.User) (users.User, error) {
3434
q := `INSERT INTO users (id, tags, email, secret, metadata, created_at, status, role, first_name, last_name, username, profile_picture)
3535
VALUES (:id, :tags, :email, :secret, :metadata, :created_at, :status, :role, :first_name, :last_name, :username, :profile_picture)
36-
RETURNING id, tags, email, metadata, created_at, status, first_name, last_name, username, profile_picture`
36+
RETURNING id, tags, email, metadata, created_at, status, role, first_name, last_name, username, profile_picture`
3737

3838
dbu, err := toDBUser(c)
3939
if err != nil {

0 commit comments

Comments
 (0)