Skip to content

fix login for non-pause users #1860

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

Merged
merged 2 commits into from
Mar 20, 2017
Merged

fix login for non-pause users #1860

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
800c839
fix login for non-pause users
haarg Mar 19, 2017
e540d82
Tidy.
oalders Mar 20, 2017
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
28 changes: 11 additions & 17 deletions lib/MetaCPAN/Web/Controller/Account/Favorite.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,13 @@ BEGIN { extends 'MetaCPAN::Web::Controller' }
sub auto : Private {
my ( $self, $c ) = @_;

# Needed to clear the cache
my $user = $c->model('API::User')->get_profile( $c->token )->recv;

# Probably we shouldn't be getting to this point without a defined user,
# but sometimes we do. Might have been an issue with the v0 => v1
# migration.

$c->detach('/forbidden') unless $user && $user->{user};

$c->stash->{user} = $user;

return 1;
if ( my $token = $c->token ) {
$c->authenticate( { token => $token } );
}
unless ( $c->user_exists ) {
$c->forward('/forbidden');
}
return $c->user_exists;
}

sub add : Local : Args(0) {
Expand Down Expand Up @@ -78,18 +73,17 @@ sub list_as_json : Local : Args(0) {
sub _cache_key_for_user {
my ( $self, $c ) = @_;

my $user = $c->stash->{user};
my $user = $c->user;

return 'user/' . $user->{user};
return 'user/' . $user->id;
}

sub _add_fav_list_to_stash {
my ( $self, $c, $size ) = @_;

my $user = $c->stash->{user};
my $user = $c->user;

my $faves_cv
= $c->model('API::Favorite')->by_user( $user->{user}, $size );
my $faves_cv = $c->model('API::Favorite')->by_user( $user->id, $size );
my $faves_data = $faves_cv->recv;
my $faves = [
sort { $b->{date} cmp $a->{date} }
Expand Down