working commit

This commit is contained in:
2026-03-09 12:37:54 +02:00
parent dda76dc0f1
commit 4801aa26cf
15 changed files with 431 additions and 307 deletions
+277
View File
@@ -0,0 +1,277 @@
/*
* Copyright 2026 Oleg Borodin <onborodin@gmail.com>
*
* This work is published and licensed under a Creative Commons
* Attribution-NonCommercial-NoDerivatives 4.0 International License.
*
* Distribution of this work is permitted, but commercial use and
* modifications are strictly prohibited.
*/
package client
import (
"context"
"encoding/json"
"fmt"
"mstore/app/accoper"
"mstore/app/handler"
"mstore/pkg/descr"
)
func (cli *Client) CreateAccount(ctx context.Context, hosturi, username, password string) (string, error) {
var err error
var res string
apiuri, err := setApiPath(hosturi, "/v3/api/account/create")
if err != nil {
return res, err
}
operParams := accoper.CreateAccountParams{
Username: username,
Password: password,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return res, err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apiuri, paramsJson)
if err != nil {
return res, err
}
operRes := handler.NewResponse[accoper.CreateAccountResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return res, err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return res, err
}
res = operRes.Result.AccountID
return res, err
}
func (cli *Client) GetAccountByID(ctx context.Context, hosturi, accountID string) (*descr.AccountShort, error) {
var err error
res := &descr.AccountShort{}
apipath, err := setApiPath(hosturi, "/v3/api/account/get")
if err != nil {
return res, err
}
operParams := accoper.GetAccountParams{
AccountID: accountID,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return res, err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
if err != nil {
return res, err
}
operRes := handler.NewResponse[accoper.GetAccountResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return res, err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return res, err
}
res = operRes.Result.Account
return res, err
}
func (cli *Client) GetAccountByName(ctx context.Context, hosturi, username string) (*descr.AccountShort, error) {
var err error
res := &descr.AccountShort{}
apipath, err := setApiPath(hosturi, "/v3/api/account/get")
if err != nil {
return res, err
}
operParams := accoper.GetAccountParams{
Username: username,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return res, err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
if err != nil {
return res, err
}
operRes := handler.NewResponse[accoper.GetAccountResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return res, err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return res, err
}
res = operRes.Result.Account
return res, err
}
func (cli *Client) UpdateAccountByID(ctx context.Context, hosturi string, accountID, newUsername, newPassword string) error {
var err error
apipath, err := setApiPath(hosturi, "/v3/api/account/update")
if err != nil {
return err
}
operParams := accoper.UpdateAccountParams{
AccountID: accountID,
NewUsername: newUsername,
NewPassword: newPassword,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
if err != nil {
return err
}
operRes := handler.NewResponse[accoper.UpdateAccountResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return err
}
return err
}
func (cli *Client) UpdateAccountByName(ctx context.Context, hosturi, username, newUsername, newPassword string) error {
var err error
apipath, err := setApiPath(hosturi, "/v3/api/account/update")
if err != nil {
return err
}
operParams := accoper.UpdateAccountParams{
Username: username,
NewUsername: newUsername,
NewPassword: newPassword,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
if err != nil {
return err
}
operRes := handler.NewResponse[accoper.UpdateAccountResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return err
}
return err
}
func (cli *Client) DeleteAccountByName(ctx context.Context, hosturi, username string) error {
var err error
apipath, err := setApiPath(hosturi, "/v3/api/account/delete")
if err != nil {
return err
}
operParams := accoper.DeleteAccountParams{
Username: username,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
if err != nil {
return err
}
operRes := handler.NewResponse[accoper.DeleteAccountResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return err
}
return err
}
func (cli *Client) DeleteAccountByID(ctx context.Context, hosturi, accountID string) error {
var err error
apipath, err := setApiPath(hosturi, "/v3/api/account/delete")
if err != nil {
return err
}
operParams := accoper.DeleteAccountParams{
AccountID: accountID,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
if err != nil {
return err
}
operRes := handler.NewResponse[accoper.DeleteAccountResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return err
}
return err
}
func (cli *Client) ListAccounts(ctx context.Context, hosturi string) ([]descr.AccountShort, error) {
var err error
res := make([]descr.AccountShort, 0)
apipath, err := setApiPath(hosturi, "/v3/api/accounts/list")
if err != nil {
return res, err
}
operParams := accoper.ListAccountsParams{}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return res, err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
if err != nil {
return res, err
}
operRes := handler.NewResponse[accoper.ListAccountsResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return res, err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return res, err
}
res = operRes.Result.Accounts
return res, err
}
+251
View File
@@ -0,0 +1,251 @@
/*
* Copyright 2026 Oleg Borodin <onborodin@gmail.com>
*
* This work is published and licensed under a Creative Commons
* Attribution-NonCommercial-NoDerivatives 4.0 International License.
*
* Distribution of this work is permitted, but commercial use and
* modifications are strictly prohibited.
*/
package client
import (
"context"
"encoding/json"
"fmt"
"mstore/app/accoper"
"mstore/app/handler"
"mstore/pkg/descr"
)
func (cli *Client) CreateGrantByAccountID(ctx context.Context, hosturi string, accountID, right, pattern string) (string, error) {
var err error
var res string
apiuri, err := setApiPath(hosturi, "/v3/api/grant/create")
if err != nil {
return res, err
}
operParams := accoper.CreateGrantParams{
AccountID: accountID,
Right: right,
Pattern: pattern,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return res, err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apiuri, paramsJson)
if err != nil {
return res, err
}
operRes := handler.NewResponse[accoper.CreateGrantResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return res, err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return res, err
}
res = operRes.Result.GrantID
return res, err
}
func (cli *Client) CreateGrantByUsername(ctx context.Context, hosturi, username string, right string, pattern string) (string, error) {
var err error
var res string
apiuri, err := setApiPath(hosturi, "/v3/api/grant/create")
if err != nil {
return res, err
}
operParams := accoper.CreateGrantParams{
Username: username,
Right: right,
Pattern: pattern,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return res, err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apiuri, paramsJson)
if err != nil {
return res, err
}
operRes := handler.NewResponse[accoper.CreateGrantResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return res, err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return res, err
}
res = operRes.Result.GrantID
return res, err
}
func (cli *Client) GetGrant(ctx context.Context, hosturi, grantID string) (*descr.Grant, error) {
var err error
res := &descr.Grant{}
apipath, err := setApiPath(hosturi, "/v3/api/grant/get")
if err != nil {
return res, err
}
operParams := accoper.GetGrantParams{
GrantID: grantID,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return res, err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
if err != nil {
return res, err
}
operRes := handler.NewResponse[accoper.GetGrantResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return res, err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return res, err
}
res = operRes.Result.Grant
return res, err
}
func (cli *Client) UpdateGrant(ctx context.Context, hosturi, grantID, newPattern string) error {
var err error
apipath, err := setApiPath(hosturi, "/v3/api/grant/update")
if err != nil {
return err
}
operParams := accoper.UpdateGrantParams{
GrantID: grantID,
NewPattern: newPattern,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
if err != nil {
return err
}
operRes := handler.NewResponse[accoper.UpdateGrantResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return err
}
return err
}
func (cli *Client) DeleteGrant(ctx context.Context, hosturi, grantID string) error {
var err error
apipath, err := setApiPath(hosturi, "/v3/api/grant/delete")
if err != nil {
return err
}
operParams := accoper.DeleteGrantParams{
GrantID: grantID,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
if err != nil {
return err
}
operRes := handler.NewResponse[accoper.DeleteGrantResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return err
}
return err
}
func (cli *Client) ListGrantsByAccountID(ctx context.Context, hosturi, accountID string) ([]descr.Grant, error) {
var err error
res := make([]descr.Grant, 0)
apipath, err := setApiPath(hosturi, "/v3/api/grants/list")
if err != nil {
return res, err
}
operParams := accoper.ListGrantsParams{
AccountID: accountID,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return res, err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
if err != nil {
return res, err
}
operRes := handler.NewResponse[accoper.ListGrantsResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return res, err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return res, err
}
res = operRes.Result.Grants
return res, err
}
func (cli *Client) ListGrantsByUsername(ctx context.Context, hosturi, username string) ([]descr.Grant, error) {
var err error
res := make([]descr.Grant, 0)
apipath, err := setApiPath(hosturi, "/v3/api/grants/list")
if err != nil {
return res, err
}
operParams := accoper.ListGrantsParams{
Username: username,
}
paramsJson, err := json.Marshal(operParams)
if err != nil {
return res, err
}
respBytes, err := doHTTPCall(ctx, cli.skipTLSVerify, apipath, paramsJson)
if err != nil {
return res, err
}
operRes := handler.NewResponse[accoper.ListGrantsResult]()
err = json.Unmarshal(respBytes, operRes)
if err != nil {
return res, err
}
if operRes.Error {
err = fmt.Errorf("%s", operRes.Message)
return res, err
}
res = operRes.Result.Grants
return res, err
}
+84
View File
@@ -0,0 +1,84 @@
/*
* Copyright 2026 Oleg Borodin <onborodin@gmail.com>
*
* This work is published and licensed under a Creative Commons
* Attribution-NonCommercial-NoDerivatives 4.0 International License.
*
* Distribution of this work is permitted, but commercial use and
* modifications are strictly prohibited.
*/
package client
import (
"bytes"
"context"
"crypto/tls"
"fmt"
"io"
"net/http"
"net/url"
"strings"
"mstore/pkg/auxhttp"
)
func setApiPath(base, apipath string) (string, error) {
var res string
if !strings.Contains(base, "://") {
base = "https://" + base
}
uri, err := url.Parse(base)
if err != nil {
return res, err
}
uri.Path = "/"
uri.Path, err = url.JoinPath(uri.Path, apipath)
if err != nil {
return res, err
}
res = uri.String()
return res, nil
}
func doHTTPCall(ctx context.Context, skipTLSVerify bool, apiuri string, reqBytes []byte) ([]byte, error) {
var err error
respBytes := make([]byte, 0)
apiuri, username, password, err := repackServiceURI(apiuri)
if err != nil {
return respBytes, err
}
reqBuffer := bytes.NewBuffer(reqBytes)
httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, apiuri, reqBuffer)
if err != nil {
return respBytes, err
}
httpReq.Header.Set("Content-Type", "application/json")
if username != "" && password != "" {
basicHeader := auxhttp.EncodeBasicAuth(username, password)
httpReq.Header.Add("Authorization", basicHeader)
}
transport := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: skipTLSVerify},
}
httpClient := &http.Client{
Transport: transport,
}
httpResp, err := httpClient.Do(httpReq)
if err != nil {
return respBytes, err
}
defer httpResp.Body.Close()
if httpResp.StatusCode != http.StatusOK {
err := fmt.Errorf("Wrong StatusCode header: %s", httpResp.Status)
return respBytes, err
}
respBuffer := bytes.NewBuffer(nil)
_, err = io.Copy(respBuffer, httpResp.Body)
if err != nil {
return respBytes, err
}
respBytes = respBuffer.Bytes()
return respBytes, err
}
+79
View File
@@ -0,0 +1,79 @@
/*
* Copyright 2026 Oleg Borodin <onborodin@gmail.com>
*
* This work is published and licensed under a Creative Commons
* Attribution-NonCommercial-NoDerivatives 4.0 International License.
*
* Distribution of this work is permitted, but commercial use and
* modifications are strictly prohibited.
*/
package client
import (
"context"
"crypto/tls"
"net/http"
"net/url"
"time"
"mstore/pkg/auxhttp"
)
func convertServiceURI(ref string) (string, error) {
var err error
var res string
const serviceAPI = "/v3/api/service/"
const serviceScheme = "https"
uri, err := url.Parse(ref)
if err != nil {
return res, err
}
uri.Path, err = url.JoinPath(serviceAPI, uri.Path)
if err != nil {
return res, err
}
uri.Scheme = serviceScheme
res = uri.String()
return res, err
}
func (cli *Client) ServiceHello(ctx context.Context, serviceuri string, timeout time.Duration) (bool, error) {
var res bool
var err error
ctx, _ = context.WithTimeout(ctx, timeout)
serviceuri, username, password, err := repackServiceURI(serviceuri)
if err != nil {
return res, err
}
serviceuri, err = convertServiceURI(serviceuri)
if err != nil {
return res, err
}
req, err := http.NewRequestWithContext(ctx, http.MethodGet, serviceuri, nil)
if err != nil {
return res, err
}
if username != "" && password != "" {
basic := auxhttp.EncodeBasicAuth(username, password)
req.Header.Add("Authorization", basic)
}
transport := &http.Transport{
TLSClientConfig: &tls.Config{
InsecureSkipVerify: true,
},
}
client := &http.Client{
Transport: transport,
}
resp, err := client.Do(req)
if err != nil {
return res, err
}
defer resp.Body.Close()
if resp.StatusCode == http.StatusOK {
res = true
}
return res, err
}