projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
AuthCookieHandler.pm
diff --git
a/FS/FS/AuthCookieHandler.pm
b/FS/FS/AuthCookieHandler.pm
index
cd89f55
..
b571e47
100644
(file)
--- a/
FS/FS/AuthCookieHandler.pm
+++ b/
FS/FS/AuthCookieHandler.pm
@@
-11,24
+11,23
@@
sub authen_cred {
preuser_setup();
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";
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;
}
FS::CurrentUser->new_session;
}
-sub _is_valid_user {
- my( $username, $password ) = @_;
-
- FS::Auth->authenticate($username, $password);
-}
-
sub authen_ses_key {
my( $self, $r, $sessionkey ) = @_;
sub authen_ses_key {
my( $self, $r, $sessionkey ) = @_;