MyFavMirrors/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-11-07 21:02:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

types/authkey: include user object in response (#2542)

Browse Source 
* types/authkey: include user object, not string

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

* make preauthkeys use id

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

* changelog

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

* integration: wire up user id for auth keys

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>

---------

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby
2025-04-30 12:45:08 +03:00
committed by GitHub
parent f1206328dc
commit 8f9fbf16f1
23 changed files with 454 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hscontrol/grpcv1.go
View File

@@ -161,7 +161,7 @@ func (api headscaleV1APIServer) CreatePreAuthKey(
}
}
user, err := api.h.db.GetUserByName(request.GetUser())
user, err := api.h.db.GetUserByID(types.UserID(request.GetUser()))
if err != nil {
return nil, err
}
@@ -190,7 +190,7 @@ func (api headscaleV1APIServer) ExpirePreAuthKey(
return err
}
if preAuthKey.User.Name != request.GetUser() {
if uint64(preAuthKey.User.ID) != request.GetUser() {
return fmt.Errorf("preauth key does not belong to user")
}
@@ -207,7 +207,7 @@ func (api headscaleV1APIServer) ListPreAuthKeys(
ctx context.Context,
request *v1.ListPreAuthKeysRequest,
) (*v1.ListPreAuthKeysResponse, error) {
user, err := api.h.db.GetUserByName(request.GetUser())
user, err := api.h.db.GetUserByID(types.UserID(request.GetUser()))
if err != nil {
return nil, err
}