experimenting with format

README.md.asc

@@ -7,12 +7,12 @@ An easy-to-use library for the i2pcontrol rpc interface.
 Don't use it yet, it's not even a little done.
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlrDIbYACgkQ11wDs5te
-FOESGgf9GR239i0Gf2nvhyzz9GUPj+YWFToMNvT/UipLE6XpmXHJHt7BRWsRyz+V
-/IZzFpb1QIz4dJAUDXpFB52G2phMfSKUD0bWdGBhHv4ob7ne4FCQWjkhseQy7U7A
-1GuuoNYD6kakl6gritL6H23r+/lePzoBnRC6w6/mD6nUbhhox/Tp5Vb9BF+WcLN9
-VF93a691GLK2m8Mbs3TSaDhUVBvDFRNI+hsTXGAUYX24tfbYV5iSwUbug8odReSk
-080VUqTdXVmP/MveZOVCuyQwrrNY6i/MbvQBsj7x7YJdVrg4s1bhunB6o8oLMRcj
-d7LK1Z/7si4KDR9vgPQP6olOSK3V4g==
-=zrBe
+iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlrDJTUACgkQ11wDs5te
+FOEI/ggArjLCkkUTVF2iRxsKPPOSxjGTX86PodKPmtUX7ZOGfxGm2eAeT0Dcrcoz
+wQMoqL4EHZUb/ANckoZOaEm5/v1fpRaDdbOC7yY34lnL2zstnnQOePFtiRSZjMTZ
+o4hjRfDTdO2DLeiHzFiagsDvFfZDhShMAQzEUk9RHox8zcSwQcXC0od2DLu81U18
+xoVva7EgrD6zU2jr5I10yqRSrX+pIB5UhQzzDmqkHsgzJVfTkFT9XjP+gWmwcgFe
+eK+aa4I1gZgukpZ91mdh+RDMFSjivjfTeKi0QqrA4DqRvCzU+dU+zZ84AhC5KsLA
+M3YtqA1svGw6UFu54rOeXFziCbgIUA==
+=m70N
 -----END PGP SIGNATURE-----

auth.go

@@ -20,8 +20,14 @@ func (i *i2pControlStructure) i2pControlDo(s ...string) string{
     return ""
 }
 
-func (i *i2pControlStructure) Echo(s ...string) (string, string) {
-    query := i.jsonstructure.Echo(s...)
+func (i *i2pControlStructure) Authenticate(s string) (string, string) {
+    query := i.jsonstructure.Authenticate("API" , "1", "Password", s)
+    fmt.Println(query)
+    response := i.i2pControlDo(query)
+    return query, response
+}
+func (i *i2pControlStructure) Echo(s string) (string, string) {
+    query := i.jsonstructure.Echo("API" , "1", "Token", s)
     fmt.Println(query)
     response := i.i2pControlDo(query)
     return query, response

json.go

@@ -14,30 +14,29 @@ func (j *jsonStructure) Id() string {
     return rstring
 }
 
-func (j *jsonStructure) Format(m, e string, s ...string) string {
+func (j *jsonStructure) Format(m string, s ...string) string {
     rstring := "{\n"
     rstring += "  method: \"" + m +"\"\n"
     rstring += "  jsonrpc: \"2.0\"\n"
     rstring += "  id: \"" + j.Id() + "\"\n"
-    rstring += "  params: \""
+    rstring += "  params:"
     var params string
     for index, value := range s {
         if index != 0 && index%2 == 0 {
-            params += "  " + s[index-1] + ": \"" + value + "\""
+            params += strings.TrimRight("  " + s[index-1] + ": \"" + value + "\"", " ") + "\n"
         }
     }
-    p := strings.TrimRight(params, " ")
-    rstring += p + "\"\n"
+    rstring += params + "\n"
     rstring += "}\n"
     return rstring
 }
 
 func (j *jsonStructure) Authenticate(s ...string) string{
-    return j.Format("echo", "Authenticate", s...)
+    return j.Format("echo", s...)
 }
 
 func (j *jsonStructure) Echo(s ...string) string{
-    return j.Format("echo", "Echo", s...)
+    return j.Format("echo", s...)
 }
 
 func (j *jsonStructure) jsonStructure() jsonStructure {