View | Details | Raw Unified | Return to bug 17427
Collapse All | Expand All

(-)a/C4/Auth.pm (-9 / +9 lines)
Lines 855-861 sub checkauth { Link Here
855
        );
855
        );
856
856
857
        if ( $return eq 'ok' || $return eq 'additional-auth-needed' ) {
857
        if ( $return eq 'ok' || $return eq 'additional-auth-needed' ) {
858
            $userid = $session->param('id');
858
            $userid = $session->param('userid');
859
        }
859
        }
860
860
861
        $auth_state =
861
        $auth_state =
Lines 1217-1223 sub checkauth { Link Here
1217
                    }
1217
                    }
1218
1218
1219
                    $session->param( 'number',       $borrowernumber );
1219
                    $session->param( 'number',       $borrowernumber );
1220
                    $session->param( 'id',           $userid );
1220
                    $session->param( 'userid',       $userid );
1221
                    $session->param( 'cardnumber',   $cardnumber );
1221
                    $session->param( 'cardnumber',   $cardnumber );
1222
                    $session->param( 'firstname',    $firstname );
1222
                    $session->param( 'firstname',    $firstname );
1223
                    $session->param( 'surname',      $surname );
1223
                    $session->param( 'surname',      $surname );
Lines 1237-1243 sub checkauth { Link Here
1237
                }
1237
                }
1238
                $session->param('cas_ticket', $cas_ticket) if $cas_ticket;
1238
                $session->param('cas_ticket', $cas_ticket) if $cas_ticket;
1239
                C4::Context->set_userenv(
1239
                C4::Context->set_userenv(
1240
                    $session->param('number'),       $session->param('id'),
1240
                    $session->param('number'),       $session->param('userid'),
1241
                    $session->param('cardnumber'),   $session->param('firstname'),
1241
                    $session->param('cardnumber'),   $session->param('firstname'),
1242
                    $session->param('surname'),      $session->param('branch'),
1242
                    $session->param('surname'),      $session->param('branch'),
1243
                    $session->param('branchname'),   $session->param('flags'),
1243
                    $session->param('branchname'),   $session->param('flags'),
Lines 1654-1660 sub check_api_auth { Link Here
1654
                    }
1654
                    }
1655
                }
1655
                }
1656
                $session->param( 'number',       $borrowernumber );
1656
                $session->param( 'number',       $borrowernumber );
1657
                $session->param( 'id',           $userid );
1657
                $session->param( 'userid',       $userid );
1658
                $session->param( 'cardnumber',   $cardnumber );
1658
                $session->param( 'cardnumber',   $cardnumber );
1659
                $session->param( 'firstname',    $firstname );
1659
                $session->param( 'firstname',    $firstname );
1660
                $session->param( 'surname',      $surname );
1660
                $session->param( 'surname',      $surname );
Lines 1668-1674 sub check_api_auth { Link Here
1668
            }
1668
            }
1669
            $session->param( 'cas_ticket', $cas_ticket);
1669
            $session->param( 'cas_ticket', $cas_ticket);
1670
            C4::Context->set_userenv(
1670
            C4::Context->set_userenv(
1671
                $session->param('number'),       $session->param('id'),
1671
                $session->param('number'),       $session->param('userid'),
1672
                $session->param('cardnumber'),   $session->param('firstname'),
1672
                $session->param('cardnumber'),   $session->param('firstname'),
1673
                $session->param('surname'),      $session->param('branch'),
1673
                $session->param('surname'),      $session->param('branch'),
1674
                $session->param('branchname'),   $session->param('flags'),
1674
                $session->param('branchname'),   $session->param('flags'),
Lines 1754-1760 sub check_cookie_auth { Link Here
1754
    C4::Context::_unset_userenv($sessionID); # remove old userenv first
1754
    C4::Context::_unset_userenv($sessionID); # remove old userenv first
1755
    my $session   = get_session($sessionID);
1755
    my $session   = get_session($sessionID);
1756
    if ($session) {
1756
    if ($session) {
1757
        my $userid   = $session->param('id');
1757
        my $userid   = $session->param('userid');
1758
        my $ip       = $session->param('ip');
1758
        my $ip       = $session->param('ip');
1759
        my $lasttime = $session->param('lasttime');
1759
        my $lasttime = $session->param('lasttime');
1760
        my $timeout = _timeout_syspref();
1760
        my $timeout = _timeout_syspref();
Lines 1782-1788 sub check_cookie_auth { Link Here
1782
                C4::Context->_new_userenv($sessionID);
1782
                C4::Context->_new_userenv($sessionID);
1783
                C4::Context->interface($session->param('interface'));
1783
                C4::Context->interface($session->param('interface'));
1784
                C4::Context->set_userenv(
1784
                C4::Context->set_userenv(
1785
                    $session->param('number'),       $session->param('id') // '',
1785
                    $session->param('number'),       $session->param('userid') // '',
1786
                    $session->param('cardnumber'),   $session->param('firstname'),
1786
                    $session->param('cardnumber'),   $session->param('firstname'),
1787
                    $session->param('surname'),      $session->param('branch'),
1787
                    $session->param('surname'),      $session->param('branch'),
1788
                    $session->param('branchname'),   $session->param('flags'),
1788
                    $session->param('branchname'),   $session->param('flags'),
Lines 1883-1889 sub create_basic_session { Link Here
1883
    my $session = get_session("");
1883
    my $session = get_session("");
1884
1884
1885
    $session->param( 'number',       $patron->borrowernumber );
1885
    $session->param( 'number',       $patron->borrowernumber );
1886
    $session->param( 'id',           $patron->userid );
1886
    $session->param( 'userid',       $patron->userid );
1887
    $session->param( 'cardnumber',   $patron->cardnumber );
1887
    $session->param( 'cardnumber',   $patron->cardnumber );
1888
    $session->param( 'firstname',    $patron->firstname );
1888
    $session->param( 'firstname',    $patron->firstname );
1889
    $session->param( 'surname',      $patron->surname );
1889
    $session->param( 'surname',      $patron->surname );
Lines 1891-1897 sub create_basic_session { Link Here
1891
    $session->param( 'branchname',   $patron->library->branchname );
1891
    $session->param( 'branchname',   $patron->library->branchname );
1892
    $session->param( 'flags',        $patron->flags );
1892
    $session->param( 'flags',        $patron->flags );
1893
    $session->param( 'emailaddress', $patron->email );
1893
    $session->param( 'emailaddress', $patron->email );
1894
    $session->param( 'ip',           $session->remote_addr() );
1894
    $session->param( 'ip',           $ENV{REMOTE_ADDR} ); # FIXME $session->remote_addr() );
1895
    $session->param( 'lasttime',     time() );
1895
    $session->param( 'lasttime',     time() );
1896
    $session->param( 'interface',    $interface);
1896
    $session->param( 'interface',    $interface);
1897
1897
(-)a/t/db_dependent/Auth.t (-5 / +4 lines)
Lines 157-163 subtest 'checkauth() tests' => sub { Link Here
157
        # Create 'former' session
157
        # Create 'former' session
158
        my $session = C4::Auth::get_session();
158
        my $session = C4::Auth::get_session();
159
        $session->param( 'number',       $patron->id );
159
        $session->param( 'number',       $patron->id );
160
        $session->param( 'id',           $patron->userid );
160
        $session->param( 'userid',       $patron->userid );
161
        $session->param( 'ip',           '1.2.3.4' );
161
        $session->param( 'ip',           '1.2.3.4' );
162
        $session->param( 'lasttime',     time() );
162
        $session->param( 'lasttime',     time() );
163
        $session->param( 'interface',    'opac' );
163
        $session->param( 'interface',    'opac' );
Lines 196-202 subtest 'checkauth() tests' => sub { Link Here
196
        # Similar situation: Relogin with former session of $patron, new user $patron2 has no permissions
196
        # Similar situation: Relogin with former session of $patron, new user $patron2 has no permissions
197
        $patron2->flags(undef)->store;
197
        $patron2->flags(undef)->store;
198
        $session->param( 'number',       $patron->id );
198
        $session->param( 'number',       $patron->id );
199
        $session->param( 'id',           $patron->userid );
199
        $session->param( 'userid',       $patron->userid );
200
        $session->param( 'interface',    'intranet' );
200
        $session->param( 'interface',    'intranet' );
201
        $session->flush;
201
        $session->flush;
202
        $sessionID = $session->id;
202
        $sessionID = $session->id;
Lines 946-952 subtest 'create_basic_session tests' => sub { Link Here
946
946
947
    isnt($session->id, undef, 'A new sessionID was created');
947
    isnt($session->id, undef, 'A new sessionID was created');
948
    is( $session->param('number'), $patron->borrowernumber, 'Session parameter number matches' );
948
    is( $session->param('number'), $patron->borrowernumber, 'Session parameter number matches' );
949
    is( $session->param('id'), $patron->userid, 'Session parameter id matches' );
949
    is( $session->param('userid'), $patron->userid, 'Session parameter userid matches' );
950
    is( $session->param('cardnumber'), $patron->cardnumber, 'Session parameter cardnumber matches' );
950
    is( $session->param('cardnumber'), $patron->cardnumber, 'Session parameter cardnumber matches' );
951
    is( $session->param('firstname'), $patron->firstname, 'Session parameter firstname matches' );
951
    is( $session->param('firstname'), $patron->firstname, 'Session parameter firstname matches' );
952
    is( $session->param('surname'), $patron->surname, 'Session parameter surname matches' );
952
    is( $session->param('surname'), $patron->surname, 'Session parameter surname matches' );
Lines 954-960 subtest 'create_basic_session tests' => sub { Link Here
954
    is( $session->param('branchname'), $patron->library->branchname, 'Session parameter branchname matches' );
954
    is( $session->param('branchname'), $patron->library->branchname, 'Session parameter branchname matches' );
955
    is( $session->param('flags'), $patron->flags, 'Session parameter flags matches' );
955
    is( $session->param('flags'), $patron->flags, 'Session parameter flags matches' );
956
    is( $session->param('emailaddress'), $patron->email, 'Session parameter emailaddress matches' );
956
    is( $session->param('emailaddress'), $patron->email, 'Session parameter emailaddress matches' );
957
    is( $session->param('ip'), $session->remote_addr(), 'Session parameter ip matches' );
957
    is( $session->param('ip'), $ENV{REMOTE_ADDR}, 'Session parameter ip matches' );
958
    is( $session->param('interface'), 'opac', 'Session parameter interface matches' );
958
    is( $session->param('interface'), 'opac', 'Session parameter interface matches' );
959
959
960
    $session = C4::Auth::create_basic_session({ patron => $patron, interface => 'staff' });
960
    $session = C4::Auth::create_basic_session({ patron => $patron, interface => 'staff' });
961
- 

Return to bug 17427