Merge pull request #1225 from jolocom/feature/#1222-demo-ceredential-…

…exchange Feature/#1222 demo ceredential exchange
jolocom · Feb 18, 2019 · 6d6a768 · 6d6a768
2 parents 42cce76 + ac7e6d3
commit 6d6a768
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/actions/payment/index.ts b/src/actions/payment/index.ts
@@ -26,9 +26,20 @@ export const clearPaymentRequest = () => {
 }
 
 export const cancelPaymentRequest = () => {
-  return (dispatch: Dispatch<AnyAction>) => {
+  return (dispatch: Dispatch<AnyAction>, getState: Function) => {
+    const { callbackURL } = getState().payment.activePaymentRequest
     dispatch(clearPaymentRequest())
-    dispatch(navigationActions.navigatorReset({ routeName: routeList.Home }))
+
+    /**
+     * This needs to be cleaned up after demo
+     * TODO: consolidate routing back to callbackURL for deep linking for payment & sso
+     */
+    if (callbackURL.includes('http')) {
+      dispatch(navigationActions.navigatorReset({ routeName: routeList.Home }))
+    } else {
+      const url = callbackURL + Buffer.from(JSON.stringify({token: false})).toString('base64')
+      Linking.openURL(url)
+    }
   }
 }
 

diff --git a/src/actions/sso/index.ts b/src/actions/sso/index.ts
@@ -126,11 +126,11 @@ interface AttributeSummary {
 
 export const consumeCredentialRequest = (decodedCredentialRequest: JSONWebToken<CredentialRequest>) => {
   return async (dispatch: Dispatch<AnyAction>, getState: Function, backendMiddleware: BackendMiddleware) => {
-    const { storageLib, identityWallet } = backendMiddleware
+    const { storageLib } = backendMiddleware
     const { did } = getState().account.did.toJS()
 
     try {
-      await identityWallet.validateJWT(decodedCredentialRequest)
+      // await identityWallet.validateJWT(decodedCredentialRequest)
       const requestedTypes = decodedCredentialRequest.interactionToken.requestedCredentialTypes
       const attributesForType = await Promise.all<AttributeSummary>(requestedTypes.map(storageLib.get.attributesByType))