Fix/sign auth

core/client/set.go

@@ -55,7 +55,7 @@ type InitSdkOptions struct {
 
 func init() {
 	sys.Sign = signHash
-	sys.SignWithAuth = signHash
+	sys.SignWithAuth = signHashWithAuth
 
 	sigC <- struct{}{}
 
@@ -95,6 +95,42 @@ var SignFn = func(hash string) (string, error) {
 	return ss.Sign(hash)
 }
 
+func signHashWithAuth(hash, signatureScheme string, keys []sys.KeyPair) (string, error) {
+	sig, err := sys.Sign(hash, signatureScheme, keys)
+	if err != nil {
+		return "", fmt.Errorf("failed to sign with split key: %v", err)
+	}
+
+	data, err := json.Marshal(AuthMessage{
+		Hash:      hash,
+		Signature: sig,
+		ClientID:  client.wallet.ClientID,
+	})
+	if err != nil {
+		return "", err
+	}
+
+	if sys.AuthCommon == nil {
+		return "", errors.New("authCommon is not set")
+	}
+
+	rsp, err := sys.AuthCommon(string(data))
+	if err != nil {
+		return "", err
+	}
+
+	var sigpk struct {
+		Sig string `json:"sig"`
+	}
+
+	err = json.Unmarshal([]byte(rsp), &sigpk)
+	if err != nil {
+		return "", err
+	}
+
+	return sigpk.Sig, nil
+}
+
 func signHash(hash string, signatureScheme string, keys []sys.KeyPair) (string, error) {
 	retSignature := ""
 	for _, kv := range keys {

zcncore/zauth.go → core/client/zauth.go

@@ -1,4 +1,4 @@
-package zcncore
+package client
 
 import (
 	"bytes"
@@ -7,7 +7,6 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/0chain/gosdk/core/client"
 	"github.com/0chain/gosdk/core/sys"
 	"github.com/pkg/errors"
 )
@@ -534,7 +533,7 @@ func ZauthSignTxn(serverAddr string) sys.AuthorizeFunc {
 			return "", errors.Wrap(err, "failed to create HTTP request")
 		}
 		req.Header.Set("Content-Type", "application/json")
-		c := client.GetClient()
+		c := GetClient()
 		pubkey := c.Keys[0].PublicKey
 		req.Header.Set("X-Peer-Public-Key", pubkey)
 
@@ -571,7 +570,7 @@ func ZauthAuthCommon(serverAddr string) sys.AuthorizeFunc {
 			return "", errors.Wrap(err, "failed to create HTTP request")
 		}
 
-		c := client.GetClient()
+		c := GetClient()
 		pubkey := c.Keys[0].PublicKey
 		req.Header.Set("Content-Type", "application/json")
 		req.Header.Set("X-Peer-Public-Key", pubkey)

wasmsdk/auth_txn.go

@@ -5,11 +5,11 @@ package main
 
 import (
 	"fmt"
+	"github.com/0chain/gosdk/core/client"
 	"syscall/js"
 
 	"github.com/0chain/gosdk/core/sys"
 	"github.com/0chain/gosdk/wasmsdk/jsbridge"
-	"github.com/0chain/gosdk/zcncore"
 )
 
 type AuthCallbackFunc func(msg string) string
@@ -38,54 +38,54 @@ func registerAuthorizer(this js.Value, args []js.Value) interface{} {
 func registerZauthServer(serverAddr string) {
 	fmt.Println("registerZauthServer...")
 	jsbridge.SetZauthServer(serverAddr)
-	sys.SetAuthorize(zcncore.ZauthSignTxn(serverAddr))
-	sys.SetAuthCommon(zcncore.ZauthAuthCommon(serverAddr))
+	sys.SetAuthorize(client.ZauthSignTxn(serverAddr))
+	sys.SetAuthCommon(client.ZauthAuthCommon(serverAddr))
 }
 
 func zauthRetrieveKey(clientID, peerPublicKey, serverAddr, token string) (string, error) {
-	return zcncore.CallZauthRetreiveKey(serverAddr, token, clientID, peerPublicKey)
+	return client.CallZauthRetreiveKey(serverAddr, token, clientID, peerPublicKey)
 }
 
 // zvaultNewWallet generates new wallet
 func zvaultNewWallet(serverAddr, token string) error {
-	return zcncore.CallZvaultNewWallet(serverAddr, token)
+	return client.CallZvaultNewWallet(serverAddr, token)
 }
 
 // zvaultNewSplit generates new split key for saved wallet
 func zvaultNewSplit(clientID, serverAddr, token string) error {
-	return zcncore.CallZvaultNewSplit(serverAddr, token, clientID)
+	return client.CallZvaultNewSplit(serverAddr, token, clientID)
 }
 
 func zvaultRetrieveRestrictions(peerPublicKey, serverAddr, token string) (string, error) {
-	return zcncore.CallZvaultRetrieveRestrictions(serverAddr, token, peerPublicKey)
+	return client.CallZvaultRetrieveRestrictions(serverAddr, token, peerPublicKey)
 }
 
 func zvaultUpdateRestrictions(clientID, peerPublicKey, serverAddr, token string, restrictions []string) error {
-	return zcncore.CallZvaultUpdateRestrictions(serverAddr, token, clientID, peerPublicKey, restrictions)
+	return client.CallZvaultUpdateRestrictions(serverAddr, token, clientID, peerPublicKey, restrictions)
 }
 
 func zvaultStoreKey(serverAddr, token, privateKey string) error {
-	return zcncore.CallZvaultStoreKeyString(serverAddr, token, privateKey)
+	return client.CallZvaultStoreKeyString(serverAddr, token, privateKey)
 }
 
 func zvaultRetrieveKeys(serverAddr, token, clientID string) (string, error) {
-	return zcncore.CallZvaultRetrieveKeys(serverAddr, token, clientID)
+	return client.CallZvaultRetrieveKeys(serverAddr, token, clientID)
 }
 
 func zvaultRevokeKey(serverAddr, token, clientID, publicKey string) error {
-	return zcncore.CallZvaultRevokeKey(serverAddr, token, clientID, publicKey)
+	return client.CallZvaultRevokeKey(serverAddr, token, clientID, publicKey)
 }
 
 func zvaultDeletePrimaryKey(serverAddr, token, clientID string) error {
-	return zcncore.CallZvaultDeletePrimaryKey(serverAddr, token, clientID)
+	return client.CallZvaultDeletePrimaryKey(serverAddr, token, clientID)
 }
 
 func zvaultRetrieveWallets(serverAddr, token string) (string, error) {
-	return zcncore.CallZvaultRetrieveWallets(serverAddr, token)
+	return client.CallZvaultRetrieveWallets(serverAddr, token)
 }
 
 func zvaultRetrieveSharedWallets(serverAddr, token string) (string, error) {
-	return zcncore.CallZvaultRetrieveSharedWallets(serverAddr, token)
+	return client.CallZvaultRetrieveSharedWallets(serverAddr, token)
 }
 
 func registerAuthCommon(this js.Value, args []js.Value) interface{} {

wasmsdk/proxy.go

@@ -84,7 +84,7 @@ func main() {
 						return "", fmt.Errorf("failed to sign with split key: %v", err)
 					}
 
-					data, err := json.Marshal(zcncore.AuthMessage{
+					data, err := json.Marshal(client.AuthMessage{
 						Hash:      hash,
 						Signature: sig,
 						ClientID:  client.Wallet().ClientID,
@@ -381,7 +381,7 @@ func main() {
 						return "", fmt.Errorf("failed to sign with split key: %v", err)
 					}
 
-					data, err := json.Marshal(zcncore.AuthMessage{
+					data, err := json.Marshal(client.AuthMessage{
 						Hash:      hash,
 						Signature: sig,
 						ClientID:  client.GetClient().ClientID,

zcncore/get_data.go

@@ -137,8 +137,8 @@ func SetGeneralWalletInfo(jsonWallet, sigScheme string) error {
 
 // RegisterZauthServer registers zauth server callbacks for signing operations. Should be used for split key mode.
 func RegisterZauthServer(serverAddr string) {
-	sys.SetAuthorize(ZauthSignTxn(serverAddr))
-	sys.SetAuthCommon(ZauthAuthCommon(serverAddr))
+	sys.SetAuthorize(client.ZauthSignTxn(serverAddr))
+	sys.SetAuthCommon(client.ZauthAuthCommon(serverAddr))
 }
 
 // SetAuthUrl will be called by app to set zauth URL to SDK.