Merge pull request #71 from Permissionless-Software-Foundation/ct-unstable

Passing pagination paramter through to PSFFPP
linting
2026-09-22 17:22:03 -07:00 · 2025-04-16 07:38:00 -07:00 · 2025-04-16 07:29:40 -07:00 · 2025-04-16 07:29:27 -07:00 · 2025-04-12 21:05:52 -07:00 · 2025-04-12 21:04:17 -07:00
7 changed files with 23 additions and 16 deletions
@@ -1,6 +1,6 @@
 {
-  "password": "BJdugaoiq10ZJnA7Uskd",
+  "password": "YsFhsCVCqussWyyLYUjM",
  "email": "system@system.com",
-  "id": "67c114fd4935ba05e48f6bb2",
-  "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY3YzExNGZkNDkzNWJhMDVlNDhmNmJiMiIsImlhdCI6MTc0MDcwNzA2OX0.R5nU8J5yhGorp7I5kc8_dRESbo4hwCIrTtqJiVYVhLA"
+  "id": "67ffbea61a8de3388f82c401",
+  "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY3ZmZiZWE2MWE4ZGUzMzg4ZjgyYzQwMSIsImlhdCI6MTc0NDgxMzczNH0.a4wM-CfGudF40yi4lwTsnd_aDZHrRn87zjHYxFZmeC4"
 }
@@ -53,7 +53,7 @@
        "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
        "nodemailer": "6.7.5",
        "passport-local": "1.0.0",
-        "psffpp": "1.1.9",
+        "psffpp": "1.2.0",
        "public-ip": "6.0.1",
        "semver": "7.3.5",
        "winston": "3.3.3",
@@ -19902,9 +19902,9 @@
      "license": "MIT"
    },
    "node_modules/psf-multisig-approval": {
-      "version": "2.0.7",
-      "resolved": "http://94.130.170.209:4873/psf-multisig-approval/-/psf-multisig-approval-2.0.7.tgz",
-      "integrity": "sha512-Z00+ozZ3LqBL/5naimg9r15FfPZk01nzNe/YaKGNs4AE8szVK4PxwMTq1su3h4QFHWgDIBth+sbxgJCguy5qzw==",
+      "version": "2.1.0",
+      "resolved": "http://94.130.170.209:4873/psf-multisig-approval/-/psf-multisig-approval-2.1.0.tgz",
+      "integrity": "sha512-QLlOnYzeOx6OQXu5MGRlSP/IhS+X1Y7v3WxUse9riqYHOvvz3WeUPZUB8TVnSsUR6lH5W8Ckshl1lnaWXcPs7Q==",
      "license": "MIT",
      "dependencies": {
        "@chris.troutner/bitcore-lib-cash": "8.25.26",
@@ -19923,13 +19923,13 @@
      }
    },
    "node_modules/psffpp": {
-      "version": "1.1.9",
-      "resolved": "http://94.130.170.209:4873/psffpp/-/psffpp-1.1.9.tgz",
-      "integrity": "sha512-9DKlU+PbwcXLqoq18iOt8Wr6HDVAQqvrW71gNKmJ/1ZK7Tv0bgjxt6agRZAKuj0zDRUH7nPqvcqCs8OqEQ1biQ==",
+      "version": "1.2.0",
+      "resolved": "http://94.130.170.209:4873/psffpp/-/psffpp-1.2.0.tgz",
+      "integrity": "sha512-F3KDh6pzI5ZRxkek6KWFpwIcgx9tocnAKJie0HwNwTBuuS40/LsUnkmhVMghufF603Fp0vO6o3P4vgbTTzw6pg==",
      "license": "MIT",
      "dependencies": {
        "axios": "1.3.5",
-        "psf-multisig-approval": "2.0.7"
+        "psf-multisig-approval": "2.1.0"
      }
    },
    "node_modules/psffpp/node_modules/axios": {
@@ -68,7 +68,7 @@
    "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
    "nodemailer": "6.7.5",
    "passport-local": "1.0.0",
-    "psffpp": "1.1.9",
+    "psffpp": "1.2.0",
    "public-ip": "6.0.1",
    "semver": "7.3.5",
    "winston": "3.3.3",
@@ -191,8 +191,11 @@ class IpfsFilesAdapter {
        throw new Error('No IPFS File Pin Service provider available yet.')
      }

+      const { page } = inObj
+
      const rpcData = {
-        endpoint: 'getPins'
+        endpoint: 'getPins',
+        page
      }

      // Generate a UUID for the call.
@@ -262,11 +262,11 @@ class IpfsRESTControllerLib {
   */
  async getPins (ctx) {
    try {
-      // const { cid } = ctx.params
+      const { page } = ctx.params

      const ipfsFiles = this.adapters.ipfsFiles

-      const pinData = await ipfsFiles.getPins()
+      const pinData = await ipfsFiles.getPins({ page })
      console.log('getPins() pinData: ', pinData)

      ctx.body = pinData
@@ -60,7 +60,7 @@ class IpfsRouter {
    this.router.get('/download/:cid', this.ipfsRESTController.downloadFile)
    this.router.get('/service', this.ipfsRESTController.getService)
    this.router.get('/file-info/:cid', this.ipfsRESTController.getFileInfo)
-    this.router.get('/pins', this.ipfsRESTController.getPins)
+    this.router.get('/pins/:page', this.ipfsRESTController.getPins)
    this.router.get('/cid2json/:cid', this.ipfsRESTController.cid2json)
    this.router.post('/pin-claim', this.ipfsRESTController.pinClaim)
    // Attach the Controller routes to the Koa app.
@@ -400,12 +400,14 @@ describe('#IPFS REST API', () => {
      assert.isTrue(ctx.body.success)
    })
  })
+
  describe('#getPins', () => {
    it('should return 422 status on biz logic error', async () => {
      try {
        sandbox.stub(uut.adapters.ipfsFiles, 'getPins').throws(new Error('test error'))

        ctx.request.body = {}
+        ctx.params = { page: 1 }

        await uut.getPins(ctx)

@@ -421,12 +423,14 @@ describe('#IPFS REST API', () => {
      sandbox.stub(uut.adapters.ipfsFiles, 'getPins').resolves({ success: true })

      ctx.request.body = {}
+      ctx.params = { page: 1 }

      await uut.getPins(ctx)

      assert.isTrue(ctx.body.success)
    })
  })
+
  describe('#cid2json', () => {
    it('should return 422 status on biz logic error', async () => {
      try {
Author	SHA1	Message	Date
Chris Troutner	ac451fd601	Merge pull request #71 from Permissionless-Software-Foundation/ct-unstable Passing pagination paramter through to PSFFPP	2025-04-16 07:38:00 -07:00
Chris Troutner	6857fe0166	linting	2025-04-16 07:29:40 -07:00
Chris Troutner	89a03e561a	feat(GET /pins/:page): Adding pagenation to endpoint	2025-04-16 07:29:27 -07:00
Chris Troutner	22e32a6fc1	Merge pull request #70 from Permissionless-Software-Foundation/ct-unstable fix(psffpp): Updating to psffpp v1.2.0	2025-04-12 21:05:52 -07:00
Chris Troutner	fcf5db7fa4	fix(psffpp): Updating to psffpp v1.2.0	2025-04-12 21:04:17 -07:00