mvhub-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Priya Ravindran (priya)
Related merge proposals:
  https://code.launchpad.net/~priya/mvhub/move_sql_lib_authaccount/+merge/23493
  proposed by: Priya Ravindran (priya)
  review: Approve - Dan MacNeil (omacneil)
------------------------------------------------------------
revno: 365 [merge]
committer: Priya Ravindran <pthirumal@xxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-04-16 10:20:33 -0400
message:
  MOved queries from AuthAccount.pm to sql library sql_select.lib and 
  removed unused code accessing "users" table from is_correct_password 
  subroutine
modified:
  app-mvhub/bin/notification_email.pl
  app-mvhub/conf/sql_select.lib
  app-mvhub/t/sql_lib_sanity.t
  lib-mvhub/lib/MVHub/AuthAccount.pm


--
lp:mvhub
https://code.launchpad.net/~mvhub-dev/mvhub/trunk

Your team mvhub-dev is subscribed to branch lp:mvhub.
To unsubscribe from this branch go to https://code.launchpad.net/~mvhub-dev/mvhub/trunk/+edit-subscription

=== modified file 'app-mvhub/bin/notification_email.pl'
--- app-mvhub/bin/notification_email.pl	2010-04-13 14:57:16 +0000
+++ app-mvhub/bin/notification_email.pl	2010-04-16 14:20:33 +0000
@@ -35,9 +35,9 @@
 
 # Config File Variables
 my $cfg_filename = $ENV{MV_CONFIG_FILE};
-	Getopt::Long::GetOptions( 'config=s' => \$cfg_filename )
-        or die "GetOptions failed";
-        
+Getopt::Long::GetOptions( 'config=s' => \$cfg_filename )
+    or die "GetOptions failed";
+
 my $CFG = MVHub::Utils::ConfigSimple::create_config_from($cfg_filename);
 
 my $MAX_NOTIFICATIONS = $CFG->param('NOTIFICATION.max_notifications');
@@ -63,7 +63,7 @@
     my $execute = 0;
     Getopt::Long::GetOptions( 'execute' => \$execute )
         or die "GetOptions failed";
-        
+
     my @date = Date::Calc::Add_Delta_YM( Date::Calc::Today(), 0,
         -($EXPIRE_MONTHS) );
     my $expire_date = join '-', @date;

=== modified file 'app-mvhub/conf/sql_select.lib'
--- app-mvhub/conf/sql_select.lib	2010-04-06 15:14:41 +0000
+++ app-mvhub/conf/sql_select.lib	2010-04-15 17:42:46 +0000
@@ -77,6 +77,16 @@
  FROM 
        agency
 
+[AGENCY_X_AUTH_AGENCY]
+SELECT
+  agency_id 
+FROM 
+  agency 
+WHERE 
+  agency_id=?
+AND 
+  lower(password)=?
+  
 [AGENCY_X_EXPIRED_RECORDS]
    SELECT 
       agency_id, 

=== modified file 'app-mvhub/t/sql_lib_sanity.t'
--- app-mvhub/t/sql_lib_sanity.t	2010-04-06 15:14:41 +0000
+++ app-mvhub/t/sql_lib_sanity.t	2010-04-15 17:42:46 +0000
@@ -39,8 +39,9 @@
     my %data = (
         'AGENCY_X_AGENCY_NAME_PASSWORD' =>
             [ 'chester@xxxxxxxxxxxxxx', 'chester@xxxxxxxxxxxxxx' ],
-        'AGENCY_X_EXPIRED_RECORDS'                  => [ '01-01-2008', 0 ],
-        'AGENCY_X_WEBSITE'                          => [103553],
+        'AGENCY_X_AUTH_AGENCY'     => [ '103553',     '@lunch4all' ],
+        'AGENCY_X_EXPIRED_RECORDS' => [ '01-01-2008', 0 ],
+        'AGENCY_X_WEBSITE'         => [103553],
         'AGENCY_PROGRAM_X_AGENCY_NAME_AGENCY_ALIAS' => [510296],
         'CATEGORY_PROGRAM_VIEW_HEADING_CATEGORY_X_ID_NAME_COUNT' =>
             ['Arts/Culture/Entertainment'],

=== modified file 'lib-mvhub/lib/MVHub/AuthAccount.pm'
--- lib-mvhub/lib/MVHub/AuthAccount.pm	2009-12-14 16:12:55 +0000
+++ lib-mvhub/lib/MVHub/AuthAccount.pm	2010-04-15 17:42:46 +0000
@@ -94,32 +94,16 @@
 }
 
 sub is_correct_password {
-    my $dbh      = shift;
-    my $username = shift;
-    my $password = shift;
-    my $user_type;
-
-    if ( $username =~ /^\d{6,7}$/ ) {
-        $user_type = "agency";
-    }
-    else {
-        $user_type = "user";
-    }
-
-    # Separated into two if-then blocks for clarity.
-    # It might be faster to put SQL statements directly into
-    # previous if-then block.
+    my $dbh       = shift;
+    my $agency_id = shift;
+    my $password  = shift;
+
     my $stmt;
-    if ( $user_type eq "agency" ) {
-        $stmt
-            = "SELECT agency_id FROM agency WHERE agency_id=? AND lower(password)=?";
-    }
-    else {
-        $stmt
-            = "SELECT username FROM users WHERE username=? AND lower(password)=?";
-    }
+
+    $stmt = $dbh->retr_select_sql('AGENCY_X_AUTH_AGENCY');
+
     my $rows_aref
-        = $dbh->selectall_arrayref( $stmt, undef, $username, lc($password) );
+        = $dbh->selectall_arrayref( $stmt, undef, $agency_id, lc($password) );
     return ( scalar @$rows_aref == 1 );
 }