Merge pull request #38 from arran4/codex/recognize-expired-token-as-sign-out-error

Handle GitLab token expiration

Author: arran4

cmd/gobookmarks/main.go

@@ -353,6 +353,17 @@ func runHandlerChain(chain ...any) func(http.ResponseWriter, *http.Request) {
 					if errors.Is(err, ErrHandled) {
 						return
 					}
+					if errors.Is(err, ErrSignedOut) {
+						if logoutErr := UserLogoutAction(w, r); logoutErr != nil {
+							log.Printf("logout error: %v", logoutErr)
+						}
+						type Data struct{ *CoreData }
+						if err := GetCompiledTemplates(NewFuncs(r)).ExecuteTemplate(w, "logoutPage.gohtml", Data{r.Context().Value(ContextValues("coreData")).(*CoreData)}); err != nil {
+							log.Printf("Logout Template Error: %s", err)
+							http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+						}
+						return
+					}
 					type ErrorData struct {
 						*CoreData
 						Error string

errors.go

@@ -8,3 +8,7 @@ var ErrRepoNotFound = errors.New("repository not found")
 // ErrHandled is returned by handlers when they have already written
 // a response and no further handlers should run.
 var ErrHandled = errors.New("handled")
+
+// ErrSignedOut indicates that the OAuth token is no longer valid and
+// the user must authenticate again.
+var ErrSignedOut = errors.New("signed out")

provider_gitlab.go

@@ -21,6 +21,11 @@ import (
 // defined in settings.go.
 type GitLabProvider struct{}
 
+func gitlabUnauthorized(err error) bool {
+	var respErr *gitlab.ErrorResponse
+	return errors.As(err, &respErr) && respErr.Response != nil && respErr.Response.StatusCode == http.StatusUnauthorized
+}
+
 func init() { RegisterProvider(GitLabProvider{}) }
 
 func (GitLabProvider) Name() string { return "gitlab" }
@@ -74,6 +79,9 @@ func (GitLabProvider) GetTags(ctx context.Context, user string, token *oauth2.To
 	}
 	tags, _, err := c.Tags.ListTags(user+"/"+RepoName, &gitlab.ListTagsOptions{})
 	if err != nil {
+		if gitlabUnauthorized(err) {
+			return nil, ErrSignedOut
+		}
 		log.Printf("gitlab GetTags: %v", err)
 		return nil, fmt.Errorf("ListTags: %w", err)
 	}
@@ -92,6 +100,9 @@ func (GitLabProvider) GetBranches(ctx context.Context, user string, token *oauth
 	}
 	bs, _, err := c.Branches.ListBranches(user+"/"+RepoName, &gitlab.ListBranchesOptions{})
 	if err != nil {
+		if gitlabUnauthorized(err) {
+			return nil, ErrSignedOut
+		}
 		log.Printf("gitlab GetBranches: %v", err)
 		return nil, fmt.Errorf("ListBranches: %w", err)
 	}
@@ -110,6 +121,9 @@ func (GitLabProvider) GetCommits(ctx context.Context, user string, token *oauth2
 	}
 	cs, _, err := c.Commits.ListCommits(user+"/"+RepoName, &gitlab.ListCommitsOptions{})
 	if err != nil {
+		if gitlabUnauthorized(err) {
+			return nil, ErrSignedOut
+		}
 		log.Printf("gitlab GetCommits: %v", err)
 		return nil, fmt.Errorf("ListCommits: %w", err)
 	}
@@ -144,9 +158,15 @@ func (GitLabProvider) GetBookmarks(ctx context.Context, user, ref string, token
 			if respErr.Response != nil && respErr.Response.StatusCode == http.StatusNotFound {
 				return "", "", nil
 			}
+			if gitlabUnauthorized(err) {
+				return "", "", ErrSignedOut
+			}
 			log.Printf("gitlab GetBookmarks get file: %v", err)
 			return "", "", nil
 		}
+		if gitlabUnauthorized(err) {
+			return "", "", ErrSignedOut
+		}
 		log.Printf("gitlab GetBookmarks: %v", err)
 		return "", "", err
 	}
@@ -161,8 +181,16 @@ func (GitLabProvider) GetBookmarks(ctx context.Context, user, ref string, token
 func (GitLabProvider) getDefaultBranch(ctx context.Context, user string, client *gitlab.Client, branch string) (string, error) {
 	p, _, err := client.Projects.GetProject(user+"/"+RepoName, nil)
 	if err != nil {
-		if respErr, ok := err.(*gitlab.ErrorResponse); ok && respErr.Response != nil && respErr.Response.StatusCode == http.StatusNotFound {
-			return "", ErrRepoNotFound
+		if respErr, ok := err.(*gitlab.ErrorResponse); ok {
+			if respErr.Response != nil && respErr.Response.StatusCode == http.StatusNotFound {
+				return "", ErrRepoNotFound
+			}
+			if gitlabUnauthorized(err) {
+				return "", ErrSignedOut
+			}
+		}
+		if gitlabUnauthorized(err) {
+			return "", ErrSignedOut
 		}
 		log.Printf("gitlab getDefaultBranch: %v", err)
 		return "", err
@@ -202,9 +230,15 @@ func (GitLabProvider) UpdateBookmarks(ctx context.Context, user string, token *o
 			if respErr.Response != nil && respErr.Response.StatusCode == http.StatusNotFound {
 				return ErrRepoNotFound
 			}
+			if gitlabUnauthorized(err) {
+				return ErrSignedOut
+			}
 			log.Printf("gitlab UpdateBookmarks update file: %v", err)
 			return err
 		}
+		if gitlabUnauthorized(err) {
+			return ErrSignedOut
+		}
 		if err.Error() == "404 Not Found" {
 			return ErrRepoNotFound
 		}
@@ -240,9 +274,15 @@ func (GitLabProvider) CreateBookmarks(ctx context.Context, user string, token *o
 			if respErr.Response != nil && respErr.Response.StatusCode == http.StatusNotFound {
 				return ErrRepoNotFound
 			}
+			if gitlabUnauthorized(err) {
+				return ErrSignedOut
+			}
 			log.Printf("gitlab CreateBookmarks create file: %v", err)
 			return err
 		}
+		if gitlabUnauthorized(err) {
+			return ErrSignedOut
+		}
 		log.Printf("gitlab CreateBookmarks: %v", err)
 		return err
 	}
@@ -261,5 +301,8 @@ func (p GitLabProvider) CreateRepo(ctx context.Context, user string, token *oaut
 		Visibility:           gitlab.Ptr(gitlab.PrivateVisibility),
 		InitializeWithReadme: gitlab.Ptr(true),
 	})
+	if err != nil && gitlabUnauthorized(err) {
+		return ErrSignedOut
+	}
 	return err
 }