Merge pull request #64 from skyflowapi/release/23.10.2

SK-944, SK-1122, SK-562  Release/23.10.2 Signed Data tokens Reveal Support.

Author: yaswanth-pula-skyflow

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.5.0] - 2023-10-10
+### Added
+- reveal support for signed data tokens.
+- `valueType` in reveal response.
+### Fixed
+- removed trimming of spaces in event listeners state value.
+## [1.4.0] - 2023-06-30
+### Added
+- Composable elements support.
 ## [1.3.0] - 2023-06-07
 ### Added
 -   `redaction` prop in reveal element component.

README.md

@@ -1208,7 +1208,8 @@ export default App;
 {
   "success": [
     {
-      "token": "b63ec4e0-bbad-4e43-96e6-6bd50f483f75"
+      "token": "b63ec4e0-bbad-4e43-96e6-6bd50f483f75",
+      "valueType": "STRING"
     }
   ],
   "errors": [

__tests__/core-utils/reveal.test.js

@@ -13,7 +13,9 @@ import { RedactionType } from '../../src/utils/constants';
 describe('formatRecordsForClient fn test', () => {
   it('only success records', () => {
     const testInput = {
-      records: [{ token: '7402-2242-2342-232', value: '231' }],
+      records: [
+        { token: '7402-2242-2342-232', value: '231', valueType: 'STRING' },
+      ],
     };
     const fnResponse = formatRecordsForClient(testInput, {
       '7402-2242-2342-232': '231',
@@ -49,10 +51,12 @@ describe('formatRecordsForIframe fn test', () => {
 
   it('with records should return token value object', () => {
     const testInput = {
-      records: [{ token: '7823-323-242-2232', value: 'token_value' }],
+      records: [
+        { token: '7823-323-242-2232', value: 'token_value', elementId: '7823' },
+      ],
     };
     const fnResponse = formatRecordsForIframe(testInput);
-    expect(fnResponse).toStrictEqual({ '7823-323-242-2232': 'token_value' });
+    expect(fnResponse).toStrictEqual({ 7823: 'token_value' });
   });
 });
 

__tests__/core/RevealContainer.test.js

@@ -59,11 +59,29 @@ describe('test RevealConatiner Class', () => {
       });
   });
   it('test reveal method partial success', (done) => {
+    const setValueMock = jest.fn();
+    const setErrorMock = jest.fn();
+    const setValueMock2 = jest.fn();
+    const setErrorMock2 = jest.fn();
+
+    const revealElement1 = revealContainer.create({
+      token: 'random_token',
+      elementId: '123',
+    });
+    revealElement1.setMethods(setValueMock, setErrorMock);
+    const revealElement2 = revealContainer.create({
+      token: 'invalid_token',
+      elementId: '456',
+    });
+    revealElement2.setMethods(setValueMock2, setErrorMock2);
+
     const revealFailedVaule = {
       records: [
         {
           token: 'random_token',
           value: 'test_value',
+          valueType: 'STRING',
+          elementId: revealElement1.elementId,
         },
       ],
       errors: [
@@ -79,15 +97,7 @@ describe('test RevealConatiner Class', () => {
     jest
       .spyOn(revealUtils, 'fetchRecordsByTokenId')
       .mockRejectedValue(revealFailedVaule);
-    const setValueMock = jest.fn();
-    const setErrorMock = jest.fn();
-    const setValueMock2 = jest.fn();
-    const setErrorMock2 = jest.fn();
 
-    const revealElement1 = revealContainer.create({ token: 'random_token' });
-    revealElement1.setMethods(setValueMock, setErrorMock);
-    const revealElement2 = revealContainer.create({ token: 'invalid_token' });
-    revealElement2.setMethods(setValueMock2, setErrorMock2);
     revealContainer
       .reveal()
       .then((res) => {
@@ -100,7 +110,7 @@ describe('test RevealConatiner Class', () => {
           expect(setErrorMock2).toHaveBeenCalledTimes(1);
           expect(setValueMock2).toBeCalledTimes(0);
           expect(err).toEqual({
-            success: [{ token: 'random_token' }],
+            success: [{ token: 'random_token', valueType: 'STRING' }],
             errors: revealFailedVaule.errors,
           });
           done();

__tests__/utils/helper.test.js

@@ -116,6 +116,16 @@ describe('test getReturnValue function', () => {
   it('should return whole value when return value is true', () => {
     expect(getReturnValue('4111', true, ElementType.PIN)).toBe('4111');
   });
+
+  it('should return whole card number value when return value is true', () => {
+    expect(
+      getReturnValue('4111 1111 1111 1111', true, ElementType.CARD_NUMBER)
+    ).toBe('4111111111111111');
+  });
+
+  it('should return non string value when return value is true', () => {
+    expect(getReturnValue(1000, true, ElementType.INPUT_FIELD)).toBe(1000);
+  });
   it('should return empty string when return value is false,not a card element', () => {
     expect(getReturnValue('4111', false, ElementType.PIN)).toBe('');
   });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "skyflow-react-native",
-  "version": "1.4.0",
+  "version": "1.4.0-dev.96744de",
   "description": "Skyflow React Native SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

src/core-utils/reveal/index.ts

@@ -23,15 +23,20 @@ interface IApiSuccessResponse {
   ];
 }
 
-const formatForPureJsSuccess = (response: IApiSuccessResponse) => {
+const formatForPureJsSuccess = (
+  response: IApiSuccessResponse,
+  elementId: string
+) => {
   const currentResponseRecords = response.records;
   return currentResponseRecords.map((record) => ({
     token: record.token,
     value: record.value,
+    valueType: record?.valueType,
+    elementId,
   }));
 };
 
-const formatForPureJsFailure = (cause, tokenId: string) => ({
+const formatForPureJsFailure = (cause, tokenId: string, elementId: string) => ({
   token: tokenId,
   ...new SkyflowError(
     {
@@ -41,6 +46,7 @@ const formatForPureJsFailure = (cause, tokenId: string) => ({
     [],
     true
   ),
+  elementId,
 });
 
 const getTokenRecordsFromVault = (
@@ -86,13 +92,17 @@ export const fetchRecordsByTokenId = (
               )
                 .then(
                   (response: IApiSuccessResponse) => {
-                    const fieldsData = formatForPureJsSuccess(response);
+                    const fieldsData = formatForPureJsSuccess(
+                      response,
+                      tokenRecord.elementId
+                    );
                     apiResponse.push(...fieldsData);
                   },
                   (cause: any) => {
                     const errorData = formatForPureJsFailure(
                       cause,
-                      tokenRecord.token
+                      tokenRecord.token,
+                      tokenRecord.elementId
                     );
                     printLog(
                       errorData.error?.description || '',
@@ -142,20 +152,27 @@ export const formatRecordsForIframe = (response: IRevealResponseType) => {
   const result: Record<string, string> = {};
   if (response.records) {
     response.records.forEach((record) => {
-      result[record.token] = record.value;
+      result[record.elementId] = record.value;
     });
   }
   return result;
 };
 
 export const formatRecordsForClient = (response: IRevealResponseType) => {
+  let errorRecords;
+  if (response?.errors) {
+    errorRecords = response?.errors?.map((currentError) => ({
+      token: currentError?.token,
+      error: currentError?.error,
+    }));
+  }
   if (response.records) {
     const successRecords = response.records.map((record) => ({
       token: record.token,
+      valueType: record.valueType,
     }));
-    if (response.errors)
-      return { success: successRecords, errors: response.errors };
+    if (errorRecords) return { success: successRecords, errors: errorRecords };
     return { success: successRecords };
   }
-  return { errors: response.errors };
+  return { errors: errorRecords };
 };

src/core/RevealContainer/index.ts

@@ -24,6 +24,7 @@ import { parameterizedString, printLog } from '../../utils/logs-helper';
 import Container from '../Container';
 import RevealSkyflowElement from '../RevealSkyflowElement';
 import Skyflow from '../Skyflow';
+import uuid from 'react-native-uuid';
 
 const CLASS_NAME = 'RevealContainer';
 
@@ -44,12 +45,17 @@ class RevealContainer extends Container {
   }
 
   create(revealInput: RevealElementInput) {
+    const revealElementId = uuid.v4() as string;
     this.#revealRecords.push(revealInput);
     this.#tokensList.push({
       token: revealInput.token,
       redaction: revealInput?.redaction,
+      elementId: revealElementId,
+    });
+    const element = new RevealSkyflowElement({
+      ...revealInput,
+      elementId: revealElementId,
     });
-    const element = new RevealSkyflowElement(revealInput);
     this.#elementList.push(element);
     return element;
   }
@@ -105,9 +111,9 @@ class RevealContainer extends Container {
   private setRevealValuesInElements(revealedResult) {
     this.#elementList.forEach((current) => {
       if (
-        Object.prototype.hasOwnProperty.call(revealedResult, current.getToken())
+        Object.prototype.hasOwnProperty.call(revealedResult, current.elementId)
       ) {
-        const revealedValue = revealedResult[current.getToken()];
+        const revealedValue = revealedResult[current.elementId];
         current.setRevealValue(revealedValue);
       } else {
         current.setError();

src/core/RevealSkyflowElement/index.ts

@@ -10,10 +10,12 @@ class RevealSkyflowElement extends SkyflowElement {
   #token: string;
   setRevealValue: Function;
   #setErrorText: Function;
+  elementId: string;
 
   constructor(revealInput: RevealElementInput) {
     super();
     this.#token = revealInput.token;
+    this.elementId = revealInput.elementId;
   }
 
   setMethods(setValue, setErrorText) {

src/utils/constants/index.ts

@@ -97,7 +97,8 @@ export interface RevealElementInput {
   token: string;
   label?: string;
   altText?: string;
-  redaction?: RedactionType
+  redaction?: RedactionType;
+  elementId?: string;
 }
 
 export interface RevealElementProps {
@@ -119,7 +120,8 @@ export enum MessageType {
 
 export interface IRevealRecord {
   token: string;
-  redaction?: RedactionType
+  redaction?: RedactionType;
+  elementId?: string;
 }
 
 export interface IRevealResponseType {