Attachment #61886 for bug #16892

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

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_16892_AutomaticPatronSystemPreferences.sql (+4 lines)
	1	INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
	2	('GoogleOpenIDConnectAutoRegister', '0',NULL,' Google OpenID Connect logins to auto-register patrons.','YesNo'),
	3	('GoogleOpenIDConnectDefaultCategory','','','This category code will be used to create Google OpenID Connect patrons.','Textarea'),
	4	('GoogleOpenIDConnectDefaultBranch', '','','This branch code will be used to create Google OpenID Connect patrons.','Textarea');




            - "Google OpenID Connect Restrict to domain (or subdomain of this domain): "
            - pref: GoogleOpenIDConnectDomain
            - Leave blank for all google domains
        -
            - pref: GoogleOpenIDConnectAutoRegister
              choices:
                yes: Allow
                no: "Don't Allow"
            - users logging in with Google Open ID to automatically register.
        -
            - pref: GoogleOpenIDConnectDefaultCategory
            - Use this category code when automatically registering a Google Open ID patron.
        -
            - pref: GoogleOpenIDConnectDefaultBranch
            - Use this branch code when automatically registering a Google Open ID patron.
    Share anonymous usage statistics:
        -
            - "Share anonymous Koha usage data with the Koha community: "




use CGI qw ( -utf8 escape );
use C4::Auth qw{ checkauth get_session get_template_and_user };
use C4::Context;
use C4::Members;
use C4::Output;
use Koha::Patrons;

use LWP::UserAgent;
use HTTP::Request::Common qw{ POST };

                      . ' .' );
            }
            else {
                my $auto_registration = C4::Context->preference('GoogleOpenIDConnectAutoRegister') // q{0};
                my $borrower = Koha::Patrons->find( { email => $email } );
                if (! $borrower && $auto_registration==1) {
                    my $cardnumber = fixup_cardnumber();
                    my $firstname = $claims_json->{'given_name'} // q{};
                    my $surname = $claims_json->{'family_name'} // q{};
                    my $delimiter = $firstname ? q{.} : q{};
                    my $userid = $firstname . $delimiter . $surname;
                    my $categorycode = C4::Context->preference('GoogleOpenIDConnectDefaultCategory') // q{};
                    my $branchcode = C4::Context->preference('GoogleOpenIDConnectDefaultBranch') // q{};
                    my $password = undef;
                    $borrower = Koha::Patron->new( {
                        cardnumber   => $cardnumber,
                        firstname    => $firstname,
                        surname      => $surname,
                        email        => $email,
                        categorycode => $categorycode,
                        branchcode   => $branchcode,
                        userid       => $userid,
                        password     => $password,
                    } );
                    $borrower->store();
                }
                my ( $userid, $cookie, $session_id ) =
                  checkauth( $query, 1, {}, 'opac', $email );
                if ($userid) {    # A user with this email is registered in koha
- 

Return to bug 16892

Lines 156-161 Administration: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref (+12 lines)
156	- "Google OpenID Connect Restrict to domain (or subdomain of this domain): "	156	- "Google OpenID Connect Restrict to domain (or subdomain of this domain): "
157	- pref: GoogleOpenIDConnectDomain	157	- pref: GoogleOpenIDConnectDomain
158	- Leave blank for all google domains	158	- Leave blank for all google domains
		159	-
		160	- pref: GoogleOpenIDConnectAutoRegister
		161	choices:
		162	yes: Allow
		163	no: "Don't Allow"
		164	- users logging in with Google Open ID to automatically register.
		165	-
		166	- pref: GoogleOpenIDConnectDefaultCategory
		167	- Use this category code when automatically registering a Google Open ID patron.
		168	-
		169	- pref: GoogleOpenIDConnectDefaultBranch
		170	- Use this branch code when automatically registering a Google Open ID patron.
159	Share anonymous usage statistics:	171	Share anonymous usage statistics:
160	-	172	-
161	- "Share anonymous Koha usage data with the Koha community: "	173	- "Share anonymous Koha usage data with the Koha community: "

Lines 34-40 use Modern::Perl; Link Here

(-)a/opac/svc/auth/googleopenidconnect (-1 / +25 lines)
34	use CGI qw ( -utf8 escape );	34	use CGI qw ( -utf8 escape );
35	use C4::Auth qw{ checkauth get_session get_template_and_user };	35	use C4::Auth qw{ checkauth get_session get_template_and_user };
36	use C4::Context;	36	use C4::Context;
		37	use C4::Members;
37	use C4::Output;	38	use C4::Output;
		39	use Koha::Patrons;
38		40
39	use LWP::UserAgent;	41	use LWP::UserAgent;
40	use HTTP::Request::Common qw{ POST };	42	use HTTP::Request::Common qw{ POST };
Lines 179-184 elsif ( defined $query->param('code') ) { Link Here
179	. ' .' );	181	. ' .' );
180	}	182	}
181	else {	183	else {
		184	my $auto_registration = C4::Context->preference('GoogleOpenIDConnectAutoRegister') // q{0};
		185	my $borrower = Koha::Patrons->find( { email => $email } );
		186	if (! $borrower && $auto_registration==1) {
		187	my $cardnumber = fixup_cardnumber();
		188	my $firstname = $claims_json->{'given_name'} // q{};
		189	my $surname = $claims_json->{'family_name'} // q{};
		190	my $delimiter = $firstname ? q{.} : q{};
		191	my $userid = $firstname . $delimiter . $surname;
		192	my $categorycode = C4::Context->preference('GoogleOpenIDConnectDefaultCategory') // q{};
		193	my $branchcode = C4::Context->preference('GoogleOpenIDConnectDefaultBranch') // q{};
		194	my $password = undef;
		195	$borrower = Koha::Patron->new( {
		196	cardnumber => $cardnumber,
		197	firstname => $firstname,
		198	surname => $surname,
		199	email => $email,
		200	categorycode => $categorycode,
		201	branchcode => $branchcode,
		202	userid => $userid,
		203	password => $password,
		204	} );
		205	$borrower->store();
		206	}
182	my ( $userid, $cookie, $session_id ) =	207	my ( $userid, $cookie, $session_id ) =
183	checkauth( $query, 1, {}, 'opac', $email );	208	checkauth( $query, 1, {}, 'opac', $email );
184	if ($userid) { # A user with this email is registered in koha	209	if ($userid) { # A user with this email is registered in koha
185	-