Skip to content

Commit a1d31ed

Browse files
committed
Misc
1 parent 182fc8c commit a1d31ed

File tree

6 files changed

+65
-2
lines changed

6 files changed

+65
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ setup:
2121
.PHONY: run-rpc
2222
## run: Run rpc example
2323
run-rpc:
24-
@go run $$(ls -1 _example/rpc/*.go | grep -v _test.go)
24+
@go run $$(ls -1 _examples/rpc/*.go | grep -v _test.go)
2525

2626
.PHONY: run-console
2727
## run: Run console example
2828
run-console:
29-
@go run $$(ls -1 _example/console/*.go | grep -v _test.go)
29+
@go run $$(ls -1 _examples/console/*.go | grep -v _test.go)
3030

3131
.PHONY: test
3232
## test: Runs go test with default values

_example/console/main.go renamed to _examples/console/main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ func main() {
5656
panic(err)
5757
}
5858

59+
if err = client.Logout(); err != nil {
60+
panic(err)
61+
}
62+
5963
os.Exit(0)
6064
}
6165

File renamed without changes.

module.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,15 @@ func (mm *ModuleManager) Info(moduleType ModuleType, moduleName string) (*rpc.Mo
152152
return mm.rpc.Module.Info(string(moduleType), moduleName)
153153
}
154154

155+
func (mm *ModuleManager) InfoHTML(moduleType ModuleType, moduleName string) (string, error) {
156+
r, err := mm.rpc.Module.InfoHTML(string(moduleType), moduleName)
157+
if err != nil {
158+
return "", err
159+
}
160+
161+
return string(*r), nil
162+
}
163+
155164
func (mm *ModuleManager) Execute(moduleType ModuleType, moduleName string, options map[string]interface{}) (*rpc.ModuleExecuteRes, error) {
156165
optMap := make(map[string]string)
157166
for k, v := range options {

rpc/auth.go

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,27 @@ func (a *auth) Logout() (*AuthLogoutRes, error) {
5454

5555
return res, nil
5656
}
57+
58+
type AuthTokenListReq struct {
59+
Method string
60+
Token string
61+
}
62+
63+
type AuthTokenListRes struct {
64+
Tokens []string `msgpack:"tokens"`
65+
}
66+
67+
// TokenList returns a list of authentication tokens, including the ones that are temporary, permanent, or stored in the backend
68+
func (m *module) TokenList(moduleName string, target int) (*AuthTokenListRes, error) {
69+
req := &AuthTokenListReq{
70+
Method: "auth.token_list",
71+
Token: m.rpc.Token(),
72+
}
73+
74+
var res *AuthTokenListRes
75+
if err := m.rpc.Call(req, &res); err != nil {
76+
return nil, err
77+
}
78+
79+
return res, nil
80+
}

rpc/module.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,32 @@ func (m *module) Info(moduleType, moduleName string) (*ModuleInfoRes, error) {
401401
return res, nil
402402
}
403403

404+
type ModuleInfoHTMLReq struct {
405+
Method string
406+
Token string
407+
ModuleType string
408+
ModuleName string
409+
}
410+
411+
type ModuleInfoHTMLRes string
412+
413+
// InfoHTML returns detailed information about a module in HTML
414+
func (m *module) InfoHTML(moduleType, moduleName string) (*ModuleInfoHTMLRes, error) {
415+
req := &ModuleInfoHTMLReq{
416+
Method: "module.info_html",
417+
Token: m.rpc.Token(),
418+
ModuleType: moduleType,
419+
ModuleName: moduleName,
420+
}
421+
422+
var res *ModuleInfoHTMLRes
423+
if err := m.rpc.Call(req, &res); err != nil {
424+
return nil, err
425+
}
426+
427+
return res, nil
428+
}
429+
404430
type ModuleOptionsReq struct {
405431
Method string
406432
Token string

0 commit comments

Comments
 (0)