[Bps-public-commit] rt-authen-externalauth branch, multiple-emails, updated. 0.09-33-gcc472bb

[Ruslan Zakirov]

The branch, multiple-emails has been updated
       via  cc472bb570cc82d15a010f97a8b08c767b907c67 (commit)
       via  d3fa7c823cc671785de08aa505e45e079e49159c (commit)
      from  782946aa504ab5dd65caca22d0d2a1f4f24265e9 (commit)

Summary of changes:
 lib/RT/Authen/ExternalAuth.pm |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit d3fa7c823cc671785de08aa505e45e079e49159c
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed May 11 21:55:41 2011 +0400

    drop unused code

diff --git a/lib/RT/Authen/ExternalAuth.pm b/lib/RT/Authen/ExternalAuth.pm
index 1296c5e..c699b16 100644
--- a/lib/RT/Authen/ExternalAuth.pm
+++ b/lib/RT/Authen/ExternalAuth.pm
@@ -608,12 +608,6 @@ sub CanonicalizeUserInfo {
         foreach my $service (@info_services) {
             my $config = $RT::ExternalSettings->{$service};
 
-            # Get the list of unique attrs we need
-            my @service_attrs = do {
-                my %seen;
-                grep !$seen{$_}++, map ref($_)? @$_ : ($_), values %{ $config->{'attr_map'} }
-            };
-
             foreach my $rt_attr ( @{ $config->{'attr_match_list'} } ) {
                 next unless exists $args{ $rt_attr }
                     && defined $args{ $rt_attr }

commit cc472bb570cc82d15a010f97a8b08c767b907c67
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed May 11 22:55:24 2011 +0400

    clean search_by to avoid leftovers from previouse service

diff --git a/lib/RT/Authen/ExternalAuth.pm b/lib/RT/Authen/ExternalAuth.pm
index c699b16..2a6d922 100644
--- a/lib/RT/Authen/ExternalAuth.pm
+++ b/lib/RT/Authen/ExternalAuth.pm
@@ -608,6 +608,7 @@ sub CanonicalizeUserInfo {
         foreach my $service (@info_services) {
             my $config = $RT::ExternalSettings->{$service};
 
+            $search_by = undef;
             foreach my $rt_attr ( @{ $config->{'attr_match_list'} } ) {
                 next unless exists $args{ $rt_attr }
                     && defined $args{ $rt_attr }

-----------------------------------------------------------------------