From 7f7ba4f3d72104d67e9ecf839c9688c0580d4063 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 16 Jan 2013 16:52:35 +0100
Subject: incomplete initial changes to make email address just
 login@domain.tld

This involves a number of other changes like making sure the comparison between aliases and emails still works.

Will do that by removing the @domain.tld from aliases as well.
---
 users/app/designs/user/by_email_alias.js    | 2 +-
 users/app/designs/user/by_email_or_alias.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'users/app/designs/user')

diff --git a/users/app/designs/user/by_email_alias.js b/users/app/designs/user/by_email_alias.js
index 508a002..dc8021a 100644
--- a/users/app/designs/user/by_email_alias.js
+++ b/users/app/designs/user/by_email_alias.js
@@ -3,6 +3,6 @@ function(doc) {
     return;
   }
   doc.email_aliases.forEach(function(alias){
-    emit(alias.email, 1);
+    emit(alias.username, 1);
   });
 }
diff --git a/users/app/designs/user/by_email_or_alias.js b/users/app/designs/user/by_email_or_alias.js
index 71fd0ea..2e5d0a8 100644
--- a/users/app/designs/user/by_email_or_alias.js
+++ b/users/app/designs/user/by_email_or_alias.js
@@ -3,9 +3,9 @@ function(doc) {
     return;
   }
   if (doc.email) {
-    emit(doc.email, 1);
+    emit(doc.login, 1);
   }
   doc.email_aliases.forEach(function(alias){
-    emit(alias.email, 1);
+    emit(alias.username, 1);
   });
 }
-- 
cgit v1.2.3


From a8ec73a0307924610023525786bb3a9eb8b173e1 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Thu, 17 Jan 2013 15:09:58 +0100
Subject: unit tests passing

---
 users/app/designs/user/by_alias.js          |  8 ++++++++
 users/app/designs/user/by_email_alias.js    |  8 --------
 users/app/designs/user/by_email_or_alias.js | 11 -----------
 users/app/designs/user/by_login_or_alias.js |  9 +++++++++
 4 files changed, 17 insertions(+), 19 deletions(-)
 create mode 100644 users/app/designs/user/by_alias.js
 delete mode 100644 users/app/designs/user/by_email_alias.js
 delete mode 100644 users/app/designs/user/by_email_or_alias.js
 create mode 100644 users/app/designs/user/by_login_or_alias.js

(limited to 'users/app/designs/user')

diff --git a/users/app/designs/user/by_alias.js b/users/app/designs/user/by_alias.js
new file mode 100644
index 0000000..dc8021a
--- /dev/null
+++ b/users/app/designs/user/by_alias.js
@@ -0,0 +1,8 @@
+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_email_alias.js b/users/app/designs/user/by_email_alias.js
deleted file mode 100644
index dc8021a..0000000
--- a/users/app/designs/user/by_email_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_email_or_alias.js b/users/app/designs/user/by_email_or_alias.js
deleted file mode 100644
index 2e5d0a8..0000000
--- a/users/app/designs/user/by_email_or_alias.js
+++ /dev/null
@@ -1,11 +0,0 @@
-function(doc) {
-  if (doc.type != 'User') {
-    return;
-  }
-  if (doc.email) {
-    emit(doc.login, 1);
-  }
-  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
new file mode 100644
index 0000000..2d2096c
--- /dev/null
+++ b/users/app/designs/user/by_login_or_alias.js
@@ -0,0 +1,9 @@
+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