SDK-2235:reduced complexity

getyoti · Dec 7, 2023 · 3da5372 · 3da5372
1 parent a4775d2
commit 3da5372
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 26 deletions.
diff --git a/_examples/digitalidentity/main.go b/_examples/digitalidentity/main.go
@@ -68,6 +68,7 @@ func generateSession(w http.ResponseWriter, r *http.Request) {
 	didClient, err := initialiseDigitalIdentityClient()
 	if err != nil {
 		fmt.Fprintf(w, string("Client could't be generated"))
+		return
 	}
 
 	sessionReq, err := buildDigitalIdentitySessionReq()

diff --git a/consts/version.go b/consts/version.go
@@ -2,5 +2,5 @@ package consts
 
 const (
 	SDKIdentifier        = "Go"
-	SDKVersionIdentifier = "3.12.0"
+	SDKVersionIdentifier = "3.9.0"
 )
diff --git a/digitalidentity/requests/signed_message_test.go b/digitalidentity/requests/signed_message_test.go
@@ -80,7 +80,7 @@ func TestRequestShouldBuildForValid(t *testing.T) {
 	assert.Check(t, urlCheck)
 	assert.Check(t, signed.Header.Get("X-Yoti-Auth-Digest") != "")
 	assert.Equal(t, signed.Header.Get("X-Yoti-SDK"), "Go")
-	assert.Equal(t, signed.Header.Get("X-Yoti-SDK-Version"), "3.12.0")
+	assert.Equal(t, signed.Header.Get("X-Yoti-SDK-Version"), "3.9.0")
 }
 
 func TestRequestShouldAddHeaders(t *testing.T) {

diff --git a/digitalidentity/service.go b/digitalidentity/service.go
@@ -3,6 +3,7 @@ package digitalidentity
 import (
 	"crypto/rsa"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -223,6 +224,10 @@ func GetShareReceipt(httpClient requests.HttpClient, receiptId string, clientSdk
 		return receipt, err
 	}
 
+	if err := validateReceiptResponse(receiptResponse); err != nil {
+		return receipt, err
+	}
+
 	itemKeyId := receiptResponse.WrappedItemKeyId
 
 	encryptedItemKeyResponse, err := getReceiptItemKey(httpClient, itemKeyId, clientSdkId, apiUrl, key)
@@ -235,19 +240,9 @@ func GetShareReceipt(httpClient requests.HttpClient, receiptId string, clientSdk
 		return receipt, fmt.Errorf("failed to unwrap receipt content key: %v", err)
 	}
 
-	aattr, err := cryptoutil.DecryptReceiptContent(receiptResponse.Content.Profile, receiptContentKey)
-	if err != nil {
-		return receipt, fmt.Errorf("failed to decrypt receipt content profile: %v", err)
-	}
-
-	aextra, err := cryptoutil.DecryptReceiptContent(receiptResponse.Content.ExtraData, receiptContentKey)
+	attrData, aextra, err := decryptReceiptContent(receiptResponse.Content, receiptContentKey)
 	if err != nil {
-		return receipt, fmt.Errorf("failed to decrypt receipt content extra data: %v", err)
-	}
-
-	attrData := &yotiprotoattr.AttributeList{}
-	if err := proto.Unmarshal(aattr, attrData); err != nil {
-		return receipt, fmt.Errorf("failed to unmarshal application attribute list: %v", err)
+		return receipt, err
 	}
 
 	applicationProfile := newApplicationProfile(attrData)
@@ -256,17 +251,9 @@ func GetShareReceipt(httpClient requests.HttpClient, receiptId string, clientSdk
 		return receipt, fmt.Errorf("failed to build application extra data: %v", err)
 	}
 
-	uattr, err := cryptoutil.DecryptReceiptContent(receiptResponse.OtherPartyContent.Profile, receiptContentKey)
-	if err != nil {
-		return receipt, fmt.Errorf("failed to decrypt other party receipt content profile: %v", err)
-	}
-	uextra, err := cryptoutil.DecryptReceiptContent(receiptResponse.OtherPartyContent.ExtraData, receiptContentKey)
+	uattrData, uextra, err := decryptReceiptContent(receiptResponse.OtherPartyContent, receiptContentKey)
 	if err != nil {
-		return receipt, fmt.Errorf("failed to decrypt other party receipt content extra data: %v", err)
-	}
-	uattrData := &yotiprotoattr.AttributeList{}
-	if err := proto.Unmarshal(uattr, uattrData); err != nil {
-		return receipt, fmt.Errorf("failed to unmarshal attribute list: %v", err)
+		return receipt, err
 	}
 
 	userProfile := newUserProfile(uattrData)
@@ -292,3 +279,36 @@ func GetShareReceipt(httpClient requests.HttpClient, receiptId string, clientSdk
 		Error: receiptResponse.Error,
 	}, nil
 }
+
+func validateReceiptResponse(receiptResponse ReceiptResponse) error {
+	if receiptResponse.Content == nil || len(receiptResponse.Content.Profile) == 0 {
+		return errors.New("received unexpectedly empty content or profile")
+	}
+	return nil
+}
+
+func decryptReceiptContent(content *Content, key []byte) (attrData *yotiprotoattr.AttributeList, aextra []byte, err error) {
+	aattr := []byte{}
+	if content != nil {
+		if len(content.Profile) > 0 {
+			aattr, err = cryptoutil.DecryptReceiptContent(content.Profile, key)
+			if err != nil {
+				return nil, nil, fmt.Errorf("failed to decrypt receipt content profile: %v", err)
+			}
+		}
+
+		if len(content.ExtraData) > 0 {
+			aextra, err = cryptoutil.DecryptReceiptContent(content.ExtraData, key)
+			if err != nil {
+				return nil, nil, fmt.Errorf("failed to decrypt receipt content extra data: %v", err)
+			}
+		}
+
+		attrData = &yotiprotoattr.AttributeList{}
+		if err := proto.Unmarshal(aattr, attrData); err != nil {
+			return nil, nil, fmt.Errorf("failed to unmarshal attribute list: %v", err)
+		}
+	}
+
+	return attrData, aextra, nil
+}
diff --git a/requests/signed_message_test.go b/requests/signed_message_test.go
@@ -80,7 +80,7 @@ func TestRequestShouldBuildForValid(t *testing.T) {
 	assert.Check(t, urlCheck)
 	assert.Check(t, signed.Header.Get("X-Yoti-Auth-Digest") != "")
 	assert.Equal(t, signed.Header.Get("X-Yoti-SDK"), "Go")
-	assert.Equal(t, signed.Header.Get("X-Yoti-SDK-Version"), "3.12.0")
+	assert.Equal(t, signed.Header.Get("X-Yoti-SDK-Version"), "3.9.0")
 }
 
 func TestRequestShouldAddHeaders(t *testing.T) {

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.organization = getyoti
 sonar.projectKey = getyoti:go
 sonar.projectName = Go SDK
-sonar.projectVersion = 3.12.0
+sonar.projectVersion = 3.9.0
 sonar.exclusions = **/yotiprotoattr/*.go,**/yotiprotocom/*.go,**/yotiprotoshare/*.go,**/**_test.go,_examples/**/*
 sonar.links.scm = https://github.com/getyoti/yoti-go-sdk
 sonar.host.url = https://sonarcloud.io