Merge pull request #1668 from diggerhq/feat/github-orgid-endpoint

feat/github orgid endpoint

Author: ZIJ

.github/workflows/next_deploy.yml

@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - develop    # change to main if needed
-      - feat/fix-of-next-path
+      - feat/github-orgid-endpoint
 jobs:
   deploy:
     name: Deploy app

next/main.go

@@ -73,6 +73,7 @@ func main() {
 	r.GET("/", controllers.Home)
 
 	r.GET("/github/callback", middleware.SupabaseCookieAuth(), diggerController.GithubAppCallbackPage)
+	r.GET("/github/callback_fe", middleware.WebhookAuth(), diggerController.GithubAppCallbackPage)
 	r.POST("/github-app-webhook", diggerController.GithubAppWebHook)
 
 	r.POST("/_internal/process_runs_queue", middleware.WebhookAuth(), diggerController.ProcessRunQueueItems)

next/middleware/webhooks.go

@@ -22,6 +22,12 @@ func WebhookAuth() gin.HandlerFunc {
 			c.Abort()
 			return
 		}
+		// webhook auth optionally accepts organisation ID as a value
+		orgIdHeader := c.GetHeader("X-Digger-Org-ID")
+		if orgIdHeader != "" {
+			c.Set(ORGANISATION_ID_KEY, orgIdHeader)
+		}
+
 		c.Next()
 		return
 	}