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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-2 / +2 lines)
Lines 60-66 Link Here
60
                                                <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves" tabindex="-1" role="menuitem" class="listmenulink">New list</a></li>
60
                                                <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves" tabindex="-1" role="menuitem" class="listmenulink">New list</a></li>
61
                                            [% END %]
61
                                            [% END %]
62
                                        [% ELSIF ( Koha.Preference('GoogleOAuth2') == 1 ) %]
62
                                        [% ELSIF ( Koha.Preference('GoogleOAuth2') == 1 ) %]
63
                                            <li role="presentation"><a href="/cgi-bin/koha/svc/googleoauth2" tabindex="-1" class="menu-inactive" role="menuitem">Log in to create your own lists</a></li>
63
                                            <li role="presentation"><a href="/cgi-bin/koha/svc/auth/googleoauth2" tabindex="-1" class="menu-inactive" role="menuitem">Log in to create your own lists</a></li>
64
                                        [% ELSE %]
64
                                        [% ELSE %]
65
                                            <li role="presentation"><a href="/cgi-bin/koha/opac-user.pl" tabindex="-1" class="menu-inactive loginModal-trigger" role="menuitem">Log in to create your own lists</a></li>
65
                                            <li role="presentation"><a href="/cgi-bin/koha/opac-user.pl" tabindex="-1" class="menu-inactive loginModal-trigger" role="menuitem">Log in to create your own lists</a></li>
66
                                        [% END # / IF loggedinusername %]
66
                                        [% END # / IF loggedinusername %]
Lines 116-122 Link Here
116
                                            [%# CAS authentication is too complicated for modal window %]
116
                                            [%# CAS authentication is too complicated for modal window %]
117
                                            <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
117
                                            <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
118
                                        [% ELSIF ( Koha.Preference('GoogleOAuth2') == 1 ) %]
118
                                        [% ELSIF ( Koha.Preference('GoogleOAuth2') == 1 ) %]
119
                                            <li><a href="/cgi-bin/koha/svc/googleoauth2" role="button" data-toggle="modal">Log in to your account</a></li>
119
                                            <li><a href="/cgi-bin/koha/svc/auth/googleoauth2" role="button" data-toggle="modal">Log in to your account</a></li>
120
                                        [% ELSE %]
120
                                        [% ELSE %]
121
                                            <li><a href="/cgi-bin/koha/opac-user.pl" class="loginModal-trigger" role="button" data-toggle="modal">Log in to your account</a></li>
121
                                            <li><a href="/cgi-bin/koha/opac-user.pl" class="loginModal-trigger" role="button" data-toggle="modal">Log in to your account</a></li>
122
                                        [% END %]
122
                                        [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (-1 / +1 lines)
Lines 142-148 Link Here
142
                                <h4>Automatic Login</h4>
142
                                <h4>Automatic Login</h4>
143
                                <p>Sorry, your automatic login failed. <span class="error">[% invalidOAuth2Login %]</span></p>
143
                                <p>Sorry, your automatic login failed. <span class="error">[% invalidOAuth2Login %]</span></p>
144
                                <p>Please note that automatic login will only work if you are using the emal address registered with this library.</p>
144
                                <p>Please note that automatic login will only work if you are using the emal address registered with this library.</p>
145
                                <p>If you want to, you can try to <a href="/cgi-bin/koha/svc/googleoauth2?reauthenticate=select_account">login using a different account</a>
145
                                <p>If you want to, you can try to <a href="/cgi-bin/koha/svc/auth/googleoauth2?reauthenticate=select_account">login using a different account</a>
146
                                <h4>Local login</h4>
146
                                <h4>Local login</h4>
147
                                <p>If you can't login automatically, you can still login manually: </p>
147
                                <p>If you can't login automatically, you can still login manually: </p>
148
                            [% END %]
148
                            [% END %]
(-)a/opac/svc/auth/googleoauth2 (-2 / +1 lines)
Lines 51-57 my $host = C4::Context->preference('OPACBaseURL') // ''; Link Here
51
my $restricttodomain = C4::Context->preference('GoogleOAuth2Domain') // '';
51
my $restricttodomain = C4::Context->preference('GoogleOAuth2Domain') // '';
52
52
53
# protocol is assumed in OPACBaseURL see bug 5010.
53
# protocol is assumed in OPACBaseURL see bug 5010.
54
my $redirecturl  = $host . '/cgi-bin/koha/svc/googleoauth2';
54
my $redirecturl  = $host . '/cgi-bin/koha/svc/auth/googleoauth2';
55
my $issuer       = 'accounts.google.com';
55
my $issuer       = 'accounts.google.com';
56
my $clientid     = C4::Context->preference('GoogleOAuth2ClientID');
56
my $clientid     = C4::Context->preference('GoogleOAuth2ClientID');
57
my $clientsecret = C4::Context->preference('GoogleOAuth2ClientSecret');
57
my $clientsecret = C4::Context->preference('GoogleOAuth2ClientSecret');
58
- 

Return to bug 10988