fix: AccessToken が存在しないとき、エラーの代わりに null を返す

Author: otukado

router/v3/bots.go

@@ -99,7 +99,7 @@ func (h *Handlers) CreateBot(c echo.Context) error {
 		return herror.InternalServerError(err)
 	}
 
-	return c.JSON(http.StatusCreated, formatBotDetail(b, t, make([]uuid.UUID, 0)))
+	return c.JSON(http.StatusCreated, formatBotDetail(b, t.AccessToken, make([]uuid.UUID, 0)))
 }
 
 // GetBot GET /bots/:botID
@@ -108,6 +108,7 @@ func (h *Handlers) GetBot(c echo.Context) error {
 
 	if isTrue(c.QueryParam("detail")) {
 		user := getRequestUser(c)
+		var accessToken string
 
 		// アクセス権確認
 		if !h.RBAC.IsGranted(user.GetRole(), permission.AccessOthersBot) && b.CreatorID != user.GetID() {
@@ -116,20 +117,19 @@ func (h *Handlers) GetBot(c echo.Context) error {
 
 		t, err := h.Repo.GetTokenByID(b.AccessTokenID)
 		if err != nil {
-			switch err {
-			case repository.ErrNotFound:
-				return herror.HTTPError(http.StatusInternalServerError, "This bot's Access Token has been revoked unexpectedly. Please inform admin about this error.")
-			default:
+			if err != repository.ErrNotFound {
 				return herror.InternalServerError(err)
 			}
+		} else {
+			accessToken = t.AccessToken
 		}
 
 		ids, err := h.Repo.GetParticipatingChannelIDsByBot(b.ID)
 		if err != nil {
 			return herror.InternalServerError(err)
 		}
 
-		return c.JSON(http.StatusOK, formatBotDetail(b, t, ids))
+		return c.JSON(http.StatusOK, formatBotDetail(b, accessToken, ids))
 	}
 
 	return c.JSON(http.StatusOK, formatBot(b))

router/v3/responses.go

@@ -230,7 +230,7 @@ type BotDetail struct {
 	Channels        []uuid.UUID         `json:"channels"`
 }
 
-func formatBotDetail(b *model.Bot, t *model.OAuth2Token, channels []uuid.UUID) *BotDetail {
+func formatBotDetail(b *model.Bot, accessToken string, channels []uuid.UUID) *BotDetail {
 	return &BotDetail{
 		ID:              b.ID,
 		BotUserID:       b.BotUserID,
@@ -243,7 +243,7 @@ func formatBotDetail(b *model.Bot, t *model.OAuth2Token, channels []uuid.UUID) *
 		UpdatedAt:       b.UpdatedAt,
 		Tokens: BotTokens{
 			VerificationToken: b.VerificationToken,
-			AccessToken:       t.AccessToken,
+			AccessToken:       optional.New(accessToken, accessToken != ""),
 		},
 		Endpoint:   b.PostURL,
 		Privileged: b.Privileged,