move create/reset password function to Eventd

[newslash/newslash.git] / src / newslash_web / lib / Newslash / Web / Controller / Login.pm

diff --git a/src/newslash_web/lib/Newslash/Web/Controller/Login.pm b/src/newslash_web/lib/Newslash/Web/Controller/Login.pm
index ef16eee..1769c96 100644 (file)
--- a/src/newslash_web/lib/Newslash/Web/Controller/Login.pm
+++ b/src/newslash_web/lib/Newslash/Web/Controller/Login.pm
@@ -62,7 +62,7 @@ sub activation {
     my $the_user = $users->select(nickname => $nickname);
 
     # check if token is correct
-    if (!$the_user || $token ne $the_user->{newpasswd}) {
+    if (!$the_user || !$token) {
         $c->render(activation_succeed => 0, error => "INVALID_TOKEN");
         $c->res->code(400);
         return;
@@ -75,23 +75,14 @@ sub activation {
         return;
     }
 
-    # check if token is expired
-    my $expiration_limit = $c->config->{Users}->{newpasswd_expiration};
-    if (!$the_user->{newpasswd_ts}) {
-        $c->render(activation_succeed => 0, error => "INVALID_TOKEN");
-        $c->res->code(400);
-        return;
-    }
-    my $expire_dt = eval { DateTime::Format::MySQL->parse_datetime($the_user->{newpasswd_ts}) };
-    if (!$expire_dt) {
-        $c->log->error("Activation: invalid newpasswd_ts ($the_user->{newpasswd_ts}). uid: $the_user->{uid}");
-        $c->render(activation_succeed => 0, error => "INVALID_TOKEN");
-        $c->res->code(400);
+    # check if token is valid
+    my $rs = $users->activation($nickname, $token);
+    if (!$rs) {
+        $c->res->code(500);
         return;
     }
-    $expire_dt->add( seconds => $expiration_limit);
-    if ($expire_dt->epoch() < time()) {
-        $c->render(activation_succeed => 0,  error => "TOKEN_EXPIRED");
+    if ($rs->{error}) {
+        $c->render(activation_succeed => 0, error => $rs->{error});
         $c->res->code(400);
         return;
     }