fix login error message more vorbose

diff --git a/src/newslash_web/lib/Newslash/Web/Controller/API/Login.pm b/src/newslash_web/lib/Newslash/Web/Controller/API/Login.pm
index 7eede2b..84cc962 100644 (file)
--- a/src/newslash_web/lib/Newslash/Web/Controller/API/Login.pm
+++ b/src/newslash_web/lib/Newslash/Web/Controller/API/Login.pm
@@ -25,7 +25,10 @@ sub login {
         }
     }
 
-    $c->render(json => { error => 1, nickname => $nickname, message => "invalid nickname or password" });
+    $c->render(json => { error => 1,
+                         nickname => $nickname,
+                         reason => "auth_failed",
+                         message => "invalid nickname or password" });
     $c->rendered(401);
     return;
 }

diff --git a/src/newslash_web/lib/Newslash/Web/Controller/Login.pm b/src/newslash_web/lib/Newslash/Web/Controller/Login.pm
index d4f1582..b6d8fa7 100644 (file)
--- a/src/newslash_web/lib/Newslash/Web/Controller/Login.pm
+++ b/src/newslash_web/lib/Newslash/Web/Controller/Login.pm
@@ -38,7 +38,9 @@ sub login {
 sub logout {
   my $c = shift;
   my $session = $c->session('session');
+  my $user = $c->stash('user');
   $c->user_auth->clear_session($user, $session->{token});
+
   my $rpath = $c->param('rpath') || '/';
 
   #TODO: $c->model('users')->expire_token($session->{token});

diff --git a/src/newslash_web/public/js/login.js b/src/newslash_web/public/js/login.js
index 9462abc..3009390 100644 (file)
--- a/src/newslash_web/public/js/login.js
+++ b/src/newslash_web/public/js/login.js
@@ -37,7 +37,12 @@ login.run = function run(params) {
           this.message = "server_error";
         },
         function fail(resp) {
-          this.message = "auth_error";
+          if (resp.body.reason && resp.body.reason == "auth_failed") {
+            this.message = "auth_error";
+          }
+          else {
+            this.message = "server_error";
+          }
         });
     },
   };

diff --git a/src/newslash_web/templates/common/login_dialog.html.tt2 b/src/newslash_web/templates/common/login_dialog.html.tt2
index e5d18a9..bf8ff91 100644 (file)
--- a/src/newslash_web/templates/common/login_dialog.html.tt2
+++ b/src/newslash_web/templates/common/login_dialog.html.tt2
@@ -27,6 +27,7 @@
           </div>
           <div>
             <span v-if="message == 'auth_error'">認証エラー：アカウント名とパスワードの組み合わせが不正です</span>
+            <span v-else-if="message == 'server_error'">サーバーエラーが発生しました</span>
             <span v-else></span>
           </div>
         </form>