From 573efbb0c42fed4733d9d3380eeed195e65f6043 Mon Sep 17 00:00:00 2001 From: Nicholas van Oudtshoorn Date: Thu, 10 Oct 2013 17:12:03 +0800 Subject: [PATCH] Bug 10988 Fix some minor typos Content-Type: text/plain; charset="utf-8" --- .../intranet-tmpl/prog/en/modules/admin/preferences/admin.pref | 2 +- opac/svc/googleoauth2 | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref index 14b53e9..8d7803d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref @@ -120,7 +120,7 @@ Administration: yes: Use no: "Don't Use" - Google OAuth2 login. - - You will need to select OAuth2 when creating an app in the google cloud console, and set the web origin to your_opac_url and the redirect url to your_opac_url/cgi-bin/koha/svc/oauthlogin . + - You will need to select OAuth2 when creating an app in the google cloud console, and set the web origin to your_opac_url and the redirect url to your_opac_url/cgi-bin/koha/svc/googleoauth2 . - - Google OAuth2 Client ID diff --git a/opac/svc/googleoauth2 b/opac/svc/googleoauth2 index 9df5f01..8ffef15 100755 --- a/opac/svc/googleoauth2 +++ b/opac/svc/googleoauth2 @@ -1,5 +1,5 @@ #!/bin/perl -w -# Copyright chris@bigballofwax.co.nz 2013 +# Copyright vanoudt@gmail.com 2013 # # This file is part of Koha. # @@ -19,7 +19,7 @@ # # Basic OAuth2 authentication for google goes like this # First: get your clientid, clientsecret from google. At this stage, tell google that -# your redirect url is /cgi-bin/koha/svc/oauthlogin +# your redirect url is /cgi-bin/koha/svc/googleoauth2 # # The first thing that happens when this script is called is that one gets redirected # to an authentication url from google @@ -29,10 +29,8 @@ # json id_token, which we round-trip back to google to decrypt. Finally, we can extract # the email address from this. # -# There is LOTS of room for improvement here. -# 1. move the clientid, clientsecret to systempreferences -# 2. use the OPACBaseURL preference to compute the redirecturl -# 4. Google recommends verifying and decrypting the id_token locally, which means caching +# There is some room for improvement here. +# 1. Google recommends verifying and decrypting the id_token locally, which means caching # some information and updating it daily. But that would make things a lot faster use strict; -- 1.8.1.4