Changeset 1984

Timestamp:

04/18/17 17:49:15 (7 years ago)

Author:

nanardon

Message:

Add function to generate login from first/last name

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Bases/OCHelper/User.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Utils.pm (modified) (2 diffs)
• t/05_utils.t (modified) (2 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/OCHelper/User.pm

@@ -34 +34 @@
             
             if ($info->{contents}{sn}) {
-                my $login = lc(to_ascii($info->{contents}{sn}));
-                $login =~ s/ //g; # strip space in login
-                length($login) > 10 and $login = substr($login, 0, 8);
-                for (1) {
-                    $self->base->get_object('user', $login) or do {
-                        $info->{name}{content} = $login;
-                        last;
-                    };
-                    if ($info->{contents}{givenName}) {
-                        length($login) > 8 and $login = substr($login, 0, 8);
-                        $login .= substr(lc(to_ascii($info->{contents}{givenName})), 0, 1);
-                        $self->base->get_object('user', $login) or do {
-                            $info->{name}{contents} = $login;
-                            last;
-                        };
-                    }
+                my $login = buildLogin(
+                    sub {
+                        !$self->base->get_object('user', $_[0]);
+                    },
+                    $info->{contents}{sn},
+                    $info->{contents}{givenName},
+                );
+                if ($login) {
+                    $info->{name}{content} = $login;
                 }
             }

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Utils.pm

@@ -21 +21 @@
 
 @ISA = qw(Exporter);
-@EXPORT = qw(to_ascii exec_command switch_user run_via_sudo yesno);
-@EXPORT_OK = qw(to_ascii exec_command switch_user run_via_sudo yesno);
+@EXPORT = qw(to_ascii exec_command switch_user run_via_sudo buildLogin yesno);
+@EXPORT_OK = qw(to_ascii exec_command switch_user run_via_sudo buildLogin yesno);
 
 =head2 to_ascii($text)
@@ -314 +314 @@
 }
 
+=head2 buildLogin([$cb, ] @names)
+
+Try to find a proper login from @names.
+
+Optionnal $cb is a callback to check the solution over exiting data. If return false, another solution is tried
+
+Example:
+
+    buildLogin(sub { $_[0] ? 1 : 0 }, "sn", "givenName")
+
+=cut
+
+sub buildLogin {
+    my (@names) = @_;
+    my $cb = undef;
+
+    if (ref $names[0]) {
+        $cb = shift(@names);
+    } else {
+        $cb = sub { 1 }; # always validating
+    }
+
+    # Cleaning names:
+    foreach (@names) {
+        $_ ||= '';
+        $_ = lc(to_ascii($_));
+        s/[^\w]//g;
+    }
+
+    @names = grep { $_ } @names;
+    my $base = shift(@names) or return;
+    my $rest = join('', grep { $_ } @names);
+
+    if ((my $l = length($base)) > 10) {
+        my $len = 8;
+        while ($len < $l) {
+            my $try  = substr($base, 0, $len);
+            if ($cb->($try)) {
+                return $try;
+            }
+            $len++;
+        }
+    } elsif ($cb->($base)) {
+        return $base;
+    }
+
+    my $try = $base;
+    while (my $len = length($try) - length($base) + 1) {
+        if ($len > length($rest)) {
+            last;
+        }
+        $try = $base . substr($rest, 0, $len);
+        if ($cb->($try)) {
+            return $try;
+        }
+    }
+    return;
+}
+
 =head2 yesno($value, $default)
 

trunk/LATMOS-Accounts/t/05_utils.t

@@ -1 +1 @@
 use strict;
 use warnings;
-use Test::More tests => 21;
+use Test::More tests => 30;
 use File::Temp qw(mkstemp);
 
@@ -45 +45 @@
 ok(!LATMOS::Accounts::Utils::check_ug_validity('t5oto'), '"t5oto" is valid username');
 
+is(LATMOS::Accounts::Utils::buildLogin('Toto'), 'toto', "buildLogin return toto");
+is(LATMOS::Accounts::Utils::buildLogin('To\'to'), 'toto', "buildLogin return toto");
+is(LATMOS::Accounts::Utils::buildLogin('#'), undef, "Impossible name return undef");
+is(LATMOS::Accounts::Utils::buildLogin('TotoTataTiti'), 'tototata', "buildLogin return 8 byte length login");
+is(LATMOS::Accounts::Utils::buildLogin(sub { $_[0] =~ /^toto$/ ? 0 : 1 }, 'toto'), undef, "buildLogin: cb works");
+is(LATMOS::Accounts::Utils::buildLogin(sub { $_[0] =~ /^toto$/ ? 0 : 1 }, 'Toto', 'Titi'), 'totot', "buildLogin: try others login");
+is(LATMOS::Accounts::Utils::buildLogin(sub { $_[0] =~ /^totot?$/ ? 0 : 1 }, 'toto', 'titi'), 'tototi', "buildLogin: try others login");
+is(LATMOS::Accounts::Utils::buildLogin(sub { $_[0] =~ /^toto/ ? 0 : 1 }, 'toto', 'titi'), undef, "buildLogin: return undef if no possibility");
+is(LATMOS::Accounts::Utils::buildLogin(sub { length($_[0]) > 9 }, 'TotoTataTiti'), 'tototatati', "buildLogin return 8 byte length login");
+
 is(yesno('yes'),  1, 'yes is true');
 is(yesno('true'), 1, 'true is true');