Skip to content

Commit 31e3486

Browse files
authored
Merge pull request #108 from yashsinghcodes/main
Fix for algolia username error
2 parents fcc5b16 + 3026019 commit 31e3486

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

shared.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6828,7 +6828,8 @@ func SaveWorkflow(resp http.ResponseWriter, request *http.Request) {
68286828
// Just making sure
68296829
if project.Environment == "cloud" {
68306830
//algoliaUser, err := HandleAlgoliaCreatorSearch(ctx, username)
6831-
algoliaUser, err := HandleAlgoliaCreatorSearch(ctx, tmpworkflow.ID)
6831+
6832+
algoliaUser, err := HandleAlgoliaCreatorSearch(ctx, user.PublicProfile.GithubUsername)
68326833
if err != nil {
68336834
allowList := os.Getenv("GITHUB_USER_ALLOWLIST")
68346835
log.Printf("[WARNING] User with ID %s for Workflow %s could not be found (workflow update): %s. Username: %s. ACL controlled with GITHUB_USER_ALLOWLIST environment variable. Allowed users: %#v", user.Id, tmpworkflow.ID, err, user.PublicProfile.GithubUsername, allowList)
@@ -11760,7 +11761,6 @@ func HandleEditOrg(resp http.ResponseWriter, request *http.Request) {
1176011761
// SSOUrl = org.SSOConfig.SSOEntrypoint
1176111762
//}
1176211763

11763-
1176411764
log.Printf("[DEBUG] Updating org %s (%s) with %d users", org.Name, org.Id, len(org.Users))
1176511765
err = SetOrg(ctx, *org, org.Id)
1176611766
if err != nil {
@@ -17956,7 +17956,7 @@ func HandleRetValidation(ctx context.Context, workflowExecution WorkflowExecutio
1795617956

1795717957
//log.Printf("[INFO] Checking single execution %s. Status: %s. Len: %d, resultAmount: %d", workflowExecution.ExecutionId, newExecution.Status, len(newExecution.Results), resultAmount-1)
1795817958

17959-
if len(newExecution.Results) > resultAmount-1 {
17959+
if len(newExecution.Results) > resultAmount-1 {
1796017960
relevantIndex := len(newExecution.Results) - 1
1796117961

1796217962
if len(newExecution.Results[relevantIndex].Result) > 0 || newExecution.Results[relevantIndex].Status == "SUCCESS" {
@@ -24344,7 +24344,7 @@ func RunCategoryAction(resp http.ResponseWriter, request *http.Request) {
2434424344
selectedCategory := AppCategory{}
2434524345
selectedAction := WorkflowAppAction{}
2434624346

24347-
//RunAiQuery(systemMessage, userMessage)
24347+
//RunAiQuery(systemMessage, userMessage)
2434824348

2434924349
availableLabels := []string{}
2435024350
for _, app := range newapps {
@@ -24757,15 +24757,15 @@ func RunCategoryAction(resp http.ResponseWriter, request *http.Request) {
2475724757
Action: "app_authentication",
2475824758
Category: discoveredCategory,
2475924759
Reason: fmt.Sprintf("Authenticate %s first.", selectedApp.Name),
24760-
Label: value.Label,
24760+
Label: value.Label,
2476124761
Apps: []WorkflowApp{
2476224762
selectedApp,
2476324763
},
2476424764

2476524765
AvailableLabels: availableLabels,
2476624766
}
2476724767

24768-
// Check for user agent including shufflepy
24768+
// Check for user agent including shufflepy
2476924769
useragent := request.Header.Get("User-Agent")
2477024770
if strings.Contains(strings.ToLower(useragent), "shufflepy") {
2477124771
structuredFeedback.Apps = []WorkflowApp{}
@@ -24774,9 +24774,9 @@ func RunCategoryAction(resp http.ResponseWriter, request *http.Request) {
2477424774
currentUrl := fmt.Sprintf("%s://%s", request.URL.Scheme, request.URL.Host)
2477524775
if project.Environment == "cloud" {
2477624776
currentUrl = "https://shuffler.io"
24777-
}
24777+
}
2477824778

24779-
// FIXME: Implement this. Uses org's auth
24779+
// FIXME: Implement this. Uses org's auth
2478024780
orgAuth := org.OrgAuth.Token
2478124781

2478224782
structuredFeedback.Reason = fmt.Sprintf("Authenticate here: %s/appauth?app_id=%s&auth=%s", currentUrl, selectedApp.ID, orgAuth)
@@ -26013,7 +26013,7 @@ func GetActionFromLabel(ctx context.Context, app WorkflowApp, label string, fixL
2601326013
return selectedAction, selectedCategory, availableLabels
2601426014
}
2601526015

26016-
// Reload the app to be the proper one with updated actions instead
26016+
// Reload the app to be the proper one with updated actions instead
2601726017
// of random cache issues
2601826018
newApp, err := GetApp(ctx, app.ID, User{}, false)
2601926019
if err != nil {

0 commit comments

Comments
 (0)