Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: 0chain/gosdk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.19.10
Choose a base ref
...
head repository: 0chain/gosdk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: staging
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 2, 2025

  1. Copy the full SHA
    44ef55e View commit details

Commits on Mar 5, 2025

  1. fix: fixed bugs

    YarikRevich committed Mar 5, 2025
    Copy the full SHA
    204f285 View commit details

Commits on Mar 15, 2025

  1. Merge pull request #1759 from 0chain/feature/okta-zvault

    Feature: change new zvault wallet creation response
    dabasov authored Mar 15, 2025
    Copy the full SHA
    4523da7 View commit details
Showing with 17 additions and 8 deletions.
  1. +14 −6 core/client/zauth.go
  2. +3 −2 wasmsdk/auth_txn.go
20 changes: 14 additions & 6 deletions core/client/zauth.go
Original file line number Diff line number Diff line change
@@ -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")
@@ -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 {
@@ -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 {
5 changes: 3 additions & 2 deletions wasmsdk/auth_txn.go
Original file line number Diff line number Diff line change
@@ -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"
)
@@ -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)
}