ADD team source and appID for AppendRuntimeInfoForVirtualResource() m…

…ethod.
illacloud · Nov 10, 2023 · 5acbdfc · 5acbdfc
1 parent 5440969
commit 5acbdfc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/controller/action.go b/src/controller/action.go
@@ -345,7 +345,7 @@ func (controller *Controller) RunAction(c *gin.Context) {
 
 	// actionID has not been created (like actionID is 0 'ILAfx4p1C7d0'), but we still can run it (onboarding case)
 	if !model.DoesActionHasBeenCreated(actionID) {
-		// ok, action was not created, fetch app and build a temporary acion.
+		// ok, action was not created, fetch app and build a temporary action.
 		app, errInRetrieveApp := controller.Storage.AppStorage.RetrieveAppByTeamIDAndAppID(teamID, appID)
 		if errInRetrieveApp != nil {
 			controller.FeedbackBadRequest(c, ERROR_FLAG_CAN_NOT_GET_APP, "get app failed: "+errInRetrieveApp.Error())
@@ -393,7 +393,7 @@ func (controller *Controller) RunAction(c *gin.Context) {
 		}
 	} else {
 		// process virtual resource action
-		action.AppendRuntimeInfoForVirtualResource(userAuthToken)
+		action.AppendRuntimeInfoForVirtualResource(userAuthToken, teamID)
 	}
 
 	// check action template

diff --git a/src/controller/public_action.go b/src/controller/public_action.go
@@ -90,7 +90,7 @@ func (controller *Controller) RunPublicAction(c *gin.Context) {
 		}
 	} else {
 		// process virtual resource action
-		action.AppendRuntimeInfoForVirtualResource(userAuthToken)
+		action.AppendRuntimeInfoForVirtualResource(userAuthToken, teamID)
 	}
 
 	// check action template

diff --git a/src/model/action.go b/src/model/action.go
@@ -12,6 +12,7 @@ import (
 
 const (
 	ACTION_RUNTIME_INFO_FIELD_TEAM_ID          = "teamID"
+	ACTION_RUNTIME_INFO_FIELD_APP_ID           = "appID"
 	ACTION_RUNTIME_INFO_FIELD_RESOURCE_ID      = "resourceID"
 	ACTION_RUNTIME_INFO_FIELD_ACTION_ID        = "actionID"
 	ACTION_RUNTIME_INFO_FIELD_AUTHORIZATION    = "authorization"
@@ -307,9 +308,10 @@ func (action *Action) ExportConfigInMap() map[string]interface{} {
 }
 
 // the action runtime does not pass the env info for virtual resource, so add them.
-func (action *Action) AppendRuntimeInfoForVirtualResource(authorization string) {
+func (action *Action) AppendRuntimeInfoForVirtualResource(authorization string, teamID int) {
 	template := action.ExportTemplateInMap()
-	template[ACTION_RUNTIME_INFO_FIELD_TEAM_ID] = action.TeamID
+	template[ACTION_RUNTIME_INFO_FIELD_TEAM_ID] = teamID // the action.TeamID will invalied when onboarding
+	template[ACTION_RUNTIME_INFO_FIELD_APP_ID] = action.AppRefID
 	template[ACTION_RUNTIME_INFO_FIELD_RESOURCE_ID] = action.ResourceRefID
 	template[ACTION_RUNTIME_INFO_FIELD_ACTION_ID] = action.ID
 	template[ACTION_RUNTIME_INFO_FIELD_AUTHORIZATION] = authorization