Sdk 2246 go retrieve session

_examples/idv/models.sessionspec.go

@@ -212,3 +212,56 @@ func buildDBSSessionSpec() (sessionSpec *create.SessionSpecification, err error)
 	}
 	return sessionSpec, nil
 }
+
+func buildDigitalIdentitySessionSpec() (sessionSpec *create.SessionSpecification, err error) {
+	var sdkConfig *create.SDKConfig
+	sdkConfig, err = create.NewSdkConfigBuilder().
+		WithAllowsCameraAndUpload().
+		WithPrimaryColour("#2d9fff").
+		WithSecondaryColour("#FFFFFF").
+		WithFontColour("#FFFFFF").
+		WithLocale("en-GB").
+		WithPresetIssuingCountry("GBR").
+		WithSuccessUrl("https://localhost:8080/success").
+		WithErrorUrl("https://localhost:8080/error").
+		WithPrivacyPolicyUrl("https://localhost:8080/privacy-policy").
+		Build()
+	if err != nil {
+		return nil, err
+	}
+
+	identityProfile := []byte(`{
+		"trust_framework": "UK_TFIDA",
+		"scheme": {
+    		"type": "RTW"
+		}
+	}`)
+
+	ttl := time.Hour * 24 * 30
+	importToken, err := create.NewImportTokenBuilder().
+		WithTTL(int(ttl.Seconds())).
+		Build()
+	if err != nil {
+		return nil, err
+	}
+
+	subject := []byte(`{
+		"subject_id": "unique-user-id-for-examples"
+	}`)
+
+	sessionSpec, err = create.NewSessionSpecificationBuilder().
+		WithClientSessionTokenTTL(6000).
+		WithResourcesTTL(900000).
+		WithUserTrackingID("some-tracking-id").
+		WithSDKConfig(sdkConfig).
+		WithIdentityProfileRequirements(identityProfile).
+		WithCreateIdentityProfilePreview(true).
+		WithSubject(subject).
+		WithImportToken(importToken).
+		Build()
+
+	if err != nil {
+		return nil, err
+	}
+	return sessionSpec, nil
+}

_examples/idv/routes.go

@@ -12,4 +12,5 @@ func initializeRoutes() {
 	router.GET("/success", showSuccessPage)
 	router.GET("/media", getMedia)
 	router.GET("/privacy-policy", showPrivacyPolicyPage)
+	router.GET("/digital-identity", showDigitalPage)
 }

client_test.go

@@ -26,10 +26,10 @@ func (mock *mockHTTPClient) Do(request *http.Request) (*http.Response, error) {
 }
 
 func TestNewClient(t *testing.T) {
-	key, readErr := os.ReadFile("./test/test-key.pem")
-	assert.NilError(t, readErr)
+	key, err := os.ReadFile("./test/test-key.pem")
+	assert.NilError(t, err)
 
-	_, err := NewClient("some-sdk-id", key)
+	_, err = NewClient("some-sdk-id", key)
 	assert.NilError(t, err)
 }
 
@@ -48,11 +48,11 @@ func TestNewClient_KeyLoad_Failure(t *testing.T) {
 }
 
 func TestYotiClient_PerformAmlCheck(t *testing.T) {
-	key, readErr := os.ReadFile("./test/test-key.pem")
-	assert.NilError(t, readErr)
+	key, err := os.ReadFile("./test/test-key.pem")
+	assert.NilError(t, err)
 
-	client, clientErr := NewClient("some-sdk-id", key)
-	assert.NilError(t, clientErr)
+	client, err := NewClient("some-sdk-id", key)
+	assert.NilError(t, err)
 
 	client.HTTPClient = &mockHTTPClient{
 		do: func(*http.Request) (*http.Response, error) {
@@ -78,11 +78,11 @@ func TestYotiClient_PerformAmlCheck(t *testing.T) {
 }
 
 func TestYotiClient_CreateShareURL(t *testing.T) {
-	key, readErr := os.ReadFile("./test/test-key.pem")
-	assert.NilError(t, readErr)
+	key, err := os.ReadFile("./test/test-key.pem")
+	assert.NilError(t, err)
 
-	client, clientErr := NewClient("some-sdk-id", key)
-	assert.NilError(t, clientErr)
+	client, err := NewClient("some-sdk-id", key)
+	assert.NilError(t, err)
 
 	client.HTTPClient = &mockHTTPClient{
 		do: func(*http.Request) (*http.Response, error) {
@@ -93,11 +93,11 @@ func TestYotiClient_CreateShareURL(t *testing.T) {
 		},
 	}
 
-	policy, policyErr := (&dynamic.PolicyBuilder{}).WithFullName().WithWantedRememberMe().Build()
-	assert.NilError(t, policyErr)
+	policy, err := (&dynamic.PolicyBuilder{}).WithFullName().WithWantedRememberMe().Build()
+	assert.NilError(t, err)
 
-	scenario, scenarioErr := (&dynamic.ScenarioBuilder{}).WithPolicy(policy).Build()
-	assert.NilError(t, scenarioErr)
+	scenario, err := (&dynamic.ScenarioBuilder{}).WithPolicy(policy).Build()
+	assert.NilError(t, err)
 
 	result, err := client.CreateShareURL(&scenario)
 	assert.NilError(t, err)

digital_identity_client.go

@@ -9,7 +9,7 @@ import (
 	"github.com/getyoti/yoti-go-sdk/v3/requests"
 )
 
-const DefaultURL = "https://api.yoti.com/api/"
+const DefaultURL = "https://api.yoti.com/share/"
 
 // DigitalIdentityClient represents a client that can communicate with yoti and return information about Yoti users.
 type DigitalIdentityClient struct {
@@ -27,14 +27,14 @@ type DigitalIdentityClient struct {
 }
 
 // NewDigitalIdentityClient constructs a Client object
-func NewDigitalIdentityClient(sdkID string, key []byte) (*Client, error) {
+func NewDigitalIdentityClient(sdkID string, key []byte) (*DigitalIdentityClient, error) {
 	decodedKey, err := cryptoutil.ParseRSAKey(key)
 
 	if err != nil {
 		return nil, err
 	}
 
-	return &Client{
+	return &DigitalIdentityClient{
 		SdkID: sdkID,
 		Key:   decodedKey,
 	}, err
@@ -54,7 +54,7 @@ func (client *DigitalIdentityClient) getAPIURL() string {
 		return value
 	}
 
-	return apiDefaultURL
+	return DefaultURL
 }
 
 // GetSdkID gets the Client SDK ID attached to this client instance
@@ -63,6 +63,11 @@ func (client *DigitalIdentityClient) GetSdkID() string {
 }
 
 // CreateShareURL creates a QR code for a specified share session configuration.
-func (client *DigitalIdentityClient) CreateShareURL(shareSession *digitalidentity.ShareSession) (share digitalidentity.ShareURL, err error) {
+func (client *DigitalIdentityClient) CreateShareSession(shareSession *digitalidentity.ShareSession) (share digitalidentity.SessionResult, err error) {
 	return digitalidentity.CreateShareSession(client.HTTPClient, shareSession, client.GetSdkID(), client.getAPIURL(), client.Key)
 }
+
+// getSession creates a QR code for a specified share session configuration.
+func (client *DigitalIdentityClient) GetSession(sessionID string) (share digitalidentity.ShareSessionResult, err error) {
+	return digitalidentity.GetSession(client.HTTPClient, sessionID, client.GetSdkID(), client.getAPIURL(), client.Key)
+}

digital_identity_client_test.go

@@ -1,21 +1,19 @@
 package yoti
 
 import (
-	"io"
-	"net/http"
+	"fmt"
 	"os"
-	"strings"
 	"testing"
 
-	"github.com/getyoti/yoti-go-sdk/v3/dynamic"
+	"github.com/getyoti/yoti-go-sdk/v3/digitalidentity"
 	"gotest.tools/v3/assert"
 )
 
 func TestDigitalIDClient(t *testing.T) {
-	key, readErr := os.ReadFile("./test/test-key.pem")
-	assert.NilError(t, readErr)
+	key, err := os.ReadFile("./test/test-key.pem")
+	assert.NilError(t, err)
 
-	_, err := NewDigitalIdentityClient("some-sdk-id", key)
+	_, err = NewDigitalIdentityClient("some-sdk-id", key)
 	assert.NilError(t, err)
 }
 
@@ -34,28 +32,12 @@ func TestDigitalIDClient_KeyLoad_Failure(t *testing.T) {
 }
 
 func TestDigitalIDClient_CreateShareURL(t *testing.T) {
-	key, readErr := os.ReadFile("./test/test-key.pem")
-	assert.NilError(t, readErr)
-
-	client, clientErr := NewDigitalIdentityClient("some-sdk-id", key)
-	assert.NilError(t, clientErr)
-
-	client.HTTPClient = &mockHTTPClient{
-		do: func(*http.Request) (*http.Response, error) {
-			return &http.Response{
-				StatusCode: 201,
-				Body:       io.NopCloser(strings.NewReader(`{"qrcode":"https://code.yoti.com/some-qr","ref_id":"0"}`)),
-			}, nil
-		},
-	}
 
-	policy, policyErr := (&dynamic.PolicyBuilder{}).WithFullName().WithWantedRememberMe().Build()
-	assert.NilError(t, policyErr)
-
-	scenario, scenarioErr := (&dynamic.ScenarioBuilder{}).WithPolicy(policy).Build()
-	assert.NilError(t, scenarioErr)
+	policy, err := (&digitalidentity.PolicyBuilder{}).WithFullName().WithWantedRememberMe().Build()
+	assert.NilError(t, err)
 
-	result, err := client.CreateShareURL(&scenario)
+	session, err := (&digitalidentity.ShareSessionBuilder{}).WithPolicy(policy).Build()
 	assert.NilError(t, err)
-	assert.Equal(t, result.ShareURL, "https://code.yoti.com/some-qr")
+	fmt.Println(session)
+
 }

digitalidentity/service.go

@@ -10,7 +10,8 @@ import (
 	"github.com/getyoti/yoti-go-sdk/v3/yotierror"
 )
 
-const identitySesssionCreationEndpoint = "/v2/sessions"
+const identitySesssionCreationEndpoint = "v2/sessions"
+const identitySessionRetrieval = "v2/sessions/%s"
 
 // SessionResult contains the information about a created session
 type SessionResult struct {
@@ -20,26 +21,61 @@ type SessionResult struct {
 }
 
 // CreateShareSession creates session using the supplied session specification
-func CreateShareSession(httpClient requests.HttpClient, shareSession *ShareSession, clientSdkId, apiUrl string, key *rsa.PrivateKey) (share ShareURL, err error) {
+func CreateShareSession(httpClient requests.HttpClient, shareSession *ShareSession, clientSdkId, apiUrl string, key *rsa.PrivateKey) (share SessionResult, err error) {
 	endpoint := identitySesssionCreationEndpoint
 
 	payload, err := shareSession.MarshalJSON()
 	if err != nil {
 		return share, err
 	}
 
+	headers := requests.AuthHeader(clientSdkId)
+
 	request, err := requests.SignedRequest{
 		Key:        key,
 		HTTPMethod: http.MethodPost,
 		BaseURL:    apiUrl,
 		Endpoint:   endpoint,
-		Headers:    nil,
+		Headers:    headers,
 		Body:       payload,
 	}.Request()
 	if err != nil {
 		return share, err
 	}
 
+	response, err := requests.Execute(httpClient, request, ShareURLHTTPErrorMessages, yotierror.DefaultHTTPErrorMessages)
+	if err != nil {
+		//fmt.Printf("err 2:=> %s\n\r", err)
+		return share, err
+	}
+
+	defer response.Body.Close()
+
+	responseBytes, err := io.ReadAll(response.Body)
+	if err != nil {
+		return share, err
+	}
+
+	err = json.Unmarshal(responseBytes, &share)
+
+	return share, err
+}
+
+// GetSession get session info using the supplied sessionID
+func GetSession(httpClient requests.HttpClient, sessionID string, clientSdkId, apiUrl string, key *rsa.PrivateKey) (share ShareSessionResult, err error) {
+	endpoint := identitySesssionCreationEndpoint
+	headers := requests.AuthHeader(clientSdkId)
+	request, err := requests.SignedRequest{
+		Key:        key,
+		HTTPMethod: http.MethodGet,
+		BaseURL:    apiUrl,
+		Endpoint:   endpoint,
+		Headers:    headers,
+	}.Request()
+	if err != nil {
+		return share, err
+	}
+
 	response, err := requests.Execute(httpClient, request, ShareURLHTTPErrorMessages, yotierror.DefaultHTTPErrorMessages)
 	if err != nil {
 		return share, err