integration test, three cases

Author: michielbdejong

lib/payment-pointer-discovery.js

@@ -69,7 +69,11 @@ function paymentPointerDocument () {
         res.json({ fail: 'Add triple', subject: `<${webid.value}>`, predicate: `<${pp.value}>`, object: '$alice.example' })
       }
       if (paymentPointer.value.startsWith('$')) {
-        paymentPointer.value = `https://${paymentPointer.value.substring(1)}`
+        let suffix = ''
+        if (paymentPointer.value.indexOf('/') === -1) {
+          suffix = '/.well-known/pay'
+        }
+        paymentPointer.value = `https://${paymentPointer.value.substring(1)}${suffix}`
       }
       res.redirect(paymentPointer.value)
     } catch (e) {

test/integration/payment-pointer-test.js

@@ -0,0 +1,149 @@
+/* eslint-disable no-unused-expressions */
+
+const Solid = require('../../index')
+const path = require('path')
+const { cleanDir } = require('../utils')
+const supertest = require('supertest')
+const expect = require('chai').expect
+
+describe('API', () => {
+  const configPath = path.join(__dirname, '../resources/config')
+
+  const serverConfig = {
+    sslKey: path.join(__dirname, '../keys/key.pem'),
+    sslCert: path.join(__dirname, '../keys/cert.pem'),
+    auth: 'oidc',
+    dataBrowser: false,
+    webid: true,
+    multiuser: false,
+    configPath
+  }
+
+  function startServer (pod, port) {
+    return new Promise((resolve) => {
+      pod.listen(port, () => { resolve() })
+    })
+  }
+
+  describe('Payment Pointer Alice', () => {
+    let alice
+    const aliceServerUri = 'https://localhost:5000'
+    const aliceDbPath = path.join(__dirname,
+      '../resources/accounts-scenario/alice/db')
+    const aliceRootPath = path.join(__dirname, '../resources/accounts-scenario/alice')
+
+    const alicePod = Solid.createServer(
+      Object.assign({
+        root: aliceRootPath,
+        serverUri: aliceServerUri,
+        dbPath: aliceDbPath
+      }, serverConfig)
+    )
+
+    before(() => {
+      return Promise.all([
+        startServer(alicePod, 5000)
+      ]).then(() => {
+        alice = supertest(aliceServerUri)
+      })
+    })
+
+    after(() => {
+      alicePod.close()
+      cleanDir(aliceRootPath)
+    })
+
+    describe('GET Payment Pointer document', () => {
+      it('should show instructions to add a triple', (done) => {
+        alice.get('/.well-known/pay')
+          .expect(200)
+          .expect('content-type', /application\/json/)
+          .end(function (err, req) {
+            if (err) {
+              done(err)
+            } else {
+              expect(req.body).deep.equal({
+                fail: 'Add triple',
+                subject: '<https://localhost:5000/profile/card#me>',
+                predicate: '<http://paymentpointers.org/ns#PaymentPointer>',
+                object: '$alice.example'
+              })
+              done()
+            }
+          })
+      })
+    })
+  })
+
+  describe('Payment Pointer Bob', () => {
+    let bob
+    const bobServerUri = 'https://localhost:5001'
+    const bobDbPath = path.join(__dirname,
+      '../resources/accounts-scenario/bob/db')
+    const bobRootPath = path.join(__dirname, '../resources/accounts-scenario/bob')
+    const bobPod = Solid.createServer(
+      Object.assign({
+        root: bobRootPath,
+        serverUri: bobServerUri,
+        dbPath: bobDbPath
+      }, serverConfig)
+    )
+
+    before(() => {
+      return Promise.all([
+        startServer(bobPod, 5001)
+      ]).then(() => {
+        bob = supertest(bobServerUri)
+      })
+    })
+
+    after(() => {
+      bobPod.close()
+      cleanDir(bobRootPath)
+    })
+
+    describe('GET Payment Pointer document', () => {
+      it('should redirect to example.com', (done) => {
+        bob.get('/.well-known/pay')
+          .expect('location', 'https://bob.com/.well-known/pay')
+          .expect(302, done)
+      })
+    })
+  })
+
+  describe('Payment Pointer Charlie', () => {
+    let charlie
+    const charlieServerUri = 'https://localhost:5002'
+    const charlieDbPath = path.join(__dirname,
+      '../resources/accounts-scenario/charlie/db')
+    const charlieRootPath = path.join(__dirname, '../resources/accounts-scenario/charlie')
+    const charliePod = Solid.createServer(
+      Object.assign({
+        root: charlieRootPath,
+        serverUri: charlieServerUri,
+        dbPath: charlieDbPath
+      }, serverConfig)
+    )
+
+    before(() => {
+      return Promise.all([
+        startServer(charliePod, 5002)
+      ]).then(() => {
+        charlie = supertest(charlieServerUri)
+      })
+    })
+
+    after(() => {
+      charliePod.close()
+      cleanDir(charlieRootPath)
+    })
+
+    describe('GET Payment Pointer document', () => {
+      it('should redirect to example.com/charlie', (done) => {
+        charlie.get('/.well-known/pay')
+          .expect('location', 'https://service.com/charlie')
+          .expect(302, done)
+      })
+    })
+  })
+})

test/resources/accounts-scenario/bob/profile/card$.ttl

@@ -0,0 +1,5 @@
+@prefix : <#>.
+@prefix pp: <http://paymentpointers.org/ns#>.
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+:me pp:PaymentPointer "$bob.com"^^xsd:string .

test/resources/accounts-scenario/charlie/profile/card$.ttl

@@ -0,0 +1,5 @@
+@prefix : <#>.
+@prefix pp: <http://paymentpointers.org/ns#>.
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+:me pp:PaymentPointer "$service.com/charlie"^^xsd:string .