[interchange-cvs] interchange - jonc modified lib/Vend/UserDB.pm

[interchange-cvs at icdevgroup.org]

User:      jonc
Date:      2005-07-19 14:30:26 GMT
Modified:  lib/Vend UserDB.pm
Log:
Make indirect_login work with auto-created users.

   * if there is no PASSED_USERNAME, it should be the value
     (eg. email), not the auto-generated primary key above (Uxxxxx).
   * $foreign will be set to the name of the field, and so
     will never be the username, its already set.

Revision  Changes    Path
2.37      +3 -4      interchange/lib/Vend/UserDB.pm


rev 2.37, prev_rev 2.36
Index: UserDB.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/UserDB.pm,v
retrieving revision 2.36
retrieving revision 2.37
diff -u -r2.36 -r2.37
--- UserDB.pm	30 Apr 2005 15:09:58 -0000	2.36
+++ UserDB.pm	19 Jul 2005 14:30:26 -0000	2.37
@@ -1,6 +1,6 @@
 # Vend::UserDB - Interchange user database functions
 #
-# $Id: UserDB.pm,v 2.36 2005/04/30 15:09:58 mheins Exp $
+# $Id: UserDB.pm,v 2.37 2005/07/19 14:30:26 jonc Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -17,7 +17,7 @@
 
 package Vend::UserDB;
 
-$VERSION = substr(q$Revision: 2.36 $, 10);
+$VERSION = substr(q$Revision: 2.37 $, 10);
 
 use vars qw!
 	$VERSION
@@ -1090,7 +1090,7 @@
 		my $foreign = $self->{OPTIONS}{indirect_login};
 
 		if($foreign) {
-			my $uname = ($self->{PASSED_USERNAME} ||= $self->{USERNAME});
+			my $uname = ($self->{PASSED_USERNAME} ||= $::Values->{$foreign});
 			my $ufield = $self->{LOCATION}{USERNAME};
 			$uname = $udb->quote($uname);
 			my $q = "select $ufield from $self->{DB_ID} where $foreign = $uname";
@@ -1532,7 +1532,6 @@
 			$Vend::Session->{auto_created_user} = $self->{USERNAME};
 		}
 		else {
-			$self->{USERNAME} = $foreign if $foreign;
 			username_cookies($self->{USERNAME}, $pw) 
 				if $Vend::Cfg->{CookieLogin};