iterate

api/package.json

@@ -28,7 +28,6 @@
     "@lit-protocol/types": "6.0.0-beta.4",
     "@lit-protocol/uint8arrays": "4.1.1",
     "@mailchimp/mailchimp_marketing": "^3.0.80",
-    "@pinata/sdk": "^2.1.0",
     "aws-sdk": "^2.1327.0",
     "cid": "multiformats/cid",
     "codeco": "^1.2.1",
@@ -61,6 +60,7 @@
     "objection": "^3.1.4",
     "pg": "^8.12.0",
     "pgvector": "^0.2.0",
+    "pinata": "^1.4.1",
     "redis": "^4.6.5",
     "striptags": "^3.2.0",
     "uint8arrays": "^4.0.3",

api/src/controllers/file.js

@@ -1,46 +1,32 @@
-import fs from 'fs'
-import pinataSDK  from '@pinata/sdk';
-import { Readable } from "stream";
-
-
-const bufferToStream = (buffer) => {
-  const stream = new Readable();
-  stream.push(buffer);
-  stream.push(null); // Indicate end of stream
-  return stream;
+import { PinataSDK } from "pinata";
+
+const pinata = new PinataSDK({
+  pinataJwt: process.env.PINATA_JWT_KEY,
+  pinataGateway: "ipfs.index.network",
+});
+
+export const getAvatar = async (req, res, next) => {
+  const url = await pinata.gateways.createSignedURL({
+    cid: req.params.cid,
+    expires: 30000,
+  });
+  return res.redirect(302, url);
 };
-
 export const uploadAvatar = async (req, res, next) => {
-
-    try {
-
-        const pinata = new pinataSDK({ pinataJWTKey: process.env.PINATA_JWT_KEY});
-        // Assuming multer is used to handle file uploads and the file is stored temporarily
-
-
-        const readableStreamForFile = bufferToStream(req.file.buffer);
-
-        // Add the file to IPFS
-        const options = {
-            pinataMetadata: {
-                name: "profilePicture.jpg",
-                keyvalues: {
-                    // Add any key-values here you wish to associate with the upload
-                }
-            },
-            pinataOptions: {
-                cidVersion: 0
-            }
-        };
-
-        const result = await pinata.pinFileToIPFS(readableStreamForFile, options);
-
-
-        // Respond with the IPFS hash
-        res.json({ cid: result.IpfsHash });
-    } catch (error) {
-        console.error(error);
-        res.status(500).send('An error occurred while uploading the file to IPFS.');
-    }
-
-}
+  try {
+    // Assuming multer is used to handle file uploads and the file is stored temporarily
+
+    const file = new File([req.file.buffer], "profilePicture.jpg", {
+      type: req.file.mimetype,
+    });
+
+    // Upload the file to IPFS via Pinata
+    const result = await pinata.upload.file(file);
+
+    // Respond with the IPFS CID
+    res.json({ cid: result.cid });
+  } catch (error) {
+    console.error(error);
+    res.status(500).send("An error occurred while uploading the file to IPFS.");
+  }
+};

api/src/packages/api.js

@@ -652,6 +652,8 @@ app.get(
 );
 app.get("/ens/:ensName", metaController.getWalletByENSHandler);
 
+app.get("/avatar/:cid", fileController.getAvatar);
+
 app.post(
   "/profile/upload_avatar",
   isImage.single("file"),

api/src/utils/helpers.js

@@ -8,9 +8,9 @@ import { Ed25519Provider } from "key-did-provider-ed25519";
 import { getResolver } from "key-did-resolver";
 import { fromString } from "uint8arrays/from-string";
 
-import pinataSDK from "@pinata/sdk";
+// import pinataSDK from "@pinata/sdk";
 
-import { Readable } from "stream";
+//import { Readable } from "stream";
 
 import RedisClient from "../clients/redis.js";
 
@@ -61,7 +61,7 @@ export const generateLITAction = async (conditions, definition) => {
   });
 
   actionStr = actionStr.replace("__REPLACE_THIS_AS_MODELS_OBJECT__", models);
-
+  /*
   const pinata = new pinataSDK({ pinataJWTKey: process.env.PINATA_JWT_KEY });
 
   const buffer = Buffer.from(actionStr, "utf8");
@@ -73,6 +73,7 @@ export const generateLITAction = async (conditions, definition) => {
     pinataMetadata: { name: "signerFunction" },
   });
   return resp.IpfsHash;
+   */
 };
 
 export const flattenSources = async (sources, didService) => {