rename address field in alias JSON resolver
This commit is contained in:
parent
e355036efa
commit
34eef5fb9b
|
@ -76,12 +76,12 @@ type aliasResponder interface {
|
||||||
|
|
||||||
// aliasJSONResponse dictates the field names and format of the JSON response for the alias web endpoint
|
// aliasJSONResponse dictates the field names and format of the JSON response for the alias web endpoint
|
||||||
type aliasJSONResponse struct {
|
type aliasJSONResponse struct {
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
Address string `json:"address"`
|
MultiserverAddress string `json:"multiserverAddress"`
|
||||||
RoomID string `json:"roomId"`
|
RoomID string `json:"roomId"`
|
||||||
UserID string `json:"userId"`
|
UserID string `json:"userId"`
|
||||||
Alias string `json:"alias"`
|
Alias string `json:"alias"`
|
||||||
Signature string `json:"signature"`
|
Signature string `json:"signature"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// handles JSON responses
|
// handles JSON responses
|
||||||
|
@ -104,12 +104,12 @@ func (json *aliasJSONResponder) UpdateRoomInfo(netInfo network.ServerEndpointDet
|
||||||
|
|
||||||
func (json aliasJSONResponder) SendConfirmation(alias roomdb.Alias) {
|
func (json aliasJSONResponder) SendConfirmation(alias roomdb.Alias) {
|
||||||
var resp = aliasJSONResponse{
|
var resp = aliasJSONResponse{
|
||||||
Status: "successful",
|
Status: "successful",
|
||||||
RoomID: json.netInfo.RoomID.Ref(),
|
RoomID: json.netInfo.RoomID.Ref(),
|
||||||
Address: json.netInfo.MultiserverAddress(),
|
MultiserverAddress: json.netInfo.MultiserverAddress(),
|
||||||
Alias: alias.Name,
|
Alias: alias.Name,
|
||||||
UserID: alias.Feed.Ref(),
|
UserID: alias.Feed.Ref(),
|
||||||
Signature: base64.StdEncoding.EncodeToString(alias.Signature),
|
Signature: base64.StdEncoding.EncodeToString(alias.Signature),
|
||||||
}
|
}
|
||||||
json.enc.Encode(resp)
|
json.enc.Encode(resp)
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,6 +65,7 @@ func TestAliasResolve(t *testing.T) {
|
||||||
r.NoError(err)
|
r.NoError(err)
|
||||||
a.Equal(testAlias.Signature, sigData)
|
a.Equal(testAlias.Signature, sigData)
|
||||||
a.Equal(ts.NetworkInfo.RoomID.Ref(), params.Get("roomId"))
|
a.Equal(ts.NetworkInfo.RoomID.Ref(), params.Get("roomId"))
|
||||||
|
a.Equal(ts.NetworkInfo.MultiserverAddress(), params.Get("multiserverAddress"))
|
||||||
|
|
||||||
// now as JSON
|
// now as JSON
|
||||||
jsonURL, err := routes.Get(router.CompleteAliasResolve).URL("alias", testAlias.Name)
|
jsonURL, err := routes.Get(router.CompleteAliasResolve).URL("alias", testAlias.Name)
|
||||||
|
@ -86,4 +87,5 @@ func TestAliasResolve(t *testing.T) {
|
||||||
a.Equal(testAlias.Signature, sigData2)
|
a.Equal(testAlias.Signature, sigData2)
|
||||||
a.Equal(testAlias.Feed.Ref(), ar.UserID, "wrong user feed on response")
|
a.Equal(testAlias.Feed.Ref(), ar.UserID, "wrong user feed on response")
|
||||||
a.Equal(ts.NetworkInfo.RoomID.Ref(), ar.RoomID, "wrong room feed on response")
|
a.Equal(ts.NetworkInfo.RoomID.Ref(), ar.RoomID, "wrong room feed on response")
|
||||||
|
a.Equal(ts.NetworkInfo.MultiserverAddress(), ar.MultiserverAddress)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue