keep empty email field if user removed prefill

We should respect the users choice. We can still get their email from the user id if we really need to.

2 files changed, 11 insertions, 1 deletions

diff --git a/app/models/service_level.rb b/app/models/service_level.rb
index 5dd8838..a8df55b 100644
--- a/app/models/service_level.rb
+++ b/app/models/service_level.rb
@@ -24,6 +24,14 @@ class ServiceLevel
     end
   end
 
+  def provides?(service)
+    services.include? service
+  end
+
+  def services
+    config_hash[:services] || []
+  end
+
   protected
 
   def limited_cert?
diff --git a/app/models/user.rb b/app/models/user.rb
index c297ac8..a809879 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -62,7 +62,9 @@ class User < CouchRest::Model::Base
   end
 
   def email_address
-    LocalEmail.new(login)
+    if effective_service_level.provides?('email')
+      LocalEmail.new(login)
+    end
   end
 
   # Since we are storing admins by login, we cannot allow admins to change their login.