Some improvements

Author: lunny

routers/api/v1/api.go

@@ -917,17 +917,16 @@ func Routes() *web.Router {
 
 	addActionsWorkflowRoutes := func(
 		m *web.Router,
-		reqChecker func(ctx *context.APIContext),
 		actw actions.WorkflowAPI,
 	) {
 		m.Group("/actions", func() {
 			m.Group("/workflows", func() {
-				m.Get("", reqToken(), reqChecker, actw.ListRepositoryWorkflows)
-				m.Get("/{workflow_id}", reqToken(), reqChecker, actw.GetWorkflow)
-				m.Put("/{workflow_id}/disable", reqToken(), reqChecker, actw.DisableWorkflow)
-				m.Post("/{workflow_id}/dispatches", reqToken(), reqChecker, bind(api.CreateActionWorkflowDispatch{}), actw.DispatchWorkflow)
-				m.Put("/{workflow_id}/enable", reqToken(), reqChecker, actw.EnableWorkflow)
-			}, context.ReferencesGitRepo(), reqRepoWriter(unit.TypeActions))
+				m.Get("", reqToken(), actw.ListRepositoryWorkflows)
+				m.Get("/{workflow_id}", reqToken(), actw.GetWorkflow)
+				m.Put("/{workflow_id}/disable", reqToken(), reqRepoWriter(unit.TypeActions), actw.DisableWorkflow)
+				m.Post("/{workflow_id}/dispatches", reqToken(), reqRepoWriter(unit.TypeActions), bind(api.CreateActionWorkflowDispatch{}), actw.DispatchWorkflow)
+				m.Put("/{workflow_id}/enable", reqToken(), reqRepoWriter(unit.TypeActions), actw.EnableWorkflow)
+			}, context.ReferencesGitRepo(), reqRepoReader(unit.TypeActions))
 		})
 	}
 
@@ -1178,7 +1177,6 @@ func Routes() *web.Router {
 				)
 				addActionsWorkflowRoutes(
 					m,
-					reqRepoWriter(unit.TypeActions),
 					repo.NewActionWorkflow(),
 				)
 				m.Group("/hooks/git", func() {

routers/web/repo/actions/view.go

@@ -831,19 +831,21 @@ func Run(ctx *context_module.Context) {
 	// find workflow from commit
 	var workflows []*jobparser.SingleWorkflow
 	for _, entry := range entries {
-		if entry.Name() == workflowID {
-			content, err := actions.GetContentFromEntry(entry)
-			if err != nil {
-				ctx.Error(http.StatusInternalServerError, err.Error())
-				return
-			}
-			workflows, err = jobparser.Parse(content)
-			if err != nil {
-				ctx.ServerError("workflow", err)
-				return
-			}
-			break
+		if entry.Name() != workflowID {
+			continue
+		}
+
+		content, err := actions.GetContentFromEntry(entry)
+		if err != nil {
+			ctx.Error(http.StatusInternalServerError, err.Error())
+			return
+		}
+		workflows, err = jobparser.Parse(content)
+		if err != nil {
+			ctx.ServerError("workflow", err)
+			return
 		}
+		break
 	}
 
 	if len(workflows) == 0 {

services/actions/workflow.go

@@ -187,24 +187,26 @@ func DispatchActionWorkflow(ctx *context.APIContext, workflowID string, opt *api
 
 	var workflow *jobparser.SingleWorkflow
 	for _, entry := range entries {
-		if entry.Name() == workflowID {
-			content, err := actions.GetContentFromEntry(entry)
-			if err != nil {
-				ctx.Error(http.StatusInternalServerError, "WorkflowGetContentError", err.Error())
-				return
-			}
-			workflows, err := jobparser.Parse(content)
-			if err != nil {
-				ctx.Error(http.StatusInternalServerError, "WorkflowParseError", err.Error())
-				return
-			}
-			if len(workflows) == 0 {
-				ctx.Error(http.StatusNotFound, "WorkflowNotFound", fmt.Sprintf("workflow '%s' is not found", workflowID))
-				return
-			}
-			workflow = workflows[0]
-			break
+		if entry.Name() != workflowID {
+			continue
+		}
+
+		content, err := actions.GetContentFromEntry(entry)
+		if err != nil {
+			ctx.Error(http.StatusInternalServerError, "WorkflowGetContentError", err.Error())
+			return
+		}
+		workflows, err := jobparser.Parse(content)
+		if err != nil {
+			ctx.Error(http.StatusInternalServerError, "WorkflowParseError", err.Error())
+			return
+		}
+		if len(workflows) == 0 {
+			ctx.Error(http.StatusNotFound, "WorkflowNotFound", fmt.Sprintf("workflow '%s' is not found", workflowID))
+			return
 		}
+		workflow = workflows[0]
+		break
 	}
 
 	// Process workflow inputs