Skip to content

Commit 4523da7

Browse files
authored
Merge pull request #1759 from 0chain/feature/okta-zvault
Feature: change new zvault wallet creation response
2 parents c46725e + 204f285 commit 4523da7

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

core/client/zauth.go

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,12 @@ func CallZauthDelete(serverAddr, token, clientID string) error {
192192
return nil
193193
}
194194

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

198198
req, err := http.NewRequest("POST", endpoint, nil)
199199
if err != nil {
200-
return errors.Wrap(err, "failed to create HTTP request")
200+
return "", errors.Wrap(err, "failed to create HTTP request")
201201
}
202202

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

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

219-
return errors.Errorf("code: %d", resp.StatusCode)
219+
return "", errors.Errorf("code: %d", resp.StatusCode)
220220
}
221221

222-
return nil
222+
d, err := io.ReadAll(resp.Body)
223+
if err != nil {
224+
return "", errors.Wrap(err, "failed to read response body")
225+
}
226+
227+
return string(d), nil
223228
}
224229

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

359+
req.Header.Set("Content-Type", "application/json")
360+
req.Header.Set("X-Jwt-Token", token)
361+
354362
client := &http.Client{}
355363
resp, err := client.Do(req)
356364
if err != nil {

wasmsdk/auth_txn.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ package main
55

66
import (
77
"fmt"
8-
"github.com/0chain/gosdk/core/client"
98
"syscall/js"
109

10+
"github.com/0chain/gosdk/core/client"
11+
1112
"github.com/0chain/gosdk/core/sys"
1213
"github.com/0chain/gosdk/wasmsdk/jsbridge"
1314
)
@@ -47,7 +48,7 @@ func zauthRetrieveKey(clientID, peerPublicKey, serverAddr, token string) (string
4748
}
4849

4950
// zvaultNewWallet generates new wallet
50-
func zvaultNewWallet(serverAddr, token string) error {
51+
func zvaultNewWallet(serverAddr, token string) (string, error) {
5152
return client.CallZvaultNewWallet(serverAddr, token)
5253
}
5354

0 commit comments

Comments
 (0)