Updated dependencies, new Middleware option ("uriSchemaPrefix")

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+* v1.3.0:
+  * Updated dependencies
+  * New option for Middleware - "uriSchemaPrefix"
 * v1.2.2:
   * Updated dependencies
   * Create, use isolated handlebars to avoid conflicts

README.md

@@ -59,7 +59,17 @@ app.get('/login',
 		callbackUrl: 'http://localhost:3000/login',
 		// The URL of the "Cancel" button on the login page.
 		// When set to NULL or some other falsey value, the cancel button will be hidden.
-		cancelUrl: '/'
+		cancelUrl: '/',
+		// The URI schema prefix used before the encoded LNURL.
+		// e.g. "lightning:" or "LIGHTNING:" or "" (empty-string)
+		uriSchemaPrefix: 'LIGHTNING:',
+		// Options object passed to QRCode.toDataURL(data, options) - for further details:
+		// https://github.com/soldair/node-qrcode/#qr-code-options
+		qrcode: {
+			errorCorrectionLevel: 'L',
+			margin: 2,
+			type: 'image/png',
+		},
 	})
 );
 ```

lib/middleware.js

@@ -25,6 +25,9 @@ const Middleware = function(options) {
 		// The URL of the "Cancel" button on the login page.
 		// When set to NULL or some other falsey value, the cancel button will be hidden.
 		cancelUrl: null,
+		// The URI schema prefix used before the encoded LNURL.
+		// e.g. "lightning:" or "LIGHTNING:" or "" (empty-string)
+		uriSchemaPrefix: 'LIGHTNING:',
 	});
 	options.qrcode = _.defaults(options.qrcode || {}, {
 		errorCorrectionLevel: 'L',
@@ -113,11 +116,12 @@ const getLoginPageHtml = function(k1, options) {
 		k1,
 		tag: 'login',
 	});
-	const encoded = lnurl.encode(options.callbackUrl);
-	return generateQrCode('lightning:' + encoded, options.qrcode).then(dataUri => {
+	const encoded = lnurl.encode(options.callbackUrl).toUpperCase();
+	const href = `${options.uriSchemaPrefix}${encoded}`;
+	return generateQrCode(href, options.qrcode).then(dataUri => {
 		const data = _.extend({}, {
-			encoded,
-			dataUri
+			dataUri,
+			href: options.uriSchemaPrefix === '' ? '#' : href,
 		}, _.pick(options, 'cancelUrl'));
 		return getTemplateHtml('login', data);
 	});

package.json

@@ -32,9 +32,9 @@
   },
   "homepage": "https://github.com/chill117/passport-lnurl-auth#readme",
   "dependencies": {
-    "debug": "4.3.1",
+    "debug": "4.3.2",
     "handlebars": "4.7.7",
-    "lnurl": "0.16.1",
+    "lnurl": "0.18.0",
     "passport-strategy": "1.0.0",
     "qrcode": "1.4.4",
     "underscore": "1.13.1"
@@ -43,7 +43,7 @@
     "chai": "4.3.4",
     "express": "4.17.1",
     "express-session": "1.17.2",
-    "mocha": "8.4.0",
+    "mocha": "9.0.2",
     "passport": "0.4.1"
   }
 }

templates/login.html

@@ -74,7 +74,7 @@
 		<div class="wrap">
 			<h1>Login with lnurl-auth</h1>
 			<p>Scan the QR code with an app that supports lnurl-auth</p>
-			<a id="qrcode" href="lightning:{{encoded}}"><img src="{{dataUri}}"></a>
+			<a id="qrcode" href="{{href}}"><img src="{{dataUri}}"></a>
 			<div id="buttons">
 				{{#if cancelUrl}}
 				<a href="{{cancelUrl}}" class="button">Cancel</a>

test/helpers.js

@@ -24,8 +24,8 @@ module.exports = {
 	},
 
 	extractEncodedFromLoginPageHtml: function(html) {
-		const match = html.match(new RegExp('<a id="qrcode" href="lightning:([a-z0-9]+)">'));
-		return match && match[1] || null;
+		const match = html.match(new RegExp('<a id="qrcode" href="(lightning:|LIGHTNING:)?([a-zA-Z0-9]+)">'));
+		return match && match[2] || null;
 	},
 
 	extractSecretFromLoginPageHtml: function(html) {