Fixed merge conflicts

frontend/src/components/Oauth2Auth.jsx

@@ -2,6 +2,7 @@ import React, { useRef, useState, useEffect, useLayoutEffect } from "react";
 import { useParams, useNavigate, Link } from "react-router-dom";
 import { useTheme } from "@material-ui/core/styles";
 import theme from '../theme.jsx';
+import { useAlert } from "react-alert";
 
 import { v4 as uuidv4 } from "uuid";
 import {
@@ -97,6 +98,7 @@ const AuthenticationOauth2 = (props) => {
   } = props;
 
   let navigate = useNavigate();
+  const alert = useAlert()
 
   //const [update, setUpdate] = React.useState("|")
   const [defaultConfigSet, setDefaultConfigSet] = React.useState(
@@ -282,6 +284,51 @@ const AuthenticationOauth2 = (props) => {
 	}
 
 
+  const handleOauth2Request = (client_id, client_secret, oauth_url, scopes, admin_consent, prompt) => {
+    setButtonClicked(true);
+    //console.log("SCOPES: ", scopes);
+
+		client_id = client_id.trim()
+		client_secret = client_secret.trim()
+		oauth_url = oauth_url.trim()
+
+    var resources = "";
+    if (scopes !== undefined && (scopes !== null) & (scopes.length > 0)) {
+			console.log("IN scope 1")
+			if (offlineAccess === true && !scopes.includes("offline_access")) {
+
+				console.log("IN scope 2")
+				if (!authenticationType.redirect_uri.includes("google")) {
+					console.log("Appending offline access")
+					scopes.push("offline_access")
+				}
+			}
+
+      resources = scopes.join(" ");
+      //resources = scopes.join(",");
+    }
+
+    const authentication_url = authenticationType.token_uri;
+    //console.log("AUTH: ", authenticationType)
+    //console.log("SCOPES2: ", resources)
+    const redirectUri = `${window.location.protocol}//${window.location.host}/set_authentication`;
+		const workflowId = workflow !== undefined ? workflow.id : "";
+    var state = `workflow_id%3D${workflowId}%26reference_action_id%3d${selectedAction.app_id}%26app_name%3d${selectedAction.app_name}%26app_id%3d${selectedAction.app_id}%26app_version%3d${selectedAction.app_version}%26authentication_url%3d${authentication_url}%26scope%3d${resources}%26client_id%3d${client_id}%26client_secret%3d${client_secret}`;
+
+
+		// This is to make sure authorization can be handled WITHOUT being logged in,
+		// kind of making it act like an api key
+		// https://shuffler.io/authorization -> 3rd party integration auth
+		const urlParams = new URLSearchParams(window.location.search);
+		const userAuth = urlParams.get("authorization");
+		if (userAuth !== undefined && userAuth !== null && userAuth.length > 0) {
+			console.log("Adding authorization from user side")
+			state += `%26authorization%3d${userAuth}`;
+		}
+		// write:request:jira-service-management
+	}
+
+
   const handleOauth2Request = (client_id, client_secret, oauth_url, scopes, admin_consent, prompt) => {
     setButtonClicked(true);
     //console.log("SCOPES: ", scopes);
@@ -317,6 +364,35 @@ const AuthenticationOauth2 = (props) => {
       console.log("ADDING OAUTH2 URL: ", state);
     }
 
+    if (
+      authenticationType.refresh_uri !== undefined &&
+      authenticationType.refresh_uri !== null &&
+      authenticationType.refresh_uri.length > 0
+    ) {
+      state += `%26refresh_uri%3d${authenticationType.refresh_uri}`;
+    } else {
+      state += `%26refresh_uri%3d${authentication_url}`;
+    }
+
+		// No prompt forcing
+    //var url = `${authenticationType.redirect_uri}?client_id=${client_id}&redirect_uri=${redirectUri}&response_type=code&prompt=login&scope=${resources}&state=${state}&access_type=offline`;
+		var defaultPrompt = "login"
+   	if (prompt !== undefined && prompt !== null && prompt.length > 0) {
+			defaultPrompt = prompt
+		}
+		// Check for org_id
+		const orgId = urlParams.get("org_id");
+		if (orgId !== undefined && orgId !== null && orgId.length > 0) {
+			console.log("Adding org_id from user side")
+			state += `%26org_id%3d${orgId}`;
+		}
+
+    if (oauth_url !== undefined && oauth_url !== null && oauth_url.length > 0) {
+      state += `%26oauth_url%3d${oauth_url}`;
+      console.log("ADDING OAUTH2 URL: ", state);
+    }
+
+
     if (
       authenticationType.refresh_uri !== undefined &&
       authenticationType.refresh_uri !== null &&
@@ -356,7 +432,7 @@ const AuthenticationOauth2 = (props) => {
     // How can we get a callback properly realtime?
     // How can we properly try-catch without breaks on error?
     try {
-      var newwin = window.open(url, "", "width=800,height=600");
+      var newwin = window.open(url, "", "width=582,height=700");
       //console.log(newwin)
 
       var open = true;
@@ -447,9 +523,7 @@ const AuthenticationOauth2 = (props) => {
             ] = "false";
           } else {
             alert.info(
-              "Field " +
-                selectedApp.authentication.parameters[key].name +
-                " can't be empty"
+              "Field " + selectedApp.authentication.parameters[key].name.replace("_basic", "", -1).replace("_", " ", -1) + " can't be empty"
             );
             return;
           }

frontend/src/components/ParsedAction.jsx

@@ -1595,6 +1595,7 @@ const ParsedAction = (props) => {
                     maxWidth: "95%",
                     fontSize: "1em",
                   },
+				disableUnderline: true,
                   endAdornment: hideExtraTypes ? null : (
                     <InputAdornment position="end">
 											<ButtonGroup orientation={multiline ? "vertical" : "horizontal"}>
@@ -2958,6 +2959,7 @@ const ParsedAction = (props) => {
 								style={theme.palette.textFieldStyle}
 								InputProps={{
 									style: theme.palette.innerTextfieldStyle,
+									disableUnderline: true,
 								}}
 								fullWidth
 								color="primary"
@@ -3177,6 +3179,7 @@ const ParsedAction = (props) => {
 											}}
 											InputProps={{
 												style: theme.palette.innerTextfieldStyle,
+												disableUnderline: true,
 											}}
 											placeholder={selectedAction.execution_delay}
 											defaultValue={selectedAction.execution_delay}
@@ -3492,7 +3495,7 @@ const ParsedAction = (props) => {
 								</li>
 							)	
   					}}
-            options={selectedApp.actions.filter((a) => a.category_label !== undefined && a.category_label !== null && a.category_label.length > 0).concat(sortByKey(selectedApp.actions, "label"))}
+            options={selectedApp.actions === undefined || selectedApp.actions === null ? [] : selectedApp.actions.filter((a) => a.category_label !== undefined && a.category_label !== null && a.category_label.length > 0).concat(sortByKey(selectedApp.actions, "label"))}
             ListboxProps={{
               style: {
                 backgroundColor: theme.palette.inputColor,

frontend/src/components/ShuffleCodeEditor.jsx

@@ -1694,20 +1694,29 @@ const CodeEditor = (props) => {
 						cursor: "pointer"
 					}}
 					onClick={(event) => {
+						// Take localcodedata through the Shuffle JSON parser just in case
+						// This is to make it so we don't need to handle these fixes on the
+						// backend by itself
+						var fixedcodedata = localcodedata
+						const valid = validateJson(localcodedata, true)
+						if (valid.valid) {
+							fixedcodedata = JSON.stringify(valid.result, null, 2)
+						}
+
 						// console.log(codedata)
 						// console.log(fieldCount)
 						if (isFileEditor === true){
-							runUpdateText(localcodedata);
-							setcodedata(localcodedata);
+							runUpdateText(fixedcodedata);
+							setcodedata(fixedcodedata);
 							setExpansionModalOpen(false)
+						} else {
+							changeActionParameterCodeMirror(event, fieldCount, fixedcodedata)
+							setExpansionModalOpen(false)
+							setcodedata(fixedcodedata)
 						}
-						else {
-						changeActionParameterCodeMirror(event, fieldCount, localcodedata)
-						setExpansionModalOpen(false)
-						setcodedata(localcodedata)}
 					}}
 				>
-					Done
+					Submit	
 				</button>
 			</div>
 		</Dialog>)