Merge pull request #50 from DIMO-Network/development

Development -> Main (Include SharedVehicles in Response)
DIMO-Network · Jan 23, 2025 · b69fe51 · b69fe51
2 parents 0cb333d + cca6106
commit b69fe51
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 36 deletions.
diff --git a/example-dimo-auth/dimo-network-login-with-dimo-0.0.16.tgz b/example-dimo-auth/dimo-network-login-with-dimo-0.0.16.tgz
diff --git a/example-dimo-auth/dimo-network-login-with-dimo-0.0.17.tgz b/example-dimo-auth/dimo-network-login-with-dimo-0.0.17.tgz
diff --git a/example-dimo-auth/package-lock.json b/example-dimo-auth/package-lock.json
diff --git a/example-dimo-auth/package.json b/example-dimo-auth/package.json
@@ -10,7 +10,7 @@
     "@types/node": "^16.18.114",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.1",
-    "@dimo-network/login-with-dimo": "file:./dimo-network-login-with-dimo-0.0.16.tgz",
+    "@dimo-network/login-with-dimo": "file:./dimo-network-login-with-dimo-0.0.17.tgz",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-scripts": "5.0.1",

diff --git a/sdk/README.md b/sdk/README.md
@@ -101,7 +101,7 @@ import {
 
           <ShareVehiclesWithDimo
             mode="popup"
-            onSuccess={(authData) => console.log("Success:", authData)}
+            onSuccess={(authData) => console.log("Success:", authData)} //authData will include the sharedVehicles
             onError={(error) => console.error("Error:", error)}
             permissionTemplateId={"1"} //REQUIRED: "1" is the template for all SACD permissions
             //expirationDate={} //OPTIONAL ISO STRING

diff --git a/sdk/package.json b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dimo-network/login-with-dimo",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/sdk/src/utils/authUtils.ts b/sdk/src/utils/authUtils.ts
@@ -6,20 +6,22 @@ import {
 } from "../storage/storageManager";
 
 export const processAuthResponse = (
-  { token, walletAddress, email }: any,
+  { token, walletAddress, email, sharedVehicles }: any,
   setAuthenticated: (status: boolean) => void,
   onSuccess: (data: {
     token: string;
-    transactionHash?: string;
-    transactionReceipt?: any;
+    sharedVehicles: string[]
   }) => void
 ) => {
+  //This auth response may be triggered for a coupled or decoupled flow
+  //If decoupled, it will only return token
+  //If coupled, it will return token + updatedVehicles
   if (walletAddress) storeWalletAddressInLocalStorage(walletAddress);
   if (email) storeEmailInLocalStorage(email);
   if (token) {
     storeJWTInCookies(token);
     setAuthenticated(true);
-    onSuccess({ token });
+    onSuccess({ token, sharedVehicles });
   }
 };
 

diff --git a/sdk/src/utils/eventHandler.ts b/sdk/src/utils/eventHandler.ts
@@ -70,6 +70,7 @@ export const handleMessageForPopup = (
       email,
       mode,
       transactionHash,
+      sharedVehicles,
       message,
     } = event.data;
 
@@ -93,7 +94,7 @@ export const handleMessageForPopup = (
 
       if (eventType === "authResponse") {
         processAuthResponse(
-          { token, walletAddress, email },
+          { token, walletAddress, email, sharedVehicles },
           setAuthenticated,
           onSuccess
         );