From d4b38ba71d149a1931f13a7fbd9c900d02c601a6 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 24 Jun 2020 13:49:49 -0400
Subject: [PATCH] start testing a new format for 'Public Signing Keys'

---
 www/assert/main.js        |  8 ++++++++
 www/common/common-hash.js | 19 +++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/www/assert/main.js b/www/assert/main.js
index c29b3bfa3..bfbee3b3a 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -516,6 +516,14 @@ define([
         }, "tracker should not timeout");
     }());
 
+    (function () {
+        assert(function (cb) {
+            cb(false);
+
+
+        }, "new format of users' public signing key strings should parse"); // XXX
+    }());
+
     Drive.test(assert);
 
     assert(function (cb) {
diff --git a/www/common/common-hash.js b/www/common/common-hash.js
index b60ab3306..232d273b4 100644
--- a/www/common/common-hash.js
+++ b/www/common/common-hash.js
@@ -92,8 +92,23 @@ var factory = function (Util, Crypto, Nacl) {
         }
     };
 
-    Hash.getUserHrefFromKeys = function (origin, username, pubkey) {
-        return origin + '/user/#/1/' + username + '/' + pubkey.replace(/\//g, '-');
+/*
+
+0. usernames may contain spaces or many other wacky characters, so enclose the whole thing in square braces so we know its boundaries. If the formatted string does not include these we know it is either a _v1 public key string_ or _an incomplete string_. Start parsing by removing them.
+1. public keys should have a fixed length, so slice them off of the end of the string.
+2. domains cannot include `@`, so find the last occurence of it in the signing key and slice everything thereafter.
+3. the username is everything before the `@`.
+
+*/
+    Hash.getUserHrefFromKeys = function (origin, username, pubkey) { // XXX
+        return '[' +
+            username +
+            '@' +
+            origin.replace(/https*:\/\//, '') +
+            '/' +
+            pubkey.replace(/\//g, '-') +
+        ']';
+        // return origin + '/user/#/1/' + username + '/' + pubkey.replace(/\//g, '-');
     };
 
     var fixDuplicateSlashes = function (s) {