Merge pull request #190 from ong-bitcoin-argentina/VUS-159-Boot_token…

…_solution Boot_token_solution
ong-bitcoin-argentina · May 3, 2022 · ecb96e2 · ecb96e2
2 parents 4b522e4 + 8b24ae2
commit ecb96e2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/src/src/presentation/common/WarningModalVersion.tsx b/src/src/presentation/common/WarningModalVersion.tsx
@@ -37,7 +37,13 @@ export default class WarningModalVersion extends Component<WarningModalProps, {
             });
         }
     }
-
+
+    componentWillUnmount() {
+        // fix Warning: Can't perform a React state update on an unmounted component
+        this.setState = ()=>{
+            return;
+        };
+    }
 
     render() {
         const { modal } = commonStyles;

diff --git a/src/src/presentation/dashboard/common/CredentialCard.tsx b/src/src/presentation/dashboard/common/CredentialCard.tsx
@@ -100,7 +100,7 @@ export default class CredentialCard extends Component<CredentialCardProps, {}> {
 		);
 
 		return rowData.map((row, i) => (
-			<View style={styles.keyValueContainer}>
+			<View key={i} style={styles.keyValueContainer}>
 				{row.data?.map((item, index) => {
 					const effectiveValue = strings.credentialCard.formatValue(item.value);
 					return (

diff --git a/src/src/presentation/dashboard/vuIdentity/VuIdentitySubmitScreen.tsx b/src/src/presentation/dashboard/vuIdentity/VuIdentitySubmitScreen.tsx
@@ -153,13 +153,10 @@ class VuIdentitySubmitScreen extends NavigationEnabledComponent<VuIdentitySubmit
 				<DidiText.ValidateIdentity.Normal style={styles.descriptionHeader}> 
 				Estos son los datos que van a conformar su credencial de DNI.</DidiText.ValidateIdentity.Normal>
 					{documentDataKeys.map((key, index) => (
-						<>
 						<View key={index}>
 						<Text style={styles.itemTxt} >{strings.vuIdentity.submit.items[key]}</Text>
 						<Text style={styles.resultItemTxt}>{documentData[key]}</Text>
 						</View>
-
-						</>
 					))}
 				</View> 
 

diff --git a/src/src/presentation/util/appRouter.tsx b/src/src/presentation/util/appRouter.tsx
@@ -126,4 +126,18 @@ export const createTokenAuthorization = async (did: ActiveDid):Promise<string> =
 		"iss": did.did()
 	});
 
+};
+
+
+
+export const tokenAuthorization = async (did: ActiveDid):Promise<string> => {
+	const {address} = did;
+	const didEthr = `did:ethr:${address}`
+	const credentialsParams: Settings = {};
+	credentialsParams.signer = getSignerForHDPath(address);
+	credentialsParams.did = didEthr;
+	const cred = new Credentials(credentialsParams);
+	return cred.createVerification({
+		"iss": didEthr
+	});
 };
diff --git a/src/src/services/vuSecurity/checkValidateDni.ts b/src/src/services/vuSecurity/checkValidateDni.ts
@@ -1,17 +1,17 @@
 import { VUSecurityApiClient} from '@proyecto-didi/app-sdk';
 import { AppConfig } from '../../AppConfig';
 import { IReturnCheckValidateDni } from '../../model/VuCheckValidateDni';
-import { createTokenAuthorization } from '../../presentation/util/appRouter';
+import { tokenAuthorization } from '../../presentation/util/appRouter';
 import { ActiveDid } from '../../store/reducers/didReducer';
 
 
 const VUSecurity = ():VUSecurityApiClient => ( new VUSecurityApiClient(AppConfig.defaultServiceSettings.urlSecurity));
 
 export async function checkValidateDniVU(did: ActiveDid): Promise<IReturnCheckValidateDni> {    
-    const token = await createTokenAuthorization(did);
-    const didActived = await did?.did();
     try {
-    return await VUSecurity().checkValidateDni(didActived as string,token); 
+    const token = await tokenAuthorization(did);
+    const {address} = await did;
+    return await VUSecurity().checkValidateDni(`did:ethr:${address}`,token); 
     } catch (error) {
         return { 
             status: "error",