Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: change new zvault wallet creation response #1759

Open
wants to merge 2 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions core/client/zauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,12 @@ func CallZauthDelete(serverAddr, token, clientID string) error {
return nil
}

func CallZvaultNewWallet(serverAddr, token string) error {
func CallZvaultNewWallet(serverAddr, token string) (string, error) {
endpoint := serverAddr + "/wallet"

req, err := http.NewRequest("POST", endpoint, nil)
if err != nil {
return errors.Wrap(err, "failed to create HTTP request")
return "", errors.Wrap(err, "failed to create HTTP request")
}

req.Header.Set("Content-Type", "application/json")
Expand All @@ -206,20 +206,25 @@ func CallZvaultNewWallet(serverAddr, token string) error {
client := &http.Client{}
resp, err := client.Do(req)
if err != nil {
return errors.Wrap(err, "failed to send HTTP request")
return "", errors.Wrap(err, "failed to send HTTP request")
}
defer resp.Body.Close()

if resp.StatusCode != http.StatusOK {
errMsg, _ := io.ReadAll(resp.Body)
if len(errMsg) > 0 {
return errors.Errorf("code: %d, err: %s", resp.StatusCode, string(errMsg))
return "", errors.Errorf("code: %d, err: %s", resp.StatusCode, string(errMsg))
}

return errors.Errorf("code: %d", resp.StatusCode)
return "", errors.Errorf("code: %d", resp.StatusCode)
}

return nil
d, err := io.ReadAll(resp.Body)
if err != nil {
return "", errors.Wrap(err, "failed to read response body")
}

return string(d), nil
}

func CallZvaultNewSplit(serverAddr, token, clientID string) error {
Expand Down Expand Up @@ -351,6 +356,9 @@ func CallZvaultStoreKeyString(serverAddr, token, privateKey string) error {
return errors.Wrap(err, "failed to create HTTP request")
}

req.Header.Set("Content-Type", "application/json")
req.Header.Set("X-Jwt-Token", token)

client := &http.Client{}
resp, err := client.Do(req)
if err != nil {
Expand Down
5 changes: 3 additions & 2 deletions wasmsdk/auth_txn.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ package main

import (
"fmt"
"github.com/0chain/gosdk/core/client"
"syscall/js"

"github.com/0chain/gosdk/core/client"

"github.com/0chain/gosdk/core/sys"
"github.com/0chain/gosdk/wasmsdk/jsbridge"
)
Expand Down Expand Up @@ -47,7 +48,7 @@ func zauthRetrieveKey(clientID, peerPublicKey, serverAddr, token string) (string
}

// zvaultNewWallet generates new wallet
func zvaultNewWallet(serverAddr, token string) error {
func zvaultNewWallet(serverAddr, token string) (string, error) {
return client.CallZvaultNewWallet(serverAddr, token)
}

Expand Down
Loading