Skip to content

Commit a124edf

Browse files
committed
Add user to validate_session
Resolves #379
1 parent 5e6b033 commit a124edf

File tree

6 files changed

+111
-1277
lines changed

6 files changed

+111
-1277
lines changed

server/go.sum

Lines changed: 0 additions & 1275 deletions
Large diffs are not rendered by default.

server/graph/generated/generated.go

Lines changed: 104 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/graph/model/models_gen.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/graph/schema.graphqls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ type ValidateJWTTokenResponse {
181181

182182
type ValidateSessionResponse {
183183
is_valid: Boolean!
184+
user: User!
184185
}
185186

186187
type GenerateJWTKeysResponse {

server/resolvers/validate_session.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ func ValidateSessionResolver(ctx context.Context, params *model.ValidateSessionI
3737
log := log.WithFields(log.Fields{
3838
"user_id": userID,
3939
})
40-
_, err = db.Provider.GetUserByID(ctx, userID)
40+
user, err := db.Provider.GetUserByID(ctx, userID)
4141
if err != nil {
42+
log.Debug("Failed to get user: ", err)
4243
return nil, err
4344
}
4445
// refresh token has "roles" as claim
@@ -55,5 +56,6 @@ func ValidateSessionResolver(ctx context.Context, params *model.ValidateSessionI
5556
}
5657
return &model.ValidateSessionResponse{
5758
IsValid: true,
59+
User: user.AsAPIUser(),
5860
}, nil
5961
}

server/test/validate_session_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ func validateSessionTests(t *testing.T, s TestSetup) {
5656
res, err = resolvers.ValidateSessionResolver(ctx, &model.ValidateSessionInput{})
5757
assert.Nil(t, err)
5858
assert.True(t, res.IsValid)
59+
assert.Equal(t, res.User.ID, verifyRes.User.ID)
5960
cleanData(email)
6061
})
6162
}

0 commit comments

Comments
 (0)