TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: remove dead code now that Android uses LocalAPI instead

Browse Source 
The new Android app and its libtailscale don't use this anymore;
it uses LocalAPI like other clients now.

Updates #11649

Change-Id: Ic9f42b41e0e0280b82294329093dc6c275f41d50
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2024-04-13 15:48:11 -07:00 committed by Brad Fitzpatrick
parent 65f215115f
commit 170c618483
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipn/ipnlocal/local.go
View File

@ -2833,17 +2833,6 @@ func (b *LocalBackend) tryLookupUserName(uid string) string {
return u.Username
}
// Login implements Backend.
// As of 2022-11-15, this is only exists for Android.
func (b *LocalBackend) Login(token *tailcfg.Oauth2Token) {
b.mu.Lock()
b.assertClientLocked()
cc := b.cc
b.mu.Unlock()
cc.Login(token, b.loginFlags|controlclient.LoginInteractive)
}
// StartLoginInteractive implements Backend. It requests a new
// interactive login from controlclient, unless such a flow is already
// in progress, in which case StartLoginInteractive attempts to pick

6
ipn/ipnlocal/local_test.go
View File

@ -775,7 +775,7 @@ func TestStatusWithoutPeers(t *testing.T) {
return cc, nil
})
b.Start(ipn.Options{})
b.Login(nil)
b.StartLoginInteractive()
cc.send(nil, "", false, &netmap.NetworkMap{
SelfNode: (&tailcfg.Node{
MachineAuthorized: true,
@ -862,7 +862,7 @@ func TestStatusPeerCapabilities(t *testing.T) {
return cc, nil
})
b.Start(ipn.Options{})
b.Login(nil)
b.StartLoginInteractive()
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
b.setNetMapLocked(&netmap.NetworkMap{
@ -901,8 +901,6 @@ type legacyBackend interface {
// flow. This should trigger a new BrowseToURL notification
// eventually.
StartLoginInteractive()
// Login logs in with an OAuth2 token.
Login(token *tailcfg.Oauth2Token)
// SetPrefs installs a new set of user preferences, including
// WantRunning. This may cause the wireguard engine to
// reconfigure or stop.

15
ipn/ipnlocal/state_test.go
View File

@ -264,6 +264,17 @@ func (cc *mockControl) UpdateEndpoints(endpoints []tailcfg.Endpoint) {
cc.called("UpdateEndpoints")
}
func (b *LocalBackend) nonInteractiveLoginForStateTest() {
b.mu.Lock()
if b.cc == nil {
panic("LocalBackend.assertClient: b.cc == nil")
}
cc := b.cc
b.mu.Unlock()
cc.Login(nil, b.loginFlags|controlclient.LoginInteractive)
}
// A very precise test of the sequence of function calls generated by
// ipnlocal.Local into its controlclient instance, and the events it
// produces upstream into the UI.
@ -385,7 +396,7 @@ func TestStateMachine(t *testing.T) {
// then wait for us to respond.
t.Logf("\n\nLogin (noninteractive)")
notifies.expect(0)
b.Login(nil)
b.nonInteractiveLoginForStateTest()
{
cc.assertCalls("Login")
notifies.drain(0)
@ -666,7 +677,7 @@ func TestStateMachine(t *testing.T) {
c.Assert(ipn.NeedsLogin, qt.Equals, b.State())
}
b.Login(nil)
b.StartLoginInteractive()
t.Logf("\n\nLoginFinished3")
notifies.expect(3)
cc.persist.UserProfile.LoginName = "user2"