From 6b36baab9f82e022b09e6bdbe071860a8075badf Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 7 Jan 2014 09:33:11 +0100 Subject: remove outdated views that cause errors The datastructure changes to that email_aliases is not available on the user record anymore. Keeping these views leads to errors on couch servers. --- users/app/designs/user/by_alias.js | 8 -------- users/app/designs/user/by_login_or_alias.js | 9 --------- 2 files changed, 17 deletions(-) delete mode 100644 users/app/designs/user/by_alias.js delete mode 100644 users/app/designs/user/by_login_or_alias.js (limited to 'users') 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); - }); -} -- cgit v1.2.3 From 74353fef4524e8418acf5dd854ff41d3a06beff0 Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 7 Jan 2014 09:34:27 +0100 Subject: only emit pgp keys if they are actually set if doc.keys has not been set doc.keys[pgp] will raise an error. We always upload the key after signup - but this might fail and there is some time in between. Not checking for this condition lead to errors in the couch logs. --- users/app/models/identity.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'users') 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, -- cgit v1.2.3