Skip to content

Update authenticate_user to synchronise with changes made in Auth::Extensible::Role::Provider #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pawelwlod wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update authenticate_user to synchronise with changes made in Auth::Extensible::Role::Provider #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 26 additions & 21 deletions lib/Dancer2/Plugin/Auth/Extensible/Provider/DBIC.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use Moo;
with "Dancer2::Plugin::Auth::Extensible::Role::Provider";
use namespace::clean;

our $VERSION = '0.623';
our $VERSION = '0.625';

=head1 NAME

Expand Down Expand Up @@ -600,7 +600,7 @@ sub authenticate_user {
croak "username and password must be defined"
unless defined $username && defined $password;

my ( $user ) = $self->_user_rset( 'username', $username )->all;
my ( $user ) = $self->_user_rset( username => $username )->all;
return unless $user;

if ( my $password_check = $self->users_password_check ) {
Expand All @@ -612,28 +612,33 @@ sub authenticate_user {
# working out if the password is correct
my $password_column = $self->users_password_column;

if ( my $match =
$self->match_password( $password, $user->$password_column ) )
{
if ( $options{lastlogin} ) {
if ( my $lastlogin = $user->lastlogin ) {
if ( ref($lastlogin) eq '' ) {
# not inflated to DateTime
my $db_parser = $self->schema->storage->datetime_parser;
$lastlogin = $db_parser->parse_datetime($lastlogin);
}
# Stash in session as epoch since we don't want to have to mess
# with with stringified data or perhaps session engine barfing
# when trying to serialize DateTime object.
$self->plugin->app->session->write(
$options{lastlogin} => $lastlogin->epoch );
my $match = $self->match_password( $password, $user->$password_column );
return unless $match && $match->{valid}; # Make sure we return nothing

if ( $match->{legacy} ) {
my $new_hash = $self->encrypt_password($password);
$user->update({ $password_column => $new_hash });
}

if ( $options{lastlogin} ) {
if ( my $lastlogin = $user->lastlogin ) {
if ( ref($lastlogin) eq '' ) {
# not inflated to DateTime
my $db_parser = $self->schema->storage->datetime_parser;
$lastlogin = $db_parser->parse_datetime($lastlogin);
}
$self->set_user_details( $username,
$self->users_lastlogin_column => DateTime->now, );
# Stash in session as epoch since we don't want to have to mess
# with with stringified data or perhaps session engine barfing
# when trying to serialize DateTime object.
$self->plugin->app->session->write(
$options{lastlogin} => $lastlogin->epoch
);
}
return $match;
$self->set_user_details( $username,
$self->users_lastlogin_column => DateTime->now,
);
}
return; # Make sure we return nothing
return 1;
}

sub set_user_password {
Expand Down