[PR #2542] [MERGED] types/authkey: include user object in response #2717

Closed
opened 2025-12-29 03:22:28 +01:00 by adam · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/juanfont/headscale/pull/2542
Author: @kradalby
Created: 4/23/2025
Status: Merged
Merged: 4/30/2025
Merged by: @kradalby

Base: mainHead: kradalby/2520-auth-key-user


📝 Commits (4)

  • ca0d1c7 types/authkey: include user object, not string
  • 9a07720 make preauthkeys use id
  • a71f73f changelog
  • 9f099cc integration: wire up user id for auth keys

📊 Changes

23 files changed (+454 additions, -779 deletions)

View changed files

📝 CHANGELOG.md (+7 -0)
📝 cmd/headscale/cli/preauthkeys.go (+5 -5)
📝 gen/go/headscale/v1/apikey.pb.go (+28 -48)
📝 gen/go/headscale/v1/device.pb.go (+66 -125)
📝 gen/go/headscale/v1/headscale.pb.go (+35 -198)
📝 gen/go/headscale/v1/node.pb.go (+89 -155)
📝 gen/go/headscale/v1/policy.pb.go (+15 -28)
📝 gen/go/headscale/v1/preauthkey.pb.go (+66 -88)
📝 gen/go/headscale/v1/user.pb.go (+37 -60)
📝 gen/openapiv2/headscale/v1/headscale.swagger.json (+9 -5)
📝 hscontrol/db/db.go (+1 -1)
📝 hscontrol/grpcv1.go (+3 -3)
📝 hscontrol/mapper/mapper.go (+1 -1)
📝 hscontrol/types/preauth_key.go (+2 -4)
📝 integration/auth_key_test.go (+17 -14)
📝 integration/cli_test.go (+14 -13)
📝 integration/control.go (+3 -2)
📝 integration/general_test.go (+4 -4)
📝 integration/hsic/hsic.go (+30 -7)
📝 integration/route_test.go (+4 -1)

...and 3 more files

📄 Description

Fixes #2520
Fixes #2492
Fixes #2487


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/juanfont/headscale/pull/2542 **Author:** [@kradalby](https://github.com/kradalby) **Created:** 4/23/2025 **Status:** ✅ Merged **Merged:** 4/30/2025 **Merged by:** [@kradalby](https://github.com/kradalby) **Base:** `main` ← **Head:** `kradalby/2520-auth-key-user` --- ### 📝 Commits (4) - [`ca0d1c7`](https://github.com/juanfont/headscale/commit/ca0d1c7f259835a6606b48ca9296746c4e91147c) types/authkey: include user object, not string - [`9a07720`](https://github.com/juanfont/headscale/commit/9a07720d077dc231f33ddf5d18cfd0ed9b2eed52) make preauthkeys use id - [`a71f73f`](https://github.com/juanfont/headscale/commit/a71f73fca303733d5eb3f1409325c2cd686c7e7b) changelog - [`9f099cc`](https://github.com/juanfont/headscale/commit/9f099cc9bccbf2371f4076cf58fd04000db461c5) integration: wire up user id for auth keys ### 📊 Changes **23 files changed** (+454 additions, -779 deletions) <details> <summary>View changed files</summary> 📝 `CHANGELOG.md` (+7 -0) 📝 `cmd/headscale/cli/preauthkeys.go` (+5 -5) 📝 `gen/go/headscale/v1/apikey.pb.go` (+28 -48) 📝 `gen/go/headscale/v1/device.pb.go` (+66 -125) 📝 `gen/go/headscale/v1/headscale.pb.go` (+35 -198) 📝 `gen/go/headscale/v1/node.pb.go` (+89 -155) 📝 `gen/go/headscale/v1/policy.pb.go` (+15 -28) 📝 `gen/go/headscale/v1/preauthkey.pb.go` (+66 -88) 📝 `gen/go/headscale/v1/user.pb.go` (+37 -60) 📝 `gen/openapiv2/headscale/v1/headscale.swagger.json` (+9 -5) 📝 `hscontrol/db/db.go` (+1 -1) 📝 `hscontrol/grpcv1.go` (+3 -3) 📝 `hscontrol/mapper/mapper.go` (+1 -1) 📝 `hscontrol/types/preauth_key.go` (+2 -4) 📝 `integration/auth_key_test.go` (+17 -14) 📝 `integration/cli_test.go` (+14 -13) 📝 `integration/control.go` (+3 -2) 📝 `integration/general_test.go` (+4 -4) 📝 `integration/hsic/hsic.go` (+30 -7) 📝 `integration/route_test.go` (+4 -1) _...and 3 more files_ </details> ### 📄 Description Fixes #2520 Fixes #2492 Fixes #2487 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-29 03:22:28 +01:00
adam closed this issue 2025-12-29 03:22:28 +01:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/headscale#2717