[koha-commits] main Koha release repository branch master updated. v3.22.00-1080-ge22e5c7
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 1 21:25:28 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via e22e5c74af4921e0fdda7f83cd1c68dfb63f0829 (commit)
via 9472711921968dc5ae620fbfeacd1c828b6ed93a (commit)
via 722a098eac97bb714d120f63fe7cd558bf1b79f5 (commit)
from 85ea73db9d181f9feaf99fa6a94da8a3da570909 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e22e5c74af4921e0fdda7f83cd1c68dfb63f0829
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Feb 8 17:54:12 2016 -0500
Bug 10988: Tabs vs Spaces qa failure patch
Run Koha QA Test tools and discovered this failed because of tabs.
Rather than fail this and wait forever for it to get fixed, this
patches it, and I'll mark it as signed off anyways.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 9472711921968dc5ae620fbfeacd1c828b6ed93a
Author: Nicholas van Oudtshoorn <vanoudt at gmail.com>
Date: Mon Jan 11 17:01:02 2016 +0800
Bug 10988 - Fix some wording Fix some outdated wording in googleopenidconnect
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 722a098eac97bb714d120f63fe7cd558bf1b79f5
Author: Nicholas van Oudtshoorn <vanoudt at gmail.com>
Date: Mon Jan 11 16:47:41 2016 +0800
Bug 10988 - Fixes for comments 57 and 58
Test Plan (remains the same):
0) Back up your database
1) Apply all these patches
2) In your mysql client use your Koha database and execute:
> DELETE FROM systempreferences;
> SOURCE ~/kohaclone/installer/data/mysql/sysprefs.sql;
-- Should be no errors.
> SELECT * FROM systempreferences LIKE 'GoogleO%';
-- Should see 4 entries.
> QUIT;
3) Restore your database
4) Run ./installer/data/mysql/updatedatabase.pl;
5) In your mysql client use your Koha database and execute:
> SELECT * FROM systempreferences LIKE 'GoogleO%';
-- Should see the same 4 entries.
6) Log into the staff client
7) Home -> Koha administration -> Global system preferences
8) -> OPAC
-- make sure your OPACBaseURL is set (e.g. https://opac.koha.ca)
9) -> Administration
-- There should be a 'Google OAuth2' section with the ability
to set those 4 system preferences.
10) In a new tab, go to https://console.developers.google.com/project
11) Click 'Create Project'
12) Type in a project name that won't freak users out, like your
library name (e.g. South Pole Library).
13) Click the 'Create' button.
14) Click the 'APIs & auth' in the left frame.
15) Click 'Credentials'
16) Click 'Create new Client ID'
17) Select 'Web application' and click 'Configure consent screen'.
18) Select the Email Address.
19) Put it a meaningful string into the Product Name
(e.g. South Pole Library Authentication)
20) Fill in the other fields as desired (or not)
21) Click 'Save'
22) Change the 'AUTHORIZED JAVASCRIPT ORIGINS' to your OPACBaseURL.
(http://library.yourDNS.org)
23) Change the 'AUTHORIZED REDIRECT URIS' to point to the new
googleoauth2 script
(http://library.yourDNS.org/cgi-bin/koha/svc/auth/googleopenidconnect)
24) Click 'Create Client ID'
25) Copy and paste the 'CLIENT ID' into the GoogleOAuth2ClientID
system preference.
26) Copy and paste the 'CLIENT SECRET' into the GoogleOAuth2ClientSecret
system preference.
27) Change the GoogleOpenIDConnect preference to 'Use'.
28) Click 'Save all Administration preferences'
29) In the OPAC, click 'Log in to your account'.
-- You should get a confirmation request, if you are
already logged in, OR a login screen if you are not.
-- You need to have the primary email address set to one
authenticated by Google in order to log in.
30) Run koha qa test tools
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 7 +
.../mysql/atomicupdate/googleopenidconnect.sql | 5 +
installer/data/mysql/sysprefs.sql | 4 +
.../prog/en/modules/admin/preferences/admin.pref | 18 ++
.../opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +
.../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 11 +
opac/svc/auth/googleopenidconnect | 233 ++++++++++++++++++++
7 files changed, 280 insertions(+)
create mode 100644 installer/data/mysql/atomicupdate/googleopenidconnect.sql
create mode 100755 opac/svc/auth/googleopenidconnect
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list