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

(-)a/C4/Auth.pm (-9 / +9 lines)
Lines 854-860 sub checkauth { Link Here
854
        );
854
        );
855
855
856
        if ( $return eq 'ok' || $return eq 'additional-auth-needed' ) {
856
        if ( $return eq 'ok' || $return eq 'additional-auth-needed' ) {
857
            $userid = $session->param('id');
857
            $userid = $session->param('userid');
858
        }
858
        }
859
859
860
        $auth_state =
860
        $auth_state =
Lines 1216-1222 sub checkauth { Link Here
1216
                    }
1216
                    }
1217
1217
1218
                    $session->param( 'number',       $borrowernumber );
1218
                    $session->param( 'number',       $borrowernumber );
1219
                    $session->param( 'id',           $userid );
1219
                    $session->param( 'userid',       $userid );
1220
                    $session->param( 'cardnumber',   $cardnumber );
1220
                    $session->param( 'cardnumber',   $cardnumber );
1221
                    $session->param( 'firstname',    $firstname );
1221
                    $session->param( 'firstname',    $firstname );
1222
                    $session->param( 'surname',      $surname );
1222
                    $session->param( 'surname',      $surname );
Lines 1236-1242 sub checkauth { Link Here
1236
                }
1236
                }
1237
                $session->param('cas_ticket', $cas_ticket) if $cas_ticket;
1237
                $session->param('cas_ticket', $cas_ticket) if $cas_ticket;
1238
                C4::Context->set_userenv(
1238
                C4::Context->set_userenv(
1239
                    $session->param('number'),       $session->param('id'),
1239
                    $session->param('number'),       $session->param('userid'),
1240
                    $session->param('cardnumber'),   $session->param('firstname'),
1240
                    $session->param('cardnumber'),   $session->param('firstname'),
1241
                    $session->param('surname'),      $session->param('branch'),
1241
                    $session->param('surname'),      $session->param('branch'),
1242
                    $session->param('branchname'),   $session->param('flags'),
1242
                    $session->param('branchname'),   $session->param('flags'),
Lines 1653-1659 sub check_api_auth { Link Here
1653
                    }
1653
                    }
1654
                }
1654
                }
1655
                $session->param( 'number',       $borrowernumber );
1655
                $session->param( 'number',       $borrowernumber );
1656
                $session->param( 'id',           $userid );
1656
                $session->param( 'userid',       $userid );
1657
                $session->param( 'cardnumber',   $cardnumber );
1657
                $session->param( 'cardnumber',   $cardnumber );
1658
                $session->param( 'firstname',    $firstname );
1658
                $session->param( 'firstname',    $firstname );
1659
                $session->param( 'surname',      $surname );
1659
                $session->param( 'surname',      $surname );
Lines 1667-1673 sub check_api_auth { Link Here
1667
            }
1667
            }
1668
            $session->param( 'cas_ticket', $cas_ticket);
1668
            $session->param( 'cas_ticket', $cas_ticket);
1669
            C4::Context->set_userenv(
1669
            C4::Context->set_userenv(
1670
                $session->param('number'),       $session->param('id'),
1670
                $session->param('number'),       $session->param('userid'),
1671
                $session->param('cardnumber'),   $session->param('firstname'),
1671
                $session->param('cardnumber'),   $session->param('firstname'),
1672
                $session->param('surname'),      $session->param('branch'),
1672
                $session->param('surname'),      $session->param('branch'),
1673
                $session->param('branchname'),   $session->param('flags'),
1673
                $session->param('branchname'),   $session->param('flags'),
Lines 1753-1759 sub check_cookie_auth { Link Here
1753
    C4::Context::_unset_userenv($sessionID); # remove old userenv first
1753
    C4::Context::_unset_userenv($sessionID); # remove old userenv first
1754
    my $session   = get_session($sessionID);
1754
    my $session   = get_session($sessionID);
1755
    if ($session) {
1755
    if ($session) {
1756
        my $userid   = $session->param('id');
1756
        my $userid   = $session->param('userid');
1757
        my $ip       = $session->param('ip');
1757
        my $ip       = $session->param('ip');
1758
        my $lasttime = $session->param('lasttime');
1758
        my $lasttime = $session->param('lasttime');
1759
        my $timeout = _timeout_syspref();
1759
        my $timeout = _timeout_syspref();
Lines 1790-1796 sub check_cookie_auth { Link Here
1790
                C4::Context->_new_userenv($sessionID);
1790
                C4::Context->_new_userenv($sessionID);
1791
                C4::Context->interface($session->param('interface'));
1791
                C4::Context->interface($session->param('interface'));
1792
                C4::Context->set_userenv(
1792
                C4::Context->set_userenv(
1793
                    $session->param('number'),       $session->param('id') // '',
1793
                    $session->param('number'),       $session->param('userid') // '',
1794
                    $session->param('cardnumber'),   $session->param('firstname'),
1794
                    $session->param('cardnumber'),   $session->param('firstname'),
1795
                    $session->param('surname'),      $session->param('branch'),
1795
                    $session->param('surname'),      $session->param('branch'),
1796
                    $session->param('branchname'),   $session->param('flags'),
1796
                    $session->param('branchname'),   $session->param('flags'),
Lines 1891-1897 sub create_basic_session { Link Here
1891
    my $session = get_session("");
1891
    my $session = get_session("");
1892
1892
1893
    $session->param( 'number',       $patron->borrowernumber );
1893
    $session->param( 'number',       $patron->borrowernumber );
1894
    $session->param( 'id',           $patron->userid );
1894
    $session->param( 'userid',       $patron->userid );
1895
    $session->param( 'cardnumber',   $patron->cardnumber );
1895
    $session->param( 'cardnumber',   $patron->cardnumber );
1896
    $session->param( 'firstname',    $patron->firstname );
1896
    $session->param( 'firstname',    $patron->firstname );
1897
    $session->param( 'surname',      $patron->surname );
1897
    $session->param( 'surname',      $patron->surname );
Lines 1899-1905 sub create_basic_session { Link Here
1899
    $session->param( 'branchname',   $patron->library->branchname );
1899
    $session->param( 'branchname',   $patron->library->branchname );
1900
    $session->param( 'flags',        $patron->flags );
1900
    $session->param( 'flags',        $patron->flags );
1901
    $session->param( 'emailaddress', $patron->email );
1901
    $session->param( 'emailaddress', $patron->email );
1902
    $session->param( 'ip',           $session->remote_addr() );
1902
    $session->param( 'ip',           $ENV{REMOTE_ADDR} ); # FIXME $session->remote_addr() );
1903
    $session->param( 'lasttime',     time() );
1903
    $session->param( 'lasttime',     time() );
1904
    $session->param( 'interface',    $interface);
1904
    $session->param( 'interface',    $interface);
1905
1905
(-)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 963-969 subtest 'create_basic_session tests' => sub { Link Here
963
963
964
    isnt($session->id, undef, 'A new sessionID was created');
964
    isnt($session->id, undef, 'A new sessionID was created');
965
    is( $session->param('number'), $patron->borrowernumber, 'Session parameter number matches' );
965
    is( $session->param('number'), $patron->borrowernumber, 'Session parameter number matches' );
966
    is( $session->param('id'), $patron->userid, 'Session parameter id matches' );
966
    is( $session->param('userid'), $patron->userid, 'Session parameter userid matches' );
967
    is( $session->param('cardnumber'), $patron->cardnumber, 'Session parameter cardnumber matches' );
967
    is( $session->param('cardnumber'), $patron->cardnumber, 'Session parameter cardnumber matches' );
968
    is( $session->param('firstname'), $patron->firstname, 'Session parameter firstname matches' );
968
    is( $session->param('firstname'), $patron->firstname, 'Session parameter firstname matches' );
969
    is( $session->param('surname'), $patron->surname, 'Session parameter surname matches' );
969
    is( $session->param('surname'), $patron->surname, 'Session parameter surname matches' );
Lines 971-977 subtest 'create_basic_session tests' => sub { Link Here
971
    is( $session->param('branchname'), $patron->library->branchname, 'Session parameter branchname matches' );
971
    is( $session->param('branchname'), $patron->library->branchname, 'Session parameter branchname matches' );
972
    is( $session->param('flags'), $patron->flags, 'Session parameter flags matches' );
972
    is( $session->param('flags'), $patron->flags, 'Session parameter flags matches' );
973
    is( $session->param('emailaddress'), $patron->email, 'Session parameter emailaddress matches' );
973
    is( $session->param('emailaddress'), $patron->email, 'Session parameter emailaddress matches' );
974
    is( $session->param('ip'), $session->remote_addr(), 'Session parameter ip matches' );
974
    is( $session->param('ip'), $ENV{REMOTE_ADDR}, 'Session parameter ip matches' );
975
    is( $session->param('interface'), 'opac', 'Session parameter interface matches' );
975
    is( $session->param('interface'), 'opac', 'Session parameter interface matches' );
976
976
977
    $session = C4::Auth::create_basic_session({ patron => $patron, interface => 'staff' });
977
    $session = C4::Auth::create_basic_session({ patron => $patron, interface => 'staff' });
978
- 

Return to bug 17427