Make list_users() methods public in several plugins.

[mailshears.git] / lib / common / davical_plugin.rb

diff --git a/lib/common/davical_plugin.rb b/lib/common/davical_plugin.rb
index e4bef48ac41239f49b7aa3656adbce782f25bd00..8c9646f2cf95f8fb48198cd1f71927c276856974 100644 (file)
--- a/lib/common/davical_plugin.rb
+++ b/lib/common/davical_plugin.rb
@@ -5,8 +5,7 @@ module DavicalPlugin
   # is, we implement the Plugin interface.
   include Plugin
 
-  def initialize()
-    cfg = Configuration.new()
+  def initialize(cfg)
     @db_host = cfg.davical_dbhost
     @db_port = cfg.davical_dbport
     @db_opts = cfg.davical_dbopts
@@ -19,12 +18,12 @@ module DavicalPlugin
 
   def describe_domain(domain)
     # DAViCal doesn't have a concept of domains.
-    return 'N/A'
+    return domain
   end
 
 
-  def describe_account(account)
-    principal_id = self.get_principal_id(account)
+  def describe_user(user)
+    principal_id = self.get_principal_id(user)
 
     if principal_id.nil?
       return 'User not found'
@@ -34,9 +33,42 @@ module DavicalPlugin
   end
 
 
+  def list_users()
+    #
+    # Produce a list of DAViCal users. This is public because it's
+    # useful for testing.
+    #
+    usernames = []
+
+    begin
+      connection = PGconn.connect(@db_host,
+                                  @db_port,
+                                  @db_opts,
+                                  @db_tty,
+                                  @db_name,
+                                  @db_user,
+                                  @db_pass)
+
+      # User #1 is the super-user, and not tied to an email address.
+      sql_query =  "SELECT username FROM usr WHERE user_no > 1"
+
+      connection.query(sql_query) do |result|
+        usernames = result.field_values('username')
+      end
+
+      connection.close()
+    rescue PGError => e
+      # Pretend like we're database-agnostic in case we ever are.
+      raise DatabaseError.new(e)
+    end
+
+    return usernames
+  end
+
+
   protected;
 
-  def get_principal_id(account)
+  def get_principal_id(user)
     principal_id = nil
 
     begin
@@ -53,7 +85,7 @@ module DavicalPlugin
       sql_query += "      ON principal.user_no = usr.user_no) "
       sql_query += "WHERE usr.username = $1;"
 
-      connection.query(sql_query, [account]) do |result|
+      connection.query(sql_query, [user]) do |result|
         if result.num_tuples > 0
           principal_id = result[0]['principal_id']
         end
@@ -69,5 +101,4 @@ module DavicalPlugin
     return principal_id
   end
 
-
 end