Convert bespoke methods to io.Reader/io.Writer interfaces

[rbdr/mobius] / hotline / server.go

diff --git a/hotline/server.go b/hotline/server.go
index a77e79295e0e8e318a68855ac4fe5111328939e7..78b7a371befa7a69041161848c91e900b678a5f4 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -283,7 +283,7 @@ func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredL
                        for {
                                tr := &TrackerRegistration{
                                        UserCount:   server.userCount(),
                        for {
                                tr := &TrackerRegistration{
                                        UserCount:   server.userCount(),

-                                       PassID:      server.TrackerPassID[:],
+                                       PassID:      server.TrackerPassID,

                                        Name:        server.Config.Name,
                                        Description: server.Config.Description,
                                }
                                        Name:        server.Config.Name,
                                        Description: server.Config.Description,
                                }


@@ -447,11 +447,12 @@ func (s *Server) UpdateUser(login, newLogin, name, password string, access acces
 
        // update renames the user login
        if login != newLogin {
 
        // update renames the user login
        if login != newLogin {

-               err := os.Rename(filepath.Join(s.ConfigDir, "Users", login+".yaml"), filepath.Join(s.ConfigDir, "Users", newLogin+".yaml"))
+               err := os.Rename(filepath.Join(s.ConfigDir, "Users", path.Join("/", login)+".yaml"), filepath.Join(s.ConfigDir, "Users", path.Join("/", newLogin)+".yaml"))

                if err != nil {
                if err != nil {

-                       return err
+                       return fmt.Errorf("unable to rename account: %w", err)

                }
                s.Accounts[newLogin] = s.Accounts[login]
                }
                s.Accounts[newLogin] = s.Accounts[login]

+               s.Accounts[newLogin].Login = newLogin

                delete(s.Accounts, login)
        }
 
                delete(s.Accounts, login)
        }