Merge branch 'main' of github.com:Shuffle/Shuffle-shared

app_upload/stitcher.go

@@ -844,8 +844,8 @@ func main() {
 		bucketName = os.Args[5]
 	}
 
-	appname := "shuffle-ai"
-	appversion := "1.0.0"
+	appname := "email"
+	appversion := "1.3.0"
 	err := deployConfigToBackend(appfolder, appname, appversion)
 	if err != nil {
 		log.Printf("[WARNING] Failed uploading config: %s", err)

db-connector.go

@@ -7521,7 +7521,7 @@ func SetWorkflow(ctx context.Context, workflow Workflow, id string, optionalEdit
 	// New struct, to not add body, author etc
 	data, err := json.Marshal(workflow)
 	if err != nil {
-		log.Printf("[WARNING] Failed marshalling in getworkflow: %s", err)
+		log.Printf("[WARNING] Failed marshalling in set workflow: %s", err)
 		return nil
 	}
 
@@ -12803,3 +12803,30 @@ func DeleteDbIndex(ctx context.Context, index string) error {
 
 	return nil
 }
+
+func SetTraining(ctx context.Context, training Training) error {
+	if project.DbType == "opensearch" {
+		return errors.New("Not implemented")
+	}
+
+	if training.ID == "" {
+		training.ID = uuid.NewV4().String()
+	}
+
+	if training.SignupTime == 0 {
+		training.SignupTime = time.Now().Unix()
+	}
+
+	// Overwriting to be sure these are matching
+	// No real point in having id + workflow.ID anymore
+	nameKey := "training"
+
+	log.Printf("[INFO] Setting training with %d attendants", training.NumberOfAttendees)
+	key := datastore.NameKey(nameKey, training.ID, nil)
+	if _, err := project.Dbclient.Put(ctx, key, &training); err != nil {
+		log.Printf("[ERROR] Failed adding training with ID %s: %s", training.ID, err)
+		return err
+	}
+
+	return nil
+}

oauth2.go

@@ -4002,10 +4002,23 @@ func RunOauth2Request(ctx context.Context, user User, appAuth AppAuthenticationS
 	// FIXME: Does this work with string?
 	//https://stackoverflow.com/questions/43870554/microsoft-oauth2-authentication-not-returning-refresh-token
 	parsedTime := strconv.FormatInt(int64(time.Now().Unix())+int64(oauthResp.ExpiresIn), 10)
-	appAuth.Fields = append(appAuth.Fields, AuthenticationStore{
-		Key:   "expiration",
-		Value: parsedTime,
-	})
+	if oauthResp.ExpiresIn > 0 {
+		newauth := []AuthenticationStore{}
+		for _, item := range appAuth.Fields {
+			if item.Key == "expiration" {
+				continue
+			}
+
+			newauth = append(newauth, item)
+		}
+
+		newauth = append(newauth, AuthenticationStore{
+			Key:   "expiration",
+			Value: parsedTime,
+		})
+
+		appAuth.Fields = newauth
+	}
 
 	if len(refreshUrl) > 0 && !refresh {
 		log.Printf("[DEBUG] Appending Oauth2 Refresh URL %s", refreshUrl)

shared.go

@@ -14565,7 +14565,8 @@ func handleKeyEncryption(data []byte, passphrase string) ([]byte, error) {
 }
 
 func HandleKeyDecryption(data []byte, passphrase string) ([]byte, error) {
-	log.Printf("[DEBUG] Passphrase: %s", passphrase)
+	//log.Printf("[DEBUG] Passphrase: %s", passphrase)
+	log.Printf("Decrypting key: %s", data)
 	key, err := create32Hash(passphrase)
 	if err != nil {
 		log.Printf("[ERROR] Failed hashing in decrypt: %s", err)
@@ -14600,7 +14601,8 @@ func HandleKeyDecryption(data []byte, passphrase string) ([]byte, error) {
 	nonce, ciphertext := parsedData[:nonceSize], parsedData[nonceSize:]
 	plaintext, err := gcm.Open(nil, nonce, ciphertext, nil)
 	if err != nil {
-		log.Printf("[ERROR] Error reading decryptionkey: %s - nonce: %s, ciphertext: %s", err, nonce, ciphertext)
+		//log.Printf("[ERROR] Error reading decryptionkey: %s - nonce: %s, ciphertext: %s", err, nonce, ciphertext)
+		log.Printf("[ERROR] Error reading decryptionkey: %s - nonce: %s", err, nonce)
 		return []byte{}, err
 	}
 
@@ -18830,7 +18832,7 @@ func PrepareWorkflowExecution(ctx context.Context, workflow Workflow, request *h
 				}
 
 				action.Parameters = append(action.Parameters, parameter)
-				log.Printf("[INFO] Adding parameter %s to subflow", parameter.Name)
+				//log.Printf("[INFO] Adding parameter %s to subflow", parameter.Name)
 			}
 
 			action.Parameters = append(action.Parameters, WorkflowAppActionParameter{

structs.go

@@ -3865,3 +3865,18 @@ type SSOResponse struct {
 	Reason  string `json:"reason"`
 	URL     string `json:"url"`
 }
+
+type Training struct {
+	Name              string `json:"Name"`
+	Email             string `json:"Email"`
+	NumberOfAttendees int    `json:"numberOfAttendees"`
+	Message           string `json:"Message"`
+	Time              string `json:"Time"`
+	Country           string `json:"Country"`
+
+	OrgId string `json:"org_id"`
+	UserId string `json:"user_id"`
+	Username string `json:"username"`
+	ID	  string `json:"id"`
+	SignupTime int64 `json:"signupTime"`
+}