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

(-)a/C4/Auth.pm (-28 / +4 lines)
Lines 1289-1303 sub checkauth { Link Here
1289
                    $session->param( 'sco_user', $is_sco_user );
1289
                    $session->param( 'sco_user', $is_sco_user );
1290
                }
1290
                }
1291
                $session->param('cas_ticket', $cas_ticket) if $cas_ticket;
1291
                $session->param('cas_ticket', $cas_ticket) if $cas_ticket;
1292
                C4::Context->set_userenv(
1292
                C4::Context->set_userenv_from_session($session);
1293
                    $session->param('number'),       $session->param('id'),
1294
                    $session->param('cardnumber'),   $session->param('firstname'),
1295
                    $session->param('surname'),      $session->param('branch'),
1296
                    $session->param('branchname'),   $session->param('flags'),
1297
                    $session->param('emailaddress'), $session->param('shibboleth'),
1298
                    $session->param('desk_id'),      $session->param('desk_name'),
1299
                    $session->param('register_id'),  $session->param('register_name')
1300
                );
1301
1293
1302
            }
1294
            }
1303
            # $return: 0 = invalid user
1295
            # $return: 0 = invalid user
Lines 1751-1765 sub check_api_auth { Link Here
1751
                $session->param( 'interface',    'api'  );
1743
                $session->param( 'interface',    'api'  );
1752
            }
1744
            }
1753
            $session->param( 'cas_ticket', $cas_ticket);
1745
            $session->param( 'cas_ticket', $cas_ticket);
1754
            C4::Context->set_userenv(
1746
            C4::Context->set_userenv_from_session($session);
1755
                $session->param('number'),       $session->param('id'),
1756
                $session->param('cardnumber'),   $session->param('firstname'),
1757
                $session->param('surname'),      $session->param('branch'),
1758
                $session->param('branchname'),   $session->param('flags'),
1759
                $session->param('emailaddress'), $session->param('shibboleth'),
1760
                $session->param('desk_id'),      $session->param('desk_name'),
1761
                $session->param('register_id'),  $session->param('register_name')
1762
            );
1763
            return ( "ok", $cookie, $sessionID );
1747
            return ( "ok", $cookie, $sessionID );
1764
        } else {
1748
        } else {
1765
            return ( "failed", undef, undef );
1749
            return ( "failed", undef, undef );
Lines 1876-1890 sub check_cookie_auth { Link Here
1876
                    # No need to override the interface, most often set by get_template_and_user
1860
                    # No need to override the interface, most often set by get_template_and_user
1877
                    C4::Context->interface( $session->param('interface') );
1861
                    C4::Context->interface( $session->param('interface') );
1878
                }
1862
                }
1879
                C4::Context->set_userenv(
1863
1880
                    $session->param('number'),       $session->param('id') // '',
1864
                C4::Context->set_userenv_from_session($session);
1881
                    $session->param('cardnumber'),   $session->param('firstname'),
1882
                    $session->param('surname'),      $session->param('branch'),
1883
                    $session->param('branchname'),   $session->param('flags'),
1884
                    $session->param('emailaddress'), $session->param('shibboleth'),
1885
                    $session->param('desk_id'),      $session->param('desk_name'),
1886
                    $session->param('register_id'),  $session->param('register_name')
1887
                );
1888
                if ( C4::Context->preference('TwoFactorAuthentication') ne 'disabled' ) {
1865
                if ( C4::Context->preference('TwoFactorAuthentication') ne 'disabled' ) {
1889
                    return ( "additional-auth-needed", $session )
1866
                    return ( "additional-auth-needed", $session )
1890
                        if $session->param('waiting-for-2FA');
1867
                        if $session->param('waiting-for-2FA');
1891
- 

Return to bug 37041