Skip to content

Commit 5c62016

Browse files
committed
💄
1 parent 997be7a commit 5c62016

File tree

2 files changed

+46
-4
lines changed

2 files changed

+46
-4
lines changed

components/gitpod-db/go/personal_access_token_test.go

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,51 @@ func TestPersonalAccessToken_Create(t *testing.T) {
7474
require.Equal(t, request.ID, result.ID)
7575
}
7676

77+
func TestPersonalAccessToken_Update(t *testing.T) {
78+
conn := dbtest.ConnectForTests(t)
79+
80+
firstUserId := uuid.New()
81+
secondUserId := uuid.New()
82+
83+
token := dbtest.NewPersonalAccessToken(t, db.PersonalAccessToken{UserID: firstUserId})
84+
token2 := dbtest.NewPersonalAccessToken(t, db.PersonalAccessToken{UserID: secondUserId})
85+
86+
tokenEntries := []db.PersonalAccessToken{token, token2}
87+
88+
dbtest.CreatePersonalAccessTokenRecords(t, conn, tokenEntries...)
89+
90+
var newHash = "another-secure-hash"
91+
var newExpirationTime = time.Now().Add(24 * time.Hour).UTC().Truncate(time.Millisecond)
92+
93+
t.Run("not matching user", func(t *testing.T) {
94+
_, err := db.UpdatePersonalAccessToken(context.Background(), conn, token.ID, token2.UserID, newHash, newExpirationTime)
95+
require.Error(t, err, db.ErrorNotFound)
96+
})
97+
98+
t.Run("not matching token", func(t *testing.T) {
99+
_, err := db.UpdatePersonalAccessToken(context.Background(), conn, token2.ID, token.UserID, newHash, newExpirationTime)
100+
require.Error(t, err, db.ErrorNotFound)
101+
})
102+
103+
t.Run("both token and user don't exist in the DB", func(t *testing.T) {
104+
_, err := db.UpdatePersonalAccessToken(context.Background(), conn, uuid.New(), uuid.New(), newHash, newExpirationTime)
105+
require.Error(t, err, db.ErrorNotFound)
106+
})
107+
108+
t.Run("valid", func(t *testing.T) {
109+
returned, err := db.UpdatePersonalAccessToken(context.Background(), conn, token.ID, token.UserID, newHash, newExpirationTime)
110+
require.NoError(t, err)
111+
require.Equal(t, token.ID, returned.ID)
112+
require.Equal(t, token.UserID, returned.UserID)
113+
require.Equal(t, newHash, returned.Hash)
114+
require.Equal(t, token.Name, returned.Name)
115+
require.Equal(t, token.Description, returned.Description)
116+
require.Equal(t, token.Scopes, returned.Scopes)
117+
require.Equal(t, newExpirationTime, returned.ExpirationTime)
118+
require.Equal(t, token.CreatedAt, returned.CreatedAt)
119+
})
120+
}
121+
77122
func TestListPersonalAccessTokensForUser(t *testing.T) {
78123
ctx := context.Background()
79124
conn := dbtest.ConnectForTests(t)

components/public-api-server/pkg/apiv1/tokens_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,10 +412,7 @@ func TestTokensService_RegeneratePersonalAccessToken(t *testing.T) {
412412
}))
413413
require.NoError(t, err)
414414

415-
newTime, err := time.Parse(time.RFC3339, "2023-01-02T15:04:05Z")
416-
require.NoError(t, err)
417-
418-
newTimestamp := timestamppb.New(newTime)
415+
newTimestamp := timestamppb.New(time.Now().Add(24 * time.Hour).UTC().Truncate(time.Millisecond))
419416
response, err := client.RegeneratePersonalAccessToken(context.Background(), connect.NewRequest(&v1.RegeneratePersonalAccessTokenRequest{
420417
Id: tokens[0].ID.String(),
421418
ExpirationTime: newTimestamp,

0 commit comments

Comments
 (0)