From 331fe373f0c4b640fe169e743713645db4c4d37d Mon Sep 17 00:00:00 2001
From: Ichinose Shogo <shogo82148@gmail.com>
Date: Thu, 7 Oct 2021 13:20:42 +0900
Subject: [PATCH] improve the error message if the token is invalid

---
 provider/github-app-token/github-app-token.go | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/provider/github-app-token/github-app-token.go b/provider/github-app-token/github-app-token.go
index c567d091..8bfe8c97 100644
--- a/provider/github-app-token/github-app-token.go
+++ b/provider/github-app-token/github-app-token.go
@@ -18,6 +18,9 @@ import (
 	"github.com/shogo82148/actions-github-app-token/provider/github-app-token/github"
 )
 
+// the sentinel error that the token is not GITHUB_TOKEN
+var errNotGitHubToken = errors.New("githubapptoken: the token is not GITHUB_TOKEN")
+
 type githubClient interface {
 	GetApp(ctx context.Context) (*github.GetAppResponse, error)
 	CreateStatus(ctx context.Context, token, owner, repo, ref string, status *github.CreateStatusRequest) (*github.CreateStatusResponse, error)
@@ -155,21 +158,27 @@ func (h *Handler) handle(ctx context.Context, token string, req *requestBody) (*
 	}
 
 	// authorize the request
+	var err error
 	var owner, repo string
-	if id, err := h.github.ParseIDToken(ctx, token); err == nil {
-		owner, repo, err = splitOwnerRepo(id.Repository)
+	err = h.validateGitHubToken(ctx, token, req)
+	if err == nil {
+		owner, repo, err = splitOwnerRepo(req.Repository)
 		if err != nil {
 			return nil, err
 		}
-	} else {
-		err := h.validateGitHubToken(ctx, token, req)
+	} else if errors.Is(err, errNotGitHubToken) {
+		id, err := h.github.ParseIDToken(ctx, token)
 		if err != nil {
-			return nil, err
+			return nil, &validationError{
+				message: fmt.Sprintf("invalid JSON Web Token: %s", err.Error()),
+			}
 		}
-		owner, repo, err = splitOwnerRepo(req.Repository)
+		owner, repo, err = splitOwnerRepo(id.Repository)
 		if err != nil {
 			return nil, err
 		}
+	} else {
+		return nil, err
 	}
 
 	// issue a new access token
@@ -293,10 +302,8 @@ func (h *Handler) validateGitHubToken(ctx context.Context, token string, req *re
 			message: "GITHUB_TOKEN looks like GitHub App refresh token. `github-token` must be `${{ github.token }}` or `${{ secrets.GITHUB_TOKEN }}`.",
 		}
 	default:
-		// Old Format Personal Access Tokens
-		return &validationError{
-			message: "GITHUB_TOKEN looks like Personal Access Token. `github-token` must be `${{ github.token }}` or `${{ secrets.GITHUB_TOKEN }}`.",
-		}
+		// it doesn't look a GitHub token.
+		return errNotGitHubToken
 	}
 	resp, err := h.updateCommitStatus(ctx, token, req, &github.CreateStatusRequest{
 		State:       github.CommitStateSuccess,