Bugzilla – Attachment 41663 Details for
Bug 10988
Allow login via Google OAuth2 (OpenID Connect)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10988: Fix the svc script path
Bug-10988-Fix-the-svc-script-path.patch (text/plain), 4.59 KB, created by
Jonathan Druart
on 2015-08-19 13:00:01 UTC
(
hide
)
Description:
Bug 10988: Fix the svc script path
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2015-08-19 13:00:01 UTC
Size:
4.59 KB
patch
obsolete
>From 1d0c2180edf609435dc9c9f61e08ef5de2cbf85c Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 19 Aug 2015 13:59:44 +0100 >Subject: [PATCH] Bug 10988: Fix the svc script path > >--- > koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 4 ++-- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt | 2 +- > opac/svc/auth/googleoauth2 | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index 37fc757..ab42610 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -60,7 +60,7 @@ > <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves" tabindex="-1" role="menuitem" class="listmenulink">New list</a></li> > [% END %] > [% ELSIF ( Koha.Preference('GoogleOAuth2') == 1 ) %] >- <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> >+ <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> > [% ELSE %] > <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> > [% END # / IF loggedinusername %] >@@ -116,7 +116,7 @@ > [%# CAS authentication is too complicated for modal window %] > <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li> > [% ELSIF ( Koha.Preference('GoogleOAuth2') == 1 ) %] >- <li><a href="/cgi-bin/koha/svc/googleoauth2" role="button" data-toggle="modal">Log in to your account</a></li> >+ <li><a href="/cgi-bin/koha/svc/auth/googleoauth2" role="button" data-toggle="modal">Log in to your account</a></li> > [% ELSE %] > <li><a href="/cgi-bin/koha/opac-user.pl" class="loginModal-trigger" role="button" data-toggle="modal">Log in to your account</a></li> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >index 28e206d..3f5e0f8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >@@ -142,7 +142,7 @@ > <h4>Automatic Login</h4> > <p>Sorry, your automatic login failed. <span class="error">[% invalidOAuth2Login %]</span></p> > <p>Please note that automatic login will only work if you are using the emal address registered with this library.</p> >- <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> >+ <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> > <h4>Local login</h4> > <p>If you can't login automatically, you can still login manually: </p> > [% END %] >diff --git a/opac/svc/auth/googleoauth2 b/opac/svc/auth/googleoauth2 >index ee8826e..07ff084 100755 >--- a/opac/svc/auth/googleoauth2 >+++ b/opac/svc/auth/googleoauth2 >@@ -51,7 +51,7 @@ my $host = C4::Context->preference('OPACBaseURL') // ''; > my $restricttodomain = C4::Context->preference('GoogleOAuth2Domain') // ''; > > # protocol is assumed in OPACBaseURL see bug 5010. >-my $redirecturl = $host . '/cgi-bin/koha/svc/googleoauth2'; >+my $redirecturl = $host . '/cgi-bin/koha/svc/auth/googleoauth2'; > my $issuer = 'accounts.google.com'; > my $clientid = C4::Context->preference('GoogleOAuth2ClientID'); > my $clientsecret = C4::Context->preference('GoogleOAuth2ClientSecret'); >-- >2.1.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10988
:
21740
|
21936
|
21938
|
21939
|
25343
|
25570
|
25684
|
29594
|
29595
|
30014
|
30015
|
36354
|
36355
|
40087
|
40252
|
40442
|
40979
|
41663
|
43791
|
43792
|
43938
|
45667
|
45668
|
45895
|
46016
|
46473
|
46474
|
47780
|
47781
|
47782
|
49785
|
49786
|
49787