fix(ui): fix sse when 401 occured (#3345)

engine/api/action/action.go

@@ -201,22 +201,7 @@ func loadActionDependencies(db gorp.SqlExecutor, a *sdk.Action) error {
 		return fmt.Errorf("cannot loadActionChildren> %s", err)
 	}
 
-	// Requirements of children are requirement of parent
-	for _, c := range a.Actions {
-		// Now for each requirement of child, check if it exists in parent
-		for _, cr := range c.Requirements {
-			found := false
-			for _, pr := range a.Requirements {
-				if pr.Type == cr.Type && pr.Value == cr.Value {
-					found = true
-					break
-				}
-			}
-			if !found {
-				a.Requirements = append(a.Requirements, cr)
-			}
-		}
-	}
+	computeRequirements(a)
 
 	return nil
 }
@@ -268,21 +253,7 @@ func UpdateActionDB(db gorp.SqlExecutor, a *sdk.Action, userID int64) error {
 
 	//TODO we don't need to compute all job requirements here, but only when running the job
 	// Requirements of children are requirement of parent
-	for _, c := range a.Actions {
-		// Now for each requirement of child, check if it exists in parent
-		for _, cr := range c.Requirements {
-			found := false
-			for _, pr := range a.Requirements {
-				if pr.Type == cr.Type && pr.Value == cr.Value {
-					found = true
-					break
-				}
-			}
-			if !found {
-				a.Requirements = append(a.Requirements, cr)
-			}
-		}
-	}
+	computeRequirements(a)
 
 	// Checks if multiple requirements have the same name
 	if err := isRequirementsValid(a.Requirements); err != nil {
@@ -522,3 +493,29 @@ func GetPipelineUsingAction(db gorp.SqlExecutor, name string) ([]PipelineUsingAc
 
 	return response, nil
 }
+
+func computeRequirements(a *sdk.Action) {
+	if a.Enabled {
+		// Requirements of children are requirement of parent
+		for _, c := range a.Actions {
+			if !c.Enabled { // If action is not enabled we don't need their requirements
+				continue
+			}
+			// Now for each requirement of child, check if it exists in parent
+			for _, cr := range c.Requirements {
+				found := false
+				for _, pr := range a.Requirements {
+					if pr.Type == cr.Type && pr.Value == cr.Value {
+						found = true
+						break
+					}
+				}
+				if !found {
+					a.Requirements = append(a.Requirements, cr)
+				}
+			}
+		}
+	} else {
+		a.Requirements = []sdk.Requirement{}
+	}
+}

engine/api/api_routes.go

@@ -385,6 +385,7 @@ func (api *API) InitRouter() {
 
 	// Users
 	r.Handle("/user", r.GET(api.getUsersHandler))
+	r.Handle("/user/me", r.GET(api.getUserMeHandler))
 	r.Handle("/user/favorite", r.POST(api.postUserFavoriteHandler))
 	r.Handle("/user/timeline", r.GET(api.getTimelineHandler))
 	r.Handle("/user/timeline/filter", r.GET(api.getTimelineFilterHandler), r.POST(api.postTimelineFilterHandler))

engine/api/user.go

@@ -3,6 +3,7 @@ package api
 import (
 	"context"
 	"database/sql"
+	"fmt"
 	"net/http"
 	"time"
 
@@ -158,6 +159,19 @@ func (api *API) getUsersHandler() service.Handler {
 	}
 }
 
+// getUserMeHandler fetches current user data
+func (api *API) getUserMeHandler() service.Handler {
+	return func(ctx context.Context, w http.ResponseWriter, r *http.Request) error {
+		u := getUser(ctx)
+		if u == nil {
+			return fmt.Errorf("getUserMeHandler> user is nil")
+		}
+		u.Groups = nil
+		u.Permissions = sdk.UserPermissions{}
+		return service.WriteJSON(w, *u, http.StatusOK)
+	}
+}
+
 func (api *API) getTimelineFilterHandler() service.Handler {
 	return func(ctx context.Context, w http.ResponseWriter, r *http.Request) error {
 		u := getUser(ctx)

engine/service/http.go

@@ -94,7 +94,7 @@ func WriteError(w http.ResponseWriter, r *http.Request, err error) {
 	// ErrAlreadyTaken and ErrWorkerModelAlreadyBooked are not useful to log in warning
 	if sdk.ErrorIs(errProcessed, sdk.ErrAlreadyTaken) ||
 		sdk.ErrorIs(errProcessed, sdk.ErrWorkerModelAlreadyBooked) ||
-		sdk.ErrorIs(errProcessed, sdk.ErrJobAlreadyBooked) {
+		sdk.ErrorIs(errProcessed, sdk.ErrJobAlreadyBooked) || r.URL.Path == "/user/me" {
 		log.Debug("%-7s | %-4d | %s \t %s", r.Method, errProcessed.Status, r.RequestURI, err)
 	} else {
 		log.Warning("%-7s | %-4d | %s \t %s", r.Method, errProcessed.Status, r.RequestURI, err)

tests/clictl_action.yml

@@ -42,7 +42,7 @@ testcases:
   - script: {{.cds.build.cdsctl}} action export CDS_TestIT_Disabled > ./tests/fixtures/clictl_action_CDS_TestIT_Disabled.exported
   - script: {{.cds.build.cdsctl}} action export CDS_TestIT_Enabled > ./tests/fixtures/clictl_action_CDS_TestIT_Enabled.exported
   - script: {{.cds.build.cdsctl}} action export CDS_TestIT_GitClone > ./tests/fixtures/clictl_action_CDS_TestIT_GitClone.exported
-  - script: diff ./tests/fixtures/clictl_action_CDS_TestIT_Disabled.exported ./tests/fixtures/action_disabled.yml
+  - script: diff ./tests/fixtures/clictl_action_CDS_TestIT_Disabled.exported ./tests/fixtures/action_disabled_expected.yml
   - script: diff ./tests/fixtures/clictl_action_CDS_TestIT_Enabled.exported ./tests/fixtures/action_enabled.yml
   - script: diff ./tests/fixtures/clictl_action_CDS_TestIT_GitClone.exported ./tests/fixtures/action_git_clone_default.yml
 - name: action list

tests/fixtures/action_disabled_expected.yml

@@ -0,0 +1,10 @@
+version: v1.0
+name: CDS_TestIT_Disabled
+enabled: false
+steps:
+- name: my empty script
+  script:
+  - '#!/bin/bash'
+  - set -e
+  - ""
+

ui/src/app/app.component.ts

@@ -157,7 +157,7 @@ export class AppComponent  implements OnInit {
             urlSubscribe: environment.apiURL + '/events/subscribe',
             urlUnsubscribe: environment.apiURL + 'events/unsubscribe',
             sseURL: environment.apiURL + '/events',
-            pingURL: environment.apiURL + '/mon/version'
+            pingURL: environment.apiURL + '/user/me'
         });
         this.sseWorker.response().subscribe(e => {
             if (e == null) {

ui/src/app/service/logout.interceptor.service.ts

@@ -37,6 +37,7 @@ export class LogoutInterceptor implements HttpInterceptor {
 
                         if (navigationExtras.queryParams.redirect) {
                             this._router.navigate(['/account/login'], navigationExtras);
+                            this._authStore.removeUser();
                         }
                     } else {
                         // error formatted from CDS API

ui/src/assets/worker/sharedWorker.js

@@ -43,6 +43,7 @@ setInterval(() => {
         try {
             var xhr = new XMLHttpRequest();
             xhr.open('GET', pingUrl , false, null, null);
+            xhr.setRequestHeader(headerKey, headerValue);
             xhr.send(null);
             if (xhr.status >= 400) {
                 if (!offline) {
@@ -57,6 +58,7 @@ setInterval(() => {
                 }
             }
         } catch (e) {
+            console.error(e);
             if (!offline) {
                 console.log('Closing SSE');
                 sse.close();

ui/src/assets/worker/webWorker.js

@@ -4,8 +4,11 @@ importScripts('./common.js');
 var sse;
 var headAuthKey;
 var headAuthValue;
+var pingUrl;
+var offline = false;
 onmessage = function (e) {
     if (!sse && e.data.sseURL) {
+        pingUrl = e.data.pingURL;
         headAuthKey = e.data.headAuthKey;
         headAuthValue = e.data.headAuthValue;
         sse = connectSSE(e.data.sseURL, e.data.headAuthKey, e.data.headAuthValue);
@@ -20,4 +23,35 @@ onmessage = function (e) {
             console.log('SSE Error: ', err);
         }
     }
-};
+};
+
+setInterval(() => {
+    if (pingUrl) {
+        try {
+            var xhr = new XMLHttpRequest();
+            xhr.open('GET', pingUrl , false, null, null);
+            xhr.setRequestHeader(headAuthKey, headAuthValue);
+            xhr.send(null);
+            if (xhr.status >= 400) {
+                if (!offline) {
+                    console.log('Closing SSE');
+                    sse.close();
+                    offline = true;
+                }
+            } else {
+                if (offline) {
+                    initSSE(true);
+                    offline = false;
+                }
+            }
+        } catch (e) {
+            console.error(e);
+            if (!offline) {
+                console.log('Closing SSE');
+                sse.close();
+                offline = true;
+            }
+        }
+
+    }
+}, 5000);