Merge branch 'riker09-feature/binary-pk'

LAR · Oct 14, 2017 · e27a71c · e27a71c
2 parents 8ea7746 + 658d3f0
commit e27a71c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/lib/filters.js b/lib/filters.js
@@ -143,8 +143,14 @@ exports.to_display = function (input) {
 exports.stringDocIDs = function (input) {
 
   // Turns {_bsontype: ' ObjectID', id:12345... } into a plain string
-  if (input && typeof input === 'object' && input._bsontype === 'ObjectID') {
-    return input.toString();
+  if (input && typeof input === 'object') {
+    switch (input._bsontype) {
+      case 'Binary':
+        return input.toJSON();
+      case 'ObjectID':
+      default:
+        return input.toString();
+    }
   }
 
   return input;

diff --git a/lib/router.js b/lib/router.js
@@ -159,6 +159,12 @@ const router = function (config) {
     try {
       obj_id = new mongodb.ObjectID.createFromHexString(id);
     } catch (err) {
+      try {
+        // Is it a GUID?
+        obj_id = new mongodb.Binary(new Buffer(id, 'base64'), 3);
+      } catch (err) {
+        // Silence GUID error as well
+      }
       // Silence the error
     }
 

diff --git a/lib/views/document.html b/lib/views/document.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %}
 
-{% block title %}{{ document._id|to_string }}{% endblock %}
+{% block title %}{{ document._id|stringDocIDs|to_string }}{% endblock %}
 
 
 {% block styles %}