code-payments · zfedoran · Jan 10, 2024 · Jan 10, 2024 · Jan 10, 2024
diff --git a/examples/4-minimal-with-webhook/package.json b/examples/4-minimal-with-webhook/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "type": "module",
   "scripts": {
-    "start": "node index.js",
+    "start": "node server.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",

diff --git a/examples/4-minimal-with-webhook/views/index.ejs b/examples/4-minimal-with-webhook/views/index.ejs
@@ -4,7 +4,7 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Code SDK - Example/3-minimal-with-webhook</title>
+  <title>Code SDK - Example/4-minimal-with-webhook</title>
 </head>
 
 <body>

diff --git a/examples/6-minimal-with-login/package.json b/examples/6-minimal-with-login/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "6-minimal-with-login",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "type": "module",
+  "scripts": {
+    "start": "node server.js",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@code-wallet/client": "^1.1.0",
+    "body-parser": "^1.20.2",
+    "ejs": "^3.1.9",
+    "express": "^4.18.2"
+  },
+  "devDependencies": {
+    "@types/express": "^4.17.17"
+  }
+}
diff --git a/examples/6-minimal-with-login/server.js b/examples/6-minimal-with-login/server.js
@@ -0,0 +1,70 @@
+import * as code from "@code-wallet/client";
+import { Keypair } from "@code-wallet/library";
+import express from "express";
+
+const port = process.env.PORT || 3000;
+const hostname = process.env.HOSTNAME || 'example.com';
+const app = express();
+const verifier = Keypair.generate();
+
+// Set the view engine to ejs
+app.set('view engine', 'ejs');
+
+// index page (with the payment button)
+app.get('/', function(req, res) {
+  res.render('index');
+});
+
+// This is a page that the user will be redirected to once the payment is made.
+app.get('/success/:id', async (req, res) => {
+  // Get the payment intent id from the URL
+  const intent = req.params.id;
+
+  // Get the status of the payment intent and the user's public key
+  const status = await code.paymentIntents.getStatus({ intent });
+
+  // Render the success page with the intent id and status
+  res.render('success', { intent, status });
+});
+
+// This is a JSON file that Code will look for when verifying your domain. It
+// should be publicly accessible at the root of your domain. For example:
+// https://example.com/.well-known/code-payments.json
+app.get('/.well-known/code-payments.json', (req, res) => {
+  res.json({ "public_keys": [verifier.getPublicKey().toBase58()] });
+});
+
+// Create a payment intent. We're letting Code know that a payment is coming
+// soon and we want to be notified once it's made.
+app.post('/create-intent', async (req, res) => {
+
+  const { clientSecret, id } = await code.paymentIntents.create({
+    amount: 0.05,
+    currency: 'usd',
+    destination: 'E8otxw1CVX9bfyddKu3ZB3BVLa4VVF9J7CTPdnUwT9jR',
+
+    login: {
+      verifier: verifier.getPublicKey().toBase58(),
+
+      // Cannot be localhost or a subdomain. It must be a domain that you own
+      // and have access to. Code will verify that this domain is owned by you
+      // by looking for the .well-known/code-payments.json file.
+      domain: hostname,
+    },
+
+    signers: [ verifier ]
+  });
+
+  console.log('Created intent', id);
+
+  // The clientSecret value needs to be sent to the browser so that the browser
+  // can use it to setup a payment with this intent instance. The client will
+  // use the payment details along with this value to derive the same payment
+  // intent id on its end.
+  res.send({ clientSecret });
+});
+
+app.listen(port, () => {
+  console.log(`🚀 Minimal example listening on port ${port}`)
+  console.log(`http://localhost:${port}`)
+});
diff --git a/examples/6-minimal-with-login/views/index.ejs b/examples/6-minimal-with-login/views/index.ejs
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Code SDK - Example/6-minimal-with-login</title>
+</head>
+
+<body>
+  <div id="button-container"></div>
+
+  <script type="module">
+    import code from 'https://js.getcode.com/v1';
+
+    const hostname = window.location.protocol + "//" + window.location.host;
+    console.log(hostname);
+
+    const { button } = code.elements.create('button', {
+      currency: 'usd',
+      destination: 'E8otxw1CVX9bfyddKu3ZB3BVLa4VVF9J7CTPdnUwT9jR',
+      amount: 0.05,
+
+      confirmParams: {
+        success: { url: `${hostname}/success/{{INTENT_ID}}`, },
+        cancel: { url: `${hostname}/`, },
+      },
+    });
+
+    // Wait for the button to be clicked
+    button.on('invoke', async () => {
+
+      // Get a payment intent from our own server
+      const res = await fetch('/create-intent', { method: 'POST' });
+      const { clientSecret } = await res.json();
+
+      // Update the button with the new client secret so that our server
+      // can be notified once the payment is complete.
+      button.update({ clientSecret });
+    })
+
+    button.mount('#button-container');
+  </script>
+</body>
+
+</html>
diff --git a/examples/6-minimal-with-login/views/success.ejs b/examples/6-minimal-with-login/views/success.ejs
@@ -0,0 +1,17 @@
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Code SDK - Example/6-minimal-with-login</title>
+</head>
+
+<body>
+  <h1>Payment Submitted</h1>
+  <div>Intent Id: <%= intent %></div>
+  <div>Status: <pre><%= status %></pre></div>
+</body>
+
+</html>
diff --git a/examples/package-lock.json b/examples/package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@code-wallet/client",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -22,7 +22,7 @@
         "maintained node versions"
     ],
     "dependencies": {
-        "@code-wallet/library": "^1.1.0",
+        "@code-wallet/library": "^1.1.1",
         "bs58": "^5.0.0",
         "buffer": "6.0.3"
     },

diff --git a/packages/library/package.json b/packages/library/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@code-wallet/library",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "license": "MIT",
     "repository": {
         "type": "git",

diff --git a/packages/library/src/elements/validate.ts b/packages/library/src/elements/validate.ts
@@ -13,7 +13,7 @@ import {
     ErrNotImplemented,
     ErrInvalidValue,
 } from '../errors';
-import { Keypair, PublicKey } from '../keys';
+import { PublicKey } from '../keys';
 
 /**
  * Validates the properties of the given `ElementOptions` for intents.
@@ -96,7 +96,7 @@ function validateSigners(intent: ElementOptions) {
     if (!intent.signers) { return; }
 
     for (const signer of intent.signers) {
-        if (!(signer instanceof Keypair)) {
+        if (!signer.sign && typeof signer.sign !== 'function') {
             throw ErrInvalidValue();
         }
     }

diff --git a/packages/library/src/intents/PaymentRequestWithLoginIntent.ts b/packages/library/src/intents/PaymentRequestWithLoginIntent.ts
@@ -102,17 +102,17 @@ class PaymentRequestWithLoginIntent extends PaymentRequestIntent {
             throw ErrLoginVerifierRequired();
         }
 
-        const msg = this.toProto();
-        const req = msg.kind.value as proto.RequestToReceiveBill;
-        if (!req) {
+        const envelope = this.toProto();
+        const msg = envelope.kind.value as proto.RequestToReceiveBill;
+        if (!msg) {
             throw ErrUnexpectedError();
         }
 
-        req.signature = new proto.Common.Signature({
-            value: this.signer.sign(req.toBinary()),
+        msg.signature = new proto.Common.Signature({
+            value: this.signer.sign(msg.toBinary()),
         });
 
-        const sig = this.rendezvousKeypair.sign(msg.toBinary());
+        const sig = this.rendezvousKeypair.sign(envelope.toBinary());
         const intent = this.rendezvousKeypair.getPublicKey().toBase58();
         const message = msg.toBinary();
         const signature = sig;