X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FAuthCookieHandler.pm;h=b571e4705ca4a9100c6a73e728a30f73623d395f;hb=7c370a4579d1ed8b81dba2fb5fae9978b283b49e;hp=cd89f55afc1239bed58e338c427ccf68315165b2;hpb=92a3df0360d3df6b6ace99fee3d4cc443e6154d0;p=freeside.git diff --git a/FS/FS/AuthCookieHandler.pm b/FS/FS/AuthCookieHandler.pm index cd89f55af..b571e4705 100644 --- a/FS/FS/AuthCookieHandler.pm +++ b/FS/FS/AuthCookieHandler.pm @@ -11,24 +11,23 @@ sub authen_cred { preuser_setup(); - unless ( _is_valid_user($username, $password) ) { + my $info = {}; + + unless ( FS::Auth->authenticate($username, $password, $info) ) { warn "failed auth $username from ". $r->connection->remote_ip. "\n"; return undef; } warn "authenticated $username from ". $r->connection->remote_ip. "\n"; - FS::CurrentUser->load_user($username); + FS::CurrentUser->load_user( $username, + 'autocreate' => FS::Auth->auth_class->autocreate, + %$info, + ); FS::CurrentUser->new_session; } -sub _is_valid_user { - my( $username, $password ) = @_; - - FS::Auth->authenticate($username, $password); -} - sub authen_ses_key { my( $self, $r, $sessionkey ) = @_;