summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/app/designs/user/by_alias.js8
-rw-r--r--users/app/designs/user/by_login_or_alias.js9
-rw-r--r--users/app/models/identity.rb4
3 files changed, 3 insertions, 18 deletions
diff --git a/users/app/designs/user/by_alias.js b/users/app/designs/user/by_alias.js
deleted file mode 100644
index dc8021a..0000000
--- a/users/app/designs/user/by_alias.js
+++ /dev/null
@@ -1,8 +0,0 @@
-function(doc) {
- if (doc.type != 'User') {
- return;
- }
- doc.email_aliases.forEach(function(alias){
- emit(alias.username, 1);
- });
-}
diff --git a/users/app/designs/user/by_login_or_alias.js b/users/app/designs/user/by_login_or_alias.js
deleted file mode 100644
index 2d2096c..0000000
--- a/users/app/designs/user/by_login_or_alias.js
+++ /dev/null
@@ -1,9 +0,0 @@
-function(doc) {
- if (doc.type != 'User') {
- return;
- }
- emit(doc.login, 1);
- doc.email_aliases.forEach(function(alias){
- emit(alias.username, 1);
- });
-}
diff --git a/users/app/models/identity.rb b/users/app/models/identity.rb
index cbb540e..9b97b51 100644
--- a/users/app/models/identity.rb
+++ b/users/app/models/identity.rb
@@ -24,7 +24,9 @@ class Identity < CouchRest::Model::Base
if (doc.type != 'Identity') {
return;
}
- emit(doc.address, doc.keys["pgp"]);
+ if (typeof doc.keys === "object") {
+ emit(doc.address, doc.keys["pgp"]);
+ }
}
EOJS
view :disabled,