Merge pull request #42 from claustra01/feat/expired-message

セッション切れ時のメッセージの追加

bot/google/calendar.go

@@ -9,6 +9,10 @@ import (
 	"time"
 )
 
+var (
+	ErrCalenderExpired = errors.New("calender api session expired")
+)
+
 type CalendarContentInterface interface {
 	GetType() string
 }
@@ -98,7 +102,9 @@ func (c *OAuthClient) RegisterCalenderEvent(content CalendarContent, accessToken
 	}
 	defer resp.Body.Close()
 
-	if resp.StatusCode != http.StatusOK {
+	if resp.StatusCode == http.StatusUnauthorized {
+		return ErrCalenderExpired
+	} else if resp.StatusCode != http.StatusOK {
 		return fmt.Errorf("Failed to register event: %s", resp.Status)
 	}
 

bot/handler/callback.go

@@ -162,6 +162,21 @@ func Callback(w http.ResponseWriter, req *http.Request, bot *linebot.LineBot) {
 				}
 
 				err = googleClient.RegisterCalenderEvent(content, accessToken)
+				if err == google.ErrCalenderExpired {
+					log.Printf("Failed to register event: %+v\n", err)
+					replyText := fmt.Sprintf("セッション切れです。再度ログインしてください。\n%s", liffUrl)
+					_, err = bot.ReplyMessage(
+						&linebot.ReplyMessageRequest{
+							ReplyToken: e.ReplyToken,
+							Messages: []linebot.MessageInterface{
+								linebot.NewTextMessage(replyText),
+							},
+						},
+					)
+					if err != nil {
+						log.Print(err)
+					}
+				}
 				if err != nil {
 					log.Printf("Failed to register event: %+v\n", err)
 					_, err = bot.ReplyMessage(
@@ -328,6 +343,21 @@ func Callback(w http.ResponseWriter, req *http.Request, bot *linebot.LineBot) {
 				}
 
 				err = googleClient.RegisterCalenderEvent(content, accessToken)
+				if err == google.ErrCalenderExpired {
+					log.Printf("Failed to register event: %+v\n", err)
+					replyText := fmt.Sprintf("セッション切れです。再度ログインしてください。\n%s", liffUrl)
+					_, err = bot.ReplyMessage(
+						&linebot.ReplyMessageRequest{
+							ReplyToken: e.ReplyToken,
+							Messages: []linebot.MessageInterface{
+								linebot.NewTextMessage(replyText),
+							},
+						},
+					)
+					if err != nil {
+						log.Print(err)
+					}
+				}
 				if err != nil {
 					log.Printf("Failed to register event: %+v\n", err)
 					_, err = bot.ReplyMessage(