updates

Ulbora · Jun 5, 2021 · 6007acc · 6007acc
1 parent 5cb931a
commit 6007acc
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 30 deletions.
diff --git a/coverage.out b/coverage.out
@@ -1,4 +1,25 @@
 mode: set
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:44.34,49.2 4 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:52.44,54.21 2 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:54.21,56.3 1 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:60.44,62.2 1 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:65.51,86.2 14 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:89.57,113.24 18 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:129.2,129.13 1 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:113.24,125.3 11 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:125.8,127.3 1 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:133.66,134.21 1 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:134.21,139.3 4 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:142.83,143.21 1 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:143.21,149.3 5 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:153.75,155.2 1 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:158.53,162.16 4 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:165.2,165.12 1 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:162.16,164.3 1 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:169.43,171.53 2 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:174.2,174.12 1 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:171.53,173.3 1 1
+github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:178.39,180.2 1 1
 github.com/Ulbora/Six910BTCPayServerPlugin/mockBTCPayClient.go:19.44,21.2 1 1
 github.com/Ulbora/Six910BTCPayServerPlugin/mockBTCPayClient.go:24.51,26.2 1 1
 github.com/Ulbora/Six910BTCPayServerPlugin/mockBTCPayClient.go:29.49,31.2 1 1
@@ -9,23 +30,3 @@ github.com/Ulbora/Six910BTCPayServerPlugin/mockBTCPayClient.go:49.94,51.2 1 1
 github.com/Ulbora/Six910BTCPayServerPlugin/mockBTCPayClient.go:54.82,56.2 1 1
 github.com/Ulbora/Six910BTCPayServerPlugin/mockBTCPayClient.go:59.77,61.2 1 1
 github.com/Ulbora/Six910BTCPayServerPlugin/mockBTCPayClient.go:64.86,66.2 1 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:44.34,49.2 4 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:52.44,54.21 2 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:54.21,56.3 1 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:60.44,62.2 1 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:65.51,86.2 14 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:89.57,112.24 17 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:115.2,126.13 11 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:112.24,114.3 1 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:130.66,131.21 1 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:131.21,136.3 4 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:139.83,140.21 1 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:140.21,146.3 5 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:150.75,152.2 1 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:155.53,159.16 4 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:162.2,162.12 1 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:159.16,161.3 1 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:166.43,168.53 2 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:171.2,171.12 1 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:168.53,170.3 1 1
-github.com/Ulbora/Six910BTCPayServerPlugin/plugin.go:175.39,177.2 1 1
diff --git a/plugin.go b/plugin.go
@@ -96,6 +96,7 @@ func (p *PayPlugin) NewPairConnect(host string) *BTCPay {
 	pub := cc.GetPublicKey(kp)
 	p.log.Debug("private key: ", pkh)
 	p.log.Debug("public key: ", pub)
+	p.log.Debug("host: ", host)
 
 	p.log.Debug("client: ", p.Client)
 
@@ -111,17 +112,19 @@ func (p *PayPlugin) NewPairConnect(host string) *BTCPay {
 	var pairingURL string
 	if len(resp.Data) > 0 {
 		pairingURL = p.Client.GetPairingCodeRequest(resp.Data[0].ParingCode)
+		p.log.Debug("ClientID: ", p.Client.GetClientID())
+		p.log.Debug("token: ", resp.Data[0].Token)
+		p.log.Debug("pairing url: ", pairingURL)
+		rtn.ClientID = p.Client.GetClientID()
+		rtn.Host = host
+		rtn.PrivateKey = pkh
+		rtn.PublicKey = pub
+		rtn.Token = resp.Data[0].Token
+		rtn.PairingURL = pairingURL
+		p.token = resp.Data[0].Token
+	} else {
+		p.Client = nil
 	}
-	p.log.Debug("ClientID: ", p.Client.GetClientID())
-	p.log.Debug("token: ", resp.Data[0].Token)
-	p.log.Debug("pairing url: ", pairingURL)
-	rtn.ClientID = p.Client.GetClientID()
-	rtn.Host = host
-	rtn.PrivateKey = pkh
-	rtn.PublicKey = pub
-	rtn.Token = resp.Data[0].Token
-	rtn.PairingURL = pairingURL
-	p.token = resp.Data[0].Token
 
 	return &rtn
 

diff --git a/plugin_test.go b/plugin_test.go
@@ -49,6 +49,32 @@ func TestPayPlugin_Connect(t *testing.T) {
 
 }
 
+func TestPayPlugin_ConnectFail(t *testing.T) {
+	var ppi PayPlugin
+
+	p := ppi.New()
+
+	var mc MockBTCPayClient
+	mc.MockClientID = "eeeddd"
+	var tknr cl.TokenResponse
+	var tkn cl.TokenData
+	tkn.Token = "1123aaa"
+	tkn.ParingCode = "pa111"
+	//tknr.Data = []cl.TokenData{tkn}
+	mc.MockTokenResponse = &tknr
+	mc.MockPairingCodeURL = "http://test.com/pair/123"
+	p.SetClient(mc.New())
+
+	btc := p.NewPairConnect(testBaseURL)
+	fmt.Println("btc: ", *btc)
+	if btc.PrivateKey != "" || p.GetToken() != "" {
+		t.Fail()
+	}
+
+	// t.Fail()
+
+}
+
 func TestPayPlugin_NewClient(t *testing.T) {
 	var pkh = "74f522c6704e39d102db6ae98dfb286e11c678a76fa32c93cc50244e436d936f"
 	var pubk = "022709b094ef015db670278fb7bcbf90d35c5e3ed11094ce6ccd43f9458fc91c22"