use strict;
use FS::UID qw( adminsuidsetup preuser_setup );
use FS::CurrentUser;
-
-my $module = 'legacy'; #XXX i am set in a conf somehow? or a config file
+use FS::Auth;
sub authen_cred {
my( $self, $r, $username, $password ) = @_;
+ preuser_setup();
+
unless ( _is_valid_user($username, $password) ) {
warn "failed auth $username from ". $r->connection->remote_ip. "\n";
return undef;
}
warn "authenticated $username from ". $r->connection->remote_ip. "\n";
- adminsuidsetup($username);
- FS::CurrentUser->new_session;
+ FS::CurrentUser->load_user($username);
+ FS::CurrentUser->new_session;
}
sub _is_valid_user {
my( $username, $password ) = @_;
- my $class = 'FS::Auth::'.$module;
-
- #earlier?
- eval "use $class;";
- die $@ if $@;
-
- $class->authenticate($username, $password);
+ FS::Auth->authenticate($username, $password);
}
sub authen_ses_key {
}
$curuser->username;
-
}
1;
'access_user' => {
'columns' => [
- 'usernum', 'serial', '', '', '', '',
- 'username', 'varchar', '', $char_d, '', '',
- '_password', 'varchar', '', $char_d, '', '',
- 'last', 'varchar', '', $char_d, '', '',
- 'first', 'varchar', '', $char_d, '', '',
- 'user_custnum', 'int', 'NULL', '', '', '',
- 'disabled', 'char', 'NULL', 1, '', '',
+ 'usernum', 'serial', '', '', '', '',
+ 'username', 'varchar', '', $char_d, '', '',
+ '_password', 'varchar', '', $char_d, '', '',
+ '_password_encoding', 'varchar', 'NULL', $char_d, '', '',
+ 'last', 'varchar', '', $char_d, '', '',
+ 'first', 'varchar', '', $char_d, '', '',
+ 'user_custnum', 'int', 'NULL', '', '', '',
+ 'disabled', 'char', 'NULL', 1, '', '',
],
'primary_key' => 'usernum',
'unique' => [ [ 'username' ] ],