+
+
{trigger.name}
@@ -5323,7 +5365,7 @@ const AngularWorkflow = (defaultprops) => {
}
// AUTHENTICATION
- if (app.authentication.required) {
+ if (app.authentication !== undefined && app.authentication !== null && app.authentication.required === true) {
console.log("App auth is required!")
// Setup auth here :)
@@ -5448,6 +5490,7 @@ const AngularWorkflow = (defaultprops) => {
var description = ""
if (
+ app.actions[0].parameters !== undefined &&
app.actions[0].parameters !== null &&
app.actions[0].parameters.length > 0
) {
@@ -5455,6 +5498,8 @@ const AngularWorkflow = (defaultprops) => {
}
if (
+ app.actions[0].returns !== undefined &&
+ app.actions[0].returns !== null &&
app.actions[0].returns.example !== undefined &&
app.actions[0].returns.example !== null &&
app.actions[0].returns.example.length > 0
@@ -5510,6 +5555,7 @@ const AngularWorkflow = (defaultprops) => {
: "",
authentication_id: "",
finished: false,
+ template: app.template === true ? true : false,
};
// FIXME: overwrite category if the ACTION chosen has a different category
@@ -5534,10 +5580,12 @@ const AngularWorkflow = (defaultprops) => {
};
const AppView = (props) => {
- const { allApps, prioritizedApps, filteredApps } = props;
+ const { allApps, prioritizedApps, filteredApps, extraApps } = props;
+ //extraApps,
const [visibleApps, setVisibleApps] = React.useState(
- prioritizedApps.concat(
- filteredApps.filter((innerapp) => !internalIds.includes(innerapp.id))
+ Array.prototype.concat.apply(
+ prioritizedApps,
+ filteredApps.filter((innerapp) => !internalIds.includes(innerapp.id)),
)
);
@@ -5827,7 +5875,7 @@ const AngularWorkflow = (defaultprops) => {
runSearch(event.target.value);
}}
/>
- {visibleApps.length > 0 ? (
+ {visibleApps.length > extraApps.length ? (
{visibleApps.map((app, index) => {
if (app.invalid) {
@@ -7293,7 +7341,7 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
- console.log(error.toString());
+ console.log("Get gmail folder error: ", error.toString());
});
};
@@ -7347,7 +7395,7 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
- console.log(error.toString());
+ console.log("Get outlook folders error: ", error.toString());
});
};
@@ -7368,7 +7416,8 @@ const AngularWorkflow = (defaultprops) => {
setTriggerAuthentication(responseJson);
})
.catch((error) => {
- console.log(error.toString());
+ //console.log(error.toString());
+ console.log("Set outlook auth error: ", error.toString());
});
};
@@ -7458,7 +7507,7 @@ const AngularWorkflow = (defaultprops) => {
setGmailFolders();
})
.catch((error) => {
- console.log(error.toString());
+ console.log("Set gmail trigg error: ", error.toString());
});
}, 2500);
@@ -7556,7 +7605,7 @@ const AngularWorkflow = (defaultprops) => {
setOutlookFolders();
})
.catch((error) => {
- console.log(error.toString());
+ console.log("Set outlook trigger error: ", error.toString());
});
}, 2500);
@@ -9476,7 +9525,8 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
- alert.error(error.toString());
+ //alert.error(error.toString());
+ console.log("Stop mailsub error: ", error.toString());
});
};
@@ -9552,7 +9602,8 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
- alert.error(error.toString());
+ //alert.error(error.toString());
+ console.log("Start mailsub error: ", error.toString());
});
};
@@ -9636,7 +9687,8 @@ const AngularWorkflow = (defaultprops) => {
}
})
.catch((error) => {
- console.log(error.toString());
+ //console.log(error.toString());
+ console.log("New webhook error: ", error.toString());
});
};
@@ -9679,7 +9731,8 @@ const AngularWorkflow = (defaultprops) => {
setSelectedTrigger(trigger);
})
.catch((error) => {
- alert.error(error.toString());
+ //alert.error(error.toString());
+ alert.error("Delete webhook error: ", error.toString());
});
};
diff --git a/frontend/src/views/AppCreator.jsx b/frontend/src/views/AppCreator.jsx
index a8a85007..285ffc53 100644
--- a/frontend/src/views/AppCreator.jsx
+++ b/frontend/src/views/AppCreator.jsx
@@ -289,8 +289,8 @@ const AppCreator = (defaultprops) => {
type: "header",
example: "",
};
- const [extraAuth, setExtraAuth] = useState([]);
+ const [extraAuth, setExtraAuth] = useState([]);
const [app, setApp] = useState({});
const [appAuthentication, setAppAuthentication] = React.useState([]);
const [selectedAction, setSelectedAction] = useState({});
@@ -1420,6 +1420,8 @@ const AppCreator = (defaultprops) => {
//console.log("SECURITYSCHEMES: ", securitySchemes)
if (securitySchemes !== undefined) {
+ console.log("NEWAUTH: ", securitySchemes)
+ var valueset = false
// FIXME: Should add Oauth2 (Microsoft) and JWT (Wazuh)
//console.log("SECURITY: ", securitySchemes)
//if (Object.entries(securitySchemes) > 1 &&
@@ -1444,18 +1446,31 @@ const AppCreator = (defaultprops) => {
setAuthenticationRequired(true);
} else if (key === "ApiKeyAuth" || key === "Token" || ((value.in === "header" || value.in === "query") && value.name !== undefined)) {
- setAuthenticationOption("API key");
+ if (authenticationOption === "" || authenticationOption === "No authentication") {
+ setAuthenticationOption("API key");
+ }
- value.in = value.in.charAt(0).toUpperCase() + value.in.slice(1);
- setParameterLocation(value.in);
- if (!apikeySelection.includes(value.in)) {
- console.log("APIKEY SELECT: ", apikeySelection);
- alert.error("Might be error in setting up API key authentication");
- }
+ if (valueset === false) {
+ valueset = true
+ value.in = value.in.charAt(0).toUpperCase() + value.in.slice(1)
- console.log("PARAM NAME: ", value.name);
- setParameterName(value.name);
- setAuthenticationRequired(true);
+ setParameterLocation(value.in);
+ if (!apikeySelection.includes(value.in)) {
+ console.log("APIKEY SELECT: ", apikeySelection);
+ alert.error("Might be error in setting up API key authentication");
+ }
+
+ console.log("PARAM NAME: ", value.name);
+ setParameterName(value.name);
+ setAuthenticationRequired(true);
+ } else {
+ newauth.push({
+ "name": key,
+ "type": value.in.toLowerCase(),
+ "in": value.in.toLowerCase(),
+ "example": "",
+ })
+ }
if (value.description !== undefined && value.description !== null && value.description.length > 0) {
// Don't want a real description - just the ones we're replacing with
@@ -2365,6 +2380,7 @@ const AppCreator = (defaultprops) => {
)}
+
{extraAuth.map((value, index) => {
return (
{
+ const [hovered, setHovered] = useState("");
+
+ //console.log("Date: ", new Date("2019-11-14T08:00:00.000Z"))
+ console.log("Keys: ", keys)
+ var inputdata = keys.data
+
+ /*
+ const inputdata = [{
+ "key": "Intel",
+ "data": [
+ { key: new Date('11/22/2019'), data: 3, metadata: {color: "orange", "name": "Intel"}},
+ { key: new Date('11/24/2019'), data: 8, metadata: {color: "orange", "name": "Intel"}},
+ { key: new Date('11/29/2019'), data: 2, metadata: {color: "orange", "name": "Intel"}},
+ ]},
+ {
+ "key": "Popper",
+ "data": [
+ { key: new Date('11/24/2019'), data: 9, },
+ { key: new Date('11/29/2019'), data: 3, },
+ ]
+ }
+ ]
+ */
+
+ return (
+
+
+ {keys.title}
+
+
+ }
+ colorScheme={(colorInput) => {
+ var color = "cybertron"
+ if (colorInput !== undefined && colorInput.length > 0) {
+ color = colorInput[0].metadata !== undefined && colorInput[0].metadata.color !== undefined ? colorInput[0].metadata.color : color
+ }
+
+ return color
+ }}
+ tooltip={
+
{
+ if (hovered !== event.value.x) {
+ //setHovered(event.value.x)
+ }
+ }}
+ tooltip={
+ {
+ console.log("DATA: ", data)
+ const name = data.metadata !== undefined && data.metadata.name !== undefined ? data.metadata.name : "No"
+
+ return (
+
+
+ {name}
+
+
+ )
+ /*
+
+ )
+ */
+ }
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ {
+ console.log("Click: ", hovered)
+ if (setSelectedCategory !== undefined) {
+ setSelectedCategory(hovered)
+ }
+ }}>
+
}
+ series={
+
{
+ return '#f86a3e'
+ }}
+ animated={false}
+ id="workflow_series_id"
+ style={{cursor: "pointer",}}
+ line={
+ {
+ console.log("INFO: ", data, color)
+ return (
+ null
+ )
+ }}
+ />
+ }
+ tooltip={
+ {
+ if (hovered !== event.value.x) {
+ setHovered(event.value.x)
+ }
+ }}
+ tooltip={
+ {
+ return (
+
+
+ {data.x}
+
+
+ )
+ /*
+
+ )
+ */
+ }
+ }
+ />
+ }
+ />
+
+ }
+ />
+ }
+ />
+
+ Autoupdate every {autoUpdate / 1000} seconds
+ {variables.map((data) => {
+ if (stats[data] === undefined || stats[data] === null) {
+ return null;
+ }
+
+ if (stats[data].total === undefined) {
+ return null;
+ }
+
+ return (
+
+ {data}: {stats[data].total}
+
+ );
+ })}
+
+
+ {keys.length > 0 ?
+
+
+
+ : null}
+
+
+ {widgetData === undefined ? null :
+
+
+
+
+
+ }
+
{data}
+ );
+
+ return dataWrapper;
+};
+
+export default Dashboard;
diff --git a/frontend/src/views/SettingsPage.jsx b/frontend/src/views/SettingsPage.jsx
index a8e0e0e9..1bcd2344 100644
--- a/frontend/src/views/SettingsPage.jsx
+++ b/frontend/src/views/SettingsPage.jsx
@@ -733,7 +733,7 @@ const Settings = (props) => {
{isCloud ?
- By connecting your Github account, you agree to our Terms of Service, and acknowledge that your non-sensitive data will be turned into a creator account. This enables you to earn a passive income from Shuffle. This IS reversible.
+ By connecting your Github or Metamask account, you agree to our Terms of Service, and acknowledge that your non-sensitive data will be turned into a creator account. This enables you to earn a passive income from Shuffle. This IS reversible. Support: support@shuffler.io