From a2a35395fb7c38578fa767252b8244b1c3bf6e5f Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 30 Jul 2014 14:53:27 +0000 Subject: [PATCH] BUG 12026, Follow up: Added Documentation BUG 12026, Follow up: Updated to work with match point selection - The base bug that this patch enhances has added the ability to choose your match point in the configuration file. This patch adds code to take that change into account. Signed-off-by: Mirko Tietgen Signed-off-by: Martin Renvoize --- C4/Auth_with_shibboleth.pm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm index ce2942e..b9b98d3 100644 --- a/C4/Auth_with_shibboleth.pm +++ b/C4/Auth_with_shibboleth.pm @@ -105,7 +105,7 @@ sub checkpw_shib { } if ( $shib->{'autocreate'} ) { - return _autocreate( $dbh, $shib, $userid ); + return _autocreate( $dbh, $shib, $match ); } else { # If we reach this point, the user is not a valid koha user $debug and warn "User $userid is not a valid Koha user"; @@ -114,9 +114,9 @@ sub checkpw_shib { } sub _autocreate { - my ( $dbh, $shib, $userid ) = @_; + my ( $dbh, $shib, $match ) = @_; - my %borrower = ( userid => $userid ); + my %borrower = ( $shibbolethMatchField => $match ); while ( my ( $key, $entry ) = each %{$shib->{'mapping'}} ) { $borrower{$key} = ( $entry->{'is'} && $ENV{ $entry->{'is'} } ) || $entry->{'content'} || ''; @@ -296,6 +296,14 @@ Given a database handle and a shib_login attribute, this routine checks for a ma my ( $retval, $retcard, $retuserid ) = C4::Auth_with_shibboleth::checkpw_shib( $shib_login ); +=head2 _autocreate + + my ( $retval, $retcard, $retuserid ) = _autocreate( $dbh, $shib, $userid ); + +Given a database handle, a shibboleth attribute reference and a userid this internal routine will add the given user to koha and return their user credentials + +This routine is NOT exported + =head1 SEE ALSO =cut -- 2.1.4