Changeset 2002 for trunk

Timestamp:

04/27/17 21:38:04 (7 years ago)

Author:

nanardon

Message:

Move code to model to make it reusable

Location:

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web

Files:

• Controller/Users.pm (modified) (2 diffs)
• Model/Accounts.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users.pm

@@ -134 +134 @@
         if ($base->check_acl($c->stash->{user}, 'userPassword', 'w')) {
             if ($c->req->param('passwd') eq ($c->req->param('cpasswd') || '')) {
-                $c->stash->{pmerror} = $c->forward('change_password',
-                    [ $username, $c->req->param('passwd') ] ) || 'Mot de passe changé';
+                $c->stash->{pmerror} = $c->model('Accounts')->ChangeUserPassword(
+                    $username, $c->req->param('passwd') 
+                ) || 'Mot de passe changé';
             } else {
                 $c->stash->{pmerror} = 'Mot de passe différents';
@@ -228 +229 @@
 }
 
-sub change_password : Private {
-    my ($self, $c, $username, $password) = @_;
-
-    my $base = $c->model('Accounts')->db;
-    $c->stash->{user} = $base->get_object('user', $username) or do {
-        $c->forward('/no_object');
-        return "Cannot get user object";
-    };
-
-    my $sync = $c->model('Accounts')->sync_access;
-
-    # This is widelly burk:
-    # synchaccess do not manage connect() at time, opening a
-    # backdoor then :\
-    foreach ($sync->bases) { $_->{_user} = undef }
-
-    my $suser = $sync->get_object_ifexists('user', $username);
-    my $msg = $c->stash->{user}->check_password($password);
-    if ($msg ne 'ok') {
-        return $msg . ', mot de passe inchangé';
-    } elsif ($suser && $suser->_set_password($password)) {
-        $sync->commit;
-        return;
-    } else {
-        return 'Erreur lors du changement de mot de passe';
-    }
-}
-
 =head1 AUTHOR
 

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/Accounts.pm

@@ -174 +174 @@
 }
 
+sub ChangeUserPassword {
+    my ($self, $username, $password) = @_;
+
+    my $base = $self->db;
+    my $user = $base->get_object('user', $username) or do {
+        return "Cannot get user object";
+    };
+
+    my $sync = $self->sync_access;
+
+    # This is widelly burk:
+    # synchaccess do not manage connect() at time, opening a
+    # backdoor then :\
+    foreach ($sync->bases) { $_->{_user} = undef }
+
+    my $suser = $sync->get_object_ifexists('user', $username);
+    my $msg = $user->check_password($password);
+    if ($msg ne 'ok') {
+        return $msg . ', mot de passe inchangé';
+    } elsif ($suser && $suser->_set_password($password)) {
+        $sync->commit;
+        return;
+    } else {
+        return 'Erreur lors du changement de mot de passe';
+    }
+}
+
 =head1 AUTHOR