WIP: cleanup. Local peer discovery working.

hub/handlers.go

@@ -208,7 +208,7 @@ func (a *App) _adminPeerInit(s *api.Session, w http.ResponseWriter, r *http.Requ
 		return err
 	}
 	code := a.api.Peer_CreateInitIntent(peerIP)
-	log.Printf("Got code: %v / %v", peerIP, cod)
+	log.Printf("Got code: %v / %v", peerIP, code)
 
 	return a.render("/admin-peer-init.html", w, struct {
 		Session    *api.Session
@@ -217,20 +217,6 @@ func (a *App) _adminPeerInit(s *api.Session, w http.ResponseWriter, r *http.Requ
 	}{s, a.api.Config_Get().HubAddress, code})
 }
 
-// TODO: Remove
-func (a *App) _adminPeerIntentCreated(s *api.Session, w http.ResponseWriter, r *http.Request) error {
-	code := r.FormValue("Code")
-	if code == "" {
-		return errors.New("missing Code")
-	}
-
-	return a.render("/admin-peer-intent.html", w, struct {
-		Session    *api.Session
-		HubAddress string
-		Code       string
-	}{s, a.api.Config_Get().HubAddress, code})
-}
-
 func (a *App) _adminPeerView(s *api.Session, w http.ResponseWriter, r *http.Request) error {
 	var peerIP byte
 	err := webutil.NewFormScanner(r.Form).Scan("PeerIP", &peerIP).Error()
@@ -345,17 +331,6 @@ func (a *App) _peerInit(w http.ResponseWriter, r *http.Request) error {
 	return a.sendJSON(w, conf)
 }
 
-// TODO: Remove
-func (a *App) _peerCreate(w http.ResponseWriter, r *http.Request) error {
-	code := r.FormValue("Code")
-	conf, err := a.api.Peer_Create(code)
-	if err != nil {
-		return err
-	}
-
-	return a.sendJSON(w, conf)
-}
-
 func (a *App) _peerFetchState(w http.ResponseWriter, r *http.Request) error {
 	_, apiKey, ok := r.BasicAuth()
 	if !ok {
@@ -385,13 +360,14 @@ func (a *App) _peerFetchState(w http.ResponseWriter, r *http.Request) error {
 	for _, p := range peers {
 		if len(p.PubKey) != 0 {
 			state.Peers[p.PeerIP] = &m.Peer{
-				PeerIP:   p.PeerIP,
-				Version:  p.Version,
-				Name:     p.Name,
-				PublicIP: p.PublicIP,
-				Port:     p.Port,
-				Relay:    p.Relay,
-				PubKey:   p.PubKey,
+				PeerIP:     p.PeerIP,
+				Version:    p.Version,
+				Name:       p.Name,
+				PublicIP:   p.PublicIP,
+				Port:       p.Port,
+				Relay:      p.Relay,
+				PubKey:     p.PubKey,
+				PubSignKey: p.PubSignKey,
 			}
 		}
 	}