From ab3c9ff395391ee92e352673dad74d1a3f8602fb Mon Sep 17 00:00:00 2001
From: "OHASHI, Norikazu" <katz@neko-mori.sakura.ne.jp>
Date: Mon, 18 Mar 2019 00:01:52 +0900
Subject: [PATCH] =?utf8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=8F=E3=83=B3?=
 =?utf8?q?=E3=83=89=E3=83=AA=E3=83=B3=E3=82=B0=E3=82=92=E7=99=BB=E9=8C=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 sinatra/app/controllers/web_gui.rb | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/sinatra/app/controllers/web_gui.rb b/sinatra/app/controllers/web_gui.rb
index 8dc1b21..f6dbdd2 100644
--- a/sinatra/app/controllers/web_gui.rb
+++ b/sinatra/app/controllers/web_gui.rb
@@ -34,9 +34,13 @@ class WebGui < Sinatra::Base
     email = params[:email]
     passwd = params[:passwd]
 
-    id = UserAccount.createAccount(name, full_name, email, passwd)
-    
-    redirect "/user_home/#{id}"
+    begin
+      id = UserAccount.createAccount(name, full_name, email, passwd)
+      redirect "/user_home/#{id}"
+    rescue UserAccount::AlreadyInstanceError 
+      status 406
+      "すでに登録済みのアカウント名が指定されています。"
+    end
   end
 
   get '/login' do
@@ -46,10 +50,15 @@ class WebGui < Sinatra::Base
   post '/login' do
     name = params[:name]
     passwd = params[:passwd]
-    
-    id = UserAccount.checkPasswd(name, passwd);
-    @id = id
-    redirect "/user_home/#{id}"
+
+    begin
+      id = UserAccount.checkPasswd(name, passwd);
+      redirect "/user_home/#{id}"
+    rescue UserAccount::NotfondInstanceError,
+           UserAccount::AuthenticationError
+      status 401
+      "認証に失敗しました アカウント、 パスワードを確認してください。"
+    end
   end
 
   get '/user_home/:id' do
-- 
2.19.2