[PR #7063] [CLOSED] [client] Keep the profile name when enrolling with a setup key #30126

Closed
opened 2026-08-05 08:10:15 -04:00 by saavagebueno · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/netbirdio/netbird/pull/7063
Author: @pappz
Created: 8/4/2026
Status: Closed

Base: mainHead: fix/android-setup-key-profile-name


📝 Commits (1)

  • be3238e [client] Keep the profile name when enrolling with a setup key

📊 Changes

1 file changed (+17 additions, -2 deletions)

View changed files

📝 client/android/login.go (+17 -2)

📄 Description

Describe your changes

NewAuth built its config with CreateInMemoryConfig, which ignores cfgPath and returns a struct with only the defaults plus the management URL. A successful login then writes that whole struct back over the profile file, so every field the in-memory config never knew about is lost.

ConfigInput has no Name field, so the display name AddProfile had just written was blanked: adding a profile and enrolling it with a setup key in one step left the profile listed under no name at all.

Read the stored config instead, falling back to an in-memory one only when there is no path to read from — the same guard the iOS binding already applies for the equivalent problem with the persisted WireGuard key.

Stack

Checklist

  • Is it a bug fix
  • Is a typo/documentation fix
  • Is a feature enhancement
  • It is a refactor
  • Created tests that fail without the change (if possible)
  • I ran and tested this change locally — I did not rely on CI to find out whether it works
  • This PR has a single purpose (not a fix + refactor + feature in one)
  • This change is a trivial fix, OR it links an issue the NetBird team agreed on beforehand. Changes to the public API, gRPC protocols, functionality behavior, CLI / service flags, or new features always need that agreement first. See CONTRIBUTING.md.

By submitting this pull request, you confirm that you have read and agree to the terms of the Contributor License Agreement.

Documentation

Select exactly one:

  • I added/updated documentation for this change
  • Documentation is not needed for this change (explain why)

Docs PR URL (required if "docs added" is checked)

Paste the PR link from https://github.com/netbirdio/docs here:

https://github.com/netbirdio/docs/pull/__

Summary by CodeRabbit

  • Bug Fixes
    • Improved login configuration handling when a configuration path is provided.
    • Existing configuration data is now preserved during updates.
    • In-memory configuration behavior remains unchanged when no path is specified.

🔄 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/netbirdio/netbird/pull/7063 **Author:** [@pappz](https://github.com/pappz) **Created:** 8/4/2026 **Status:** ❌ Closed **Base:** `main` ← **Head:** `fix/android-setup-key-profile-name` --- ### 📝 Commits (1) - [`be3238e`](https://github.com/netbirdio/netbird/commit/be3238e18ad0f8aa18e87a65506c60f9ca3314d7) [client] Keep the profile name when enrolling with a setup key ### 📊 Changes **1 file changed** (+17 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `client/android/login.go` (+17 -2) </details> ### 📄 Description ## Describe your changes NewAuth built its config with CreateInMemoryConfig, which ignores cfgPath and returns a struct with only the defaults plus the management URL. A successful login then writes that whole struct back over the profile file, so every field the in-memory config never knew about is lost. ConfigInput has no Name field, so the display name AddProfile had just written was blanked: adding a profile and enrolling it with a setup key in one step left the profile listed under no name at all. Read the stored config instead, falling back to an in-memory one only when there is no path to read from — the same guard the iOS binding already applies for the equivalent problem with the persisted WireGuard key. ## Issue ticket number and link <!-- Required for anything that changes behavior. Link the issue (or the validated discussion it came from) that the NetBird team already agreed on. See https://github.com/netbirdio/netbird/blob/main/CONTRIBUTING.md#ticket-first-pr-second --> ## Stack <!-- branch-stack --> ### Checklist - [x] Is it a bug fix - [ ] Is a typo/documentation fix - [ ] Is a feature enhancement - [ ] It is a refactor - [ ] Created tests that fail without the change (if possible) - [ ] I ran and tested this change locally — I did not rely on CI to find out whether it works - [ ] This PR has a single purpose (not a fix + refactor + feature in one) - [ ] This change is a trivial fix, **OR** it links an issue the NetBird team agreed on beforehand. Changes to the public API, gRPC protocols, functionality behavior, CLI / service flags, or new features always need that agreement first. See [CONTRIBUTING.md](https://github.com/netbirdio/netbird/blob/main/CONTRIBUTING.md#ticket-first-pr-second). > By submitting this pull request, you confirm that you have read and agree to the terms of the [Contributor License Agreement](https://github.com/netbirdio/netbird/blob/main/CONTRIBUTOR_LICENSE_AGREEMENT.md). ## Documentation Select exactly one: - [ ] I added/updated documentation for this change - [x] Documentation is **not needed** for this change (explain why) ### Docs PR URL (required if "docs added" is checked) Paste the PR link from https://github.com/netbirdio/docs here: https://github.com/netbirdio/docs/pull/__ <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Improved login configuration handling when a configuration path is provided. * Existing configuration data is now preserved during updates. * In-memory configuration behavior remains unchanged when no path is specified. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
saavagebueno added the pull-request label 2026-08-05 08:10:15 -04:00
Sign in to join this conversation.
No Label pull-request
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: DYNR/netbird#30126