diff --git a/main.go b/main.go index f2a2c54..df4de87 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,7 @@ package main import ( "context" + "encoding/json" "errors" "fmt" "oc-auth/conf" @@ -141,8 +142,8 @@ func generateSelfPeer() error { // create a new peer o := oclib.GetConfLoader() peer := &peer.Peer{ - Url: o.GetStringDefault("HOSTNAME", "http://localhost"), - NATSUrl: oclib.GetConfig().NATSUrl, + APIUrl: o.GetStringDefault("HOSTNAME", "http://localhost"), + NATSAddress: oclib.GetConfig().NATSUrl, AbstractObject: utils.AbstractObject{ Name: o.GetStringDefault("NAME", "local"), }, @@ -179,15 +180,24 @@ func discovery() { continue } conn.BindRole(conf.GetConfig().AdminRole, "admin") - addPermissions := func(m map[string]interface{}) { - for k, v := range m { - for _, p := range v.([]interface{}) { + addPermissions := func(m tools.NATSResponse) { + var resp map[string][]interface{} + json.Unmarshal(m.Payload, &resp) + for k, v := range resp { + for _, p := range v { conn.CreatePermission(k, p.(string), true) } } } api.ListenRouter(addPermissions) - tools.NewNATSCaller().SetNATSPub("api", tools.DISCOVERY, map[string]interface{}{}) + b, _ := json.Marshal(map[string]interface{}{}) + tools.NewNATSCaller().SetNATSPub(tools.DISCOVERY, tools.NATSResponse{ + FromApp: "oc-auth", + Datatype: -1, + User: "root", + Method: tools.GET.EnumIndex(), + Payload: b, + }) break } }