- // backgroundColor: "#213243",
- // This is a mess hahahah
- return (
-
-
-
-
- {includedData}
-
-
-
-
- );
-};
-
-export default App;
-
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
new file mode 100644
index 00000000..1e6a0fc3
--- /dev/null
+++ b/frontend/src/App.jsx
@@ -0,0 +1,163 @@
+import React, { useState, useEffect } from 'react';
+
+import { Route } from 'react-router';
+import { BrowserRouter } from 'react-router-dom';
+import { CookiesProvider } from 'react-cookie';
+import { useCookies } from 'react-cookie';
+
+import EditSchedule from "./views/EditSchedule";
+import Schedules from "./views/Schedules";
+import Webhooks from "./views/Webhooks";
+import Workflows from "./views/Workflows";
+import EditWebhook from "./views/EditWebhook";
+import AngularWorkflow from "./views/AngularWorkflow";
+
+import Header from './components/Header';
+import Apps from './views/Apps';
+import AppCreator from './views/AppCreator';
+import Contact from './views/Contact';
+import Oauth2 from './views/Oauth2';
+
+import Dashboard from "./views/Dashboard";
+import AdminSetup from "./views/AdminSetup";
+import Admin from "./views/Admin";
+import Docs from "./views/Docs";
+
+import LandingPageNew from "./views/LandingpageNew";
+import LoginPage from "./views/LoginPage";
+import SettingsPage from "./views/SettingsPage";
+
+import { createMuiTheme, MuiThemeProvider } from '@material-ui/core/styles';
+
+import AlertTemplate from "react-alert-template-basic";
+import { positions, Provider } from "react-alert";
+
+// Production - backend proxy forwarding in nginx
+var globalUrl = window.location.origin
+
+// CORS used for testing purposes. Should only happen with specific port and http
+if (window.location.protocol == "http:" && window.location.port === "3000") {
+ globalUrl = "http://localhost:5001"
+}
+
+const theme = createMuiTheme({
+ palette: {
+ primary: {
+ main: "#f85a3e"
+ },
+ secondary: {
+ main: '#e8eaf6',
+ },
+ surfaceColor: "#27292d",
+ inputColor: "#383B40"
+ },
+ typography: {
+ useNextVariants: true
+ },
+ overrides: {
+ MuiMenu: {
+ list: {
+ backgroundColor: "#383B40",
+ },
+ },
+ },
+});
+
+
+// FIXME - set client side cookies
+const App = (message, props) => {
+ const [userdata, setUserData] = useState({});
+ //const [homePage, ] = useState(true);
+ const [cookies, setCookie, removeCookie] = useCookies([]);
+ const [isLoggedIn, setIsLoggedIn] = useState(false);
+ const [dataset, setDataset] = useState(false);
+ const [isLoaded, setIsLoaded] = useState(false);
+
+ useEffect(() => {
+ if (dataset === false) {
+ checkLogin()
+ setDataset(true)
+ }
+ })
+
+ if (isLoaded && !isLoggedIn && (!window.location.pathname.startsWith("/login") && (!window.location.pathname.startsWith("/docs") && (!window.location.pathname.startsWith("/adminsetup"))))) {
+ window.location = "/login"
+ }
+
+ const checkLogin = () => {
+ var baseurl = globalUrl
+ fetch(baseurl + "/api/v1/users/getinfo", {
+ credentials: "include",
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ })
+ .then(response => response.json())
+ .then(responseJson => {
+ if (responseJson.success === true) {
+ setUserData(responseJson)
+ setIsLoggedIn(true)
+
+ // Updating cookie every request
+ for (var key in responseJson["cookies"]) {
+ setCookie(responseJson["cookies"][key].key, responseJson["cookies"][key].value, { path: "/" })
+ }
+ }
+ setIsLoaded(true)
+ })
+ .catch(error => {
+ setIsLoaded(true)
+ });
+ }
+
+ // Dumb for content load (per now), but good for making the site not suddenly reload parts (ajax thingies)
+
+ const options = {
+ timeout: 5000,
+ position: positions.BOTTOM_CENTER
+ };
+
+ const includedData = window.location.pathname === "/home" || window.location.pathname === "/features" ?
+
+
:
+
+
+
{ window.location.pathname = "/docs/about" }} />
+ { window.location.pathname = "/login" }} />
+
+
+ //
+ // backgroundColor: "#213243",
+ // This is a mess hahahah
+ return (
+
+
+
+
+ {includedData}
+
+
+
+
+ );
+};
+
+export default App;
diff --git a/frontend/src/Flows.js b/frontend/src/Flows.js
deleted file mode 100644
index aa1a35a3..00000000
--- a/frontend/src/Flows.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-
-const Flows = () => {
- return (
-
-
Flows
-
-
- Built to suit any organization
-
-
-
- WAT
-
-
-
-
-
-
-
-
- )
-}
-
-export default Flows;
diff --git a/frontend/src/Hookpost.js b/frontend/src/Hookpost.js
deleted file mode 100644
index 566a26d4..00000000
--- a/frontend/src/Hookpost.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-
-const Hooks = () => {
- return (
-
-
Hooks
-
-
- Built to suit any organization
-
-
-
- WAT
-
-
-
-
-
-
-
-
- )
-}
-
-export default Hooks;
diff --git a/frontend/src/Schedulespost.js b/frontend/src/Schedulespost.js
deleted file mode 100644
index 102144e7..00000000
--- a/frontend/src/Schedulespost.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-
-const Schedules = () => {
- return (
-
-
Schedules
-
-
- Built to suit any organization
-
-
-
- WAT
-
-
-
-
-
-
-
-
- )
-}
-
-export default Schedules;
diff --git a/frontend/src/appdata.js b/frontend/src/__test__/appdata.js
similarity index 100%
rename from frontend/src/appdata.js
rename to frontend/src/__test__/appdata.js
diff --git a/frontend/src/environmentdata.js b/frontend/src/__test__/environmentdata.js
similarity index 100%
rename from frontend/src/environmentdata.js
rename to frontend/src/__test__/environmentdata.js
diff --git a/frontend/src/scheduledata.js b/frontend/src/__test__/scheduledata.js
similarity index 100%
rename from frontend/src/scheduledata.js
rename to frontend/src/__test__/scheduledata.js
diff --git a/frontend/src/webhookdata.js b/frontend/src/__test__/webhookdata.js
similarity index 100%
rename from frontend/src/webhookdata.js
rename to frontend/src/__test__/webhookdata.js
diff --git a/frontend/src/workflowdata.js b/frontend/src/__test__/workflowdata.js
similarity index 100%
rename from frontend/src/workflowdata.js
rename to frontend/src/__test__/workflowdata.js
diff --git a/frontend/src/AlertPopup.js b/frontend/src/components/AlertPopup.js
similarity index 100%
rename from frontend/src/AlertPopup.js
rename to frontend/src/components/AlertPopup.js
diff --git a/frontend/src/AlertTemplate.js b/frontend/src/components/AlertTemplate.js
similarity index 100%
rename from frontend/src/AlertTemplate.js
rename to frontend/src/components/AlertTemplate.js
diff --git a/frontend/src/FooterNew.js b/frontend/src/components/FooterNew.js
similarity index 100%
rename from frontend/src/FooterNew.js
rename to frontend/src/components/FooterNew.js
diff --git a/frontend/src/Header.js b/frontend/src/components/Header.js
similarity index 90%
rename from frontend/src/Header.js
rename to frontend/src/components/Header.js
index 7a01cb53..7495d06d 100644
--- a/frontend/src/Header.js
+++ b/frontend/src/components/Header.js
@@ -5,19 +5,22 @@ import {Link} from 'react-router-dom';
import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem';
-
+import MenuItem from '@material-ui/core/MenuItem';
+import Select from '@material-ui/core/Select';
import Button from '@material-ui/core/Button';
import HomeIcon from '@material-ui/icons/Home';
import PolymerIcon from '@material-ui/icons/Polymer';
import AppsIcon from '@material-ui/icons/Apps';
import DescriptionIcon from '@material-ui/icons/Description';
import Grid from '@material-ui/core/Grid';
+import { useTheme } from '@material-ui/core/styles';
const hoverColor = "#f85a3e"
const hoverOutColor = "#e8eaf6"
const Header = props => {
- const { globalUrl, isLoggedIn, removeCookie, homePage, isLoaded } = props;
+ const { globalUrl, isLoggedIn, removeCookie, homePage, isLoaded, userdata } = props;
+ const theme = useTheme();
const [HomeHoverColor, setHomeHoverColor] = useState(hoverOutColor);
const [SoarHoverColor, setSoarHoverColor] = useState(hoverOutColor);
@@ -100,7 +103,7 @@ const Header = props => {
// Handle top bar or something
- const loginTextBrowser = !isLoggedIn ?
+ const loginTextBrowser = !isLoggedIn ?
@@ -192,6 +195,32 @@ const Header = props => {
+ {userdata === undefined || userdata.orgs.length <= 1 ? null :
+
+ {
+ console.log("SET ORG TO ", e.target.value)
+ }}
+ >
+ {userdata.orgs.map(data => {
+ return (
+
+ {data.name}
+
+ )
+ })}
+
+
+ }
+
@@ -287,7 +316,7 @@ const Header = props => {
{loadedCheck}
- );
-};
+ )
+}
export default Header;
diff --git a/frontend/src/LoginPopup.js b/frontend/src/components/LoginPopup.js
similarity index 100%
rename from frontend/src/LoginPopup.js
rename to frontend/src/components/LoginPopup.js
diff --git a/frontend/src/SettingsPopup.js b/frontend/src/components/SettingsPopup.js
similarity index 100%
rename from frontend/src/SettingsPopup.js
rename to frontend/src/components/SettingsPopup.js
diff --git a/frontend/src/About.js b/frontend/src/views/About.jsx
similarity index 85%
rename from frontend/src/About.js
rename to frontend/src/views/About.jsx
index 913eff3d..9c4044f9 100644
--- a/frontend/src/About.js
+++ b/frontend/src/views/About.jsx
@@ -1,7 +1,7 @@
import React from 'react';
const hrefStyle = {
- color: "#f85a3e",
+ color: "#f85a3e",
textDecoration: "none"
}
@@ -12,17 +12,17 @@ const About = () => {
About
- Endao was started as a project in late 2018 as a free service to analyze APK (and soon IPA) files for vulnerabilities. The project was started after I,
+ Endao was started as a project in late 2018 as a free service to analyze APK (and soon IPA) files for vulnerabilities. The project was started after I,
@frikkylikeme
, found multiple vulnerabilities in IoT devices based purely on their apps. As I wanted to learn more about these kind of vulnerabilities, I looked for solutions that work for my purpose, but didn't find any good, free and easy to use service - hence this site was born.
- My personal goal has and will always be to make the internet safer. As the IoT sphere grows, I want to be able to add ways of finding possible vulnerabilities fast to this website. This will hopefully include blogposts when I get around to it, as well as actual implementations. The vulnerability discovery field is in no way new, but I'll try my best to add whatever I can to it. As a disclaimer, I'm an "Ops" person, and I had never done frontend before creating this site. This is as much of a learning project within web development as it is in vulnerability discovery.
+ My personal goal has and will always be to make the internet safer. As the IoT sphere grows, I want to be able to add ways of finding possible vulnerabilities fast to this website. This will hopefully include blogposts when I get around to it, as well as actual implementations. The vulnerability discovery field is in no way new, but I'll try my best to add whatever I can to it. As a disclaimer, I'm an "Ops" person, and I had never done frontend before creating this site. This is as much of a learning project within web development as it is in vulnerability discovery.
- This site currently uses the following projects
+ This site currently uses the following projects
SUPER Android Analyzer Hopefully it is of use to some people :)
Thanks
-
- Thanks to Andy for the initial frontend help :)
+
+ Thanks to Andy for the initial frontend help :)
Regards
diff --git a/frontend/src/Admin.js b/frontend/src/views/Admin.jsx
similarity index 55%
rename from frontend/src/Admin.js
rename to frontend/src/views/Admin.jsx
index e60d14e0..2707d140 100644
--- a/frontend/src/Admin.js
+++ b/frontend/src/views/Admin.jsx
@@ -2,6 +2,8 @@ import React, { useEffect} from 'react';
import {Link} from 'react-router-dom';
import Paper from '@material-ui/core/Paper';
+import FormControlLabel from '@material-ui/core/FormControlLabel';
+import Switch from '@material-ui/core/Switch';
import Select from '@material-ui/core/Select';
import MenuItem from '@material-ui/core/MenuItem';
import List from '@material-ui/core/List';
@@ -16,17 +18,21 @@ import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction';
import { useAlert } from "react-alert";
-import Dialog from '@material-ui/core/Dialog';
-import DialogTitle from '@material-ui/core/DialogTitle';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
+import { Dialog, DialogTitle, DialogActions, DialogContent } from '@material-ui/core';
+import { useTheme } from '@material-ui/core/styles';
import CachedIcon from '@material-ui/icons/Cached';
+import AccessibilityNewIcon from '@material-ui/icons/AccessibilityNew';
+import LockIcon from '@material-ui/icons/Lock';
+import EcoIcon from '@material-ui/icons/Eco';
+import ScheduleIcon from '@material-ui/icons/Schedule';
+import CloudIcon from '@material-ui/icons/Cloud';
+import BusinessIcon from '@material-ui/icons/Business';
-const surfaceColor = "#27292D"
-const inputColor = "#383B40"
const Admin = (props) => {
- const { globalUrl, } = props;
+ const { globalUrl } = props;
+
+ const theme = useTheme();
const [firstRequest, setFirstRequest] = React.useState(true);
const [modalUser, setModalUser] = React.useState({});
const [modalOpen, setModalOpen] = React.useState(false);
@@ -45,14 +51,14 @@ const Admin = (props) => {
const alert = useAlert()
const deleteAuthentication = (data) => {
- alert.info("Deleting auth "+data.label)
+ alert.info("Deleting auth " + data.label)
// Just use this one?
- const url = globalUrl+'/api/v1/apps/authentication/'+data.id
+ const url = globalUrl + '/api/v1/apps/authentication/' + data.id
console.log("URL: ", url)
fetch(url, {
method: 'DELETE',
- credentials: "include",
+ credentials: "include",
headers: {
'Content-Type': 'application/json',
},
@@ -78,34 +84,35 @@ const Admin = (props) => {
console.log("INPUT: ", data)
// Just use this one?
- const url = globalUrl+'/api/v1/workflows/'+data["workflow_id"]+"/schedule/"+data.id
+ const url = globalUrl + '/api/v1/workflows/' + data["workflow_id"] + "/schedule/" + data.id
console.log("URL: ", url)
fetch(url, {
method: 'DELETE',
- credentials: "include",
+ credentials: "include",
headers: {
'Content-Type': 'application/json',
},
})
- .then(response =>
- response.json().then(responseJson => {
- console.log("RESP: ", responseJson)
- if (responseJson["success"] === false) {
- alert.error("Failed stopping schedule")
- } else {
- getSchedules()
- alert.success("Successfully stopped schedule!")
- }
- }),
- )
- .catch(error => {
- console.log("Error in userdata: ", error)
- });
+ .then(response =>
+ response.json().then(responseJson => {
+ console.log("RESP: ", responseJson)
+ if (responseJson["success"] === false) {
+ alert.error("Failed stopping schedule")
+ } else {
+ getSchedules()
+ alert.success("Successfully stopped schedule!")
+ }
+ }),
+ )
+ .catch(error => {
+ console.log("Error in userdata: ", error)
+ });
}
const onPasswordChange = () => {
- const data = {"username": selectedUser.username, "newpassword": newPassword}
- const url = globalUrl+'/api/v1/users/passwordchange';
+ const data = { "username": selectedUser.username, "newpassword": newPassword }
+ const url = globalUrl + '/api/v1/users/passwordchange';
+
fetch(url, {
mode: 'cors',
method: 'POST',
@@ -117,26 +124,26 @@ const Admin = (props) => {
'Content-Type': 'application/json; charset=utf-8',
},
})
- .then(response =>
- response.json().then(responseJson => {
- if (responseJson["success"] === false) {
- alert.error("Failed setting new password")
- } else {
- alert.success("Changed password!")
- }
- }),
- )
- .catch(error => {
- alert.error("Err: "+error.toString())
- });
+ .then(response =>
+ response.json().then(responseJson => {
+ if (responseJson["success"] === false) {
+ alert.error("Failed setting new password")
+ } else {
+ alert.success("Changed password!")
+ }
+ }),
+ )
+ .catch(error => {
+ alert.error("Err: " + error.toString())
+ });
}
const deleteUser = (data) => {
// Just use this one?
- const url = globalUrl+'/api/v1/users/'+data.id
+ const url = globalUrl + '/api/v1/users/' + data.id
fetch(url, {
method: 'DELETE',
- credentials: "include",
+ credentials: "include",
headers: {
'Content-Type': 'application/json',
},
@@ -166,36 +173,36 @@ const Admin = (props) => {
console.log("INPUT: ", data)
// Just use this one?
- var data = {"username": data.Username, "password": data.Password}
+ var data = { "username": data.Username, "password": data.Password }
var baseurl = globalUrl
- const url = baseurl+'/api/v1/users/register';
+ const url = baseurl + '/api/v1/users/register';
fetch(url, {
method: 'POST',
- credentials: "include",
+ credentials: "include",
body: JSON.stringify(data),
headers: {
'Content-Type': 'application/json',
},
})
- .then(response =>
- response.json().then(responseJson => {
- if (responseJson["success"] === false) {
- setLoginInfo("Error in input: "+responseJson.reason)
- } else {
- setLoginInfo("")
- setModalOpen(false)
- getUsers()
- }
- }),
- )
- .catch(error => {
- console.log("Error in userdata: ", error)
- });
+ .then(response =>
+ response.json().then(responseJson => {
+ if (responseJson["success"] === false) {
+ setLoginInfo("Error in input: " + responseJson.reason)
+ } else {
+ setLoginInfo("")
+ setModalOpen(false)
+ getUsers()
+ }
+ }),
+ )
+ .catch(error => {
+ console.log("Error in userdata: ", error)
+ });
}
const deleteEnvironment = (name) => {
// FIXME - add some check here ROFL
- alert.info("Deleting environment "+name)
+ alert.info("Deleting environment " + name)
var newEnv = []
for (var key in environments) {
if (environments[key].Name == name) {
@@ -206,26 +213,26 @@ const Admin = (props) => {
}
// Just use this one?
- const url = globalUrl+'/api/v1/setenvironments';
+ const url = globalUrl + '/api/v1/setenvironments';
fetch(url, {
method: 'PUT',
- credentials: "include",
+ credentials: "include",
body: JSON.stringify(newEnv),
headers: {
'Content-Type': 'application/json',
},
})
- .then(response =>
- response.json().then(responseJson => {
- if (responseJson["success"] === false) {
- alert.error(responseJson.reason)
- } else {
- setLoginInfo("")
- setModalOpen(false)
- getEnvironments()
- }
- }),
- )
+ .then(response =>
+ response.json().then(responseJson => {
+ if (responseJson["success"] === false) {
+ alert.error(responseJson.reason)
+ } else {
+ setLoginInfo("")
+ setModalOpen(false)
+ getEnvironments()
+ }
+ }),
+ )
//.catch(error => {
// console.log("Error in userdata: ", error)
//});
@@ -233,140 +240,140 @@ const Admin = (props) => {
const submitEnvironment = (data) => {
// FIXME - add some check here ROFL
- environments.push({"name": data.environment, "type": "onprem"})
+ environments.push({ "name": data.environment, "type": "onprem" })
// Just use this one?
var baseurl = globalUrl
- const url = baseurl+'/api/v1/setenvironments';
+ const url = baseurl + '/api/v1/setenvironments';
fetch(url, {
method: 'PUT',
- credentials: "include",
+ credentials: "include",
body: JSON.stringify(environments),
headers: {
'Content-Type': 'application/json',
},
})
- .then(response =>
- response.json().then(responseJson => {
- if (responseJson["success"] === false) {
- setLoginInfo("Error in input: "+responseJson.reason)
- } else {
- setLoginInfo("")
- setModalOpen(false)
- getEnvironments()
- }
- }),
- )
- .catch(error => {
- console.log("Error in userdata: ", error)
- });
+ .then(response =>
+ response.json().then(responseJson => {
+ if (responseJson["success"] === false) {
+ setLoginInfo("Error in input: " + responseJson.reason)
+ } else {
+ setLoginInfo("")
+ setModalOpen(false)
+ getEnvironments()
+ }
+ }),
+ )
+ .catch(error => {
+ console.log("Error in userdata: ", error)
+ });
}
const getSchedules = () => {
- fetch(globalUrl+"/api/v1/workflows/schedules", {
+ fetch(globalUrl + "/api/v1/workflows/schedules", {
method: 'GET',
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json',
},
credentials: "include",
- })
- .then((response) => {
- if (response.status !== 200) {
- console.log("Status not 200 for apps :O!")
- return
- }
+ })
+ .then((response) => {
+ if (response.status !== 200) {
+ console.log("Status not 200 for apps :O!")
+ return
+ }
- return response.json()
- })
- .then((responseJson) => {
- setSchedules(responseJson)
- })
- .catch(error => {
- alert.error(error.toString())
- });
+ return response.json()
+ })
+ .then((responseJson) => {
+ setSchedules(responseJson)
+ })
+ .catch(error => {
+ alert.error(error.toString())
+ });
}
const getAppAuthentication = () => {
- fetch(globalUrl+"/api/v1/apps/authentication", {
+ fetch(globalUrl + "/api/v1/apps/authentication", {
method: 'GET',
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json',
},
credentials: "include",
- })
- .then((response) => {
- if (response.status !== 200) {
- console.log("Status not 200 for apps :O!")
- return
- }
+ })
+ .then((response) => {
+ if (response.status !== 200) {
+ console.log("Status not 200 for apps :O!")
+ return
+ }
- return response.json()
- })
- .then((responseJson) => {
- if (responseJson.success) {
- console.log(responseJson.data)
- setAuthentication(responseJson.data)
- } else {
- alert.error("Failed getting authentications")
- }
- })
- .catch(error => {
- alert.error(error.toString())
- });
+ return response.json()
+ })
+ .then((responseJson) => {
+ if (responseJson.success) {
+ console.log(responseJson.data)
+ setAuthentication(responseJson.data)
+ } else {
+ alert.error("Failed getting authentications")
+ }
+ })
+ .catch(error => {
+ alert.error(error.toString())
+ });
}
const getEnvironments = () => {
- fetch(globalUrl+"/api/v1/getenvironments", {
+ fetch(globalUrl + "/api/v1/getenvironments", {
method: 'GET',
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json',
},
credentials: "include",
- })
- .then((response) => {
- if (response.status !== 200) {
- console.log("Status not 200 for apps :O!")
- return
- }
+ })
+ .then((response) => {
+ if (response.status !== 200) {
+ console.log("Status not 200 for apps :O!")
+ return
+ }
- return response.json()
- })
- .then((responseJson) => {
- console.log(responseJson)
- setEnvironments(responseJson)
- })
- .catch(error => {
- alert.error(error.toString())
- });
+ return response.json()
+ })
+ .then((responseJson) => {
+ console.log(responseJson)
+ setEnvironments(responseJson)
+ })
+ .catch(error => {
+ alert.error(error.toString())
+ });
}
const getUsers = () => {
- fetch(globalUrl+"/api/v1/getusers", {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'Accept': 'application/json',
- },
- credentials: "include",
- })
- .then((response) => {
- if (response.status !== 200) {
- console.log("Status not 200 for apps :O!")
- return
- }
+ fetch(globalUrl + "/api/v1/getusers", {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json',
+ },
+ credentials: "include",
+ })
+ .then((response) => {
+ if (response.status !== 200) {
+ console.log("Status not 200 for apps :O!")
+ return
+ }
- return response.json()
- })
- .then((responseJson) => {
- console.log(responseJson)
- setUsers(responseJson)
- })
- .catch(error => {
- alert.error(error.toString())
- });
+ return response.json()
+ })
+ .then((responseJson) => {
+ console.log(responseJson)
+ setUsers(responseJson)
+ })
+ .catch(error => {
+ alert.error(error.toString())
+ });
}
if (firstRequest) {
@@ -378,8 +385,8 @@ const Admin = (props) => {
maxWidth: 1250,
margin: "auto",
color: "white",
- backgroundColor: surfaceColor,
- marginBottom: 10,
+ backgroundColor: theme.palette.surfaceColor,
+ marginBottom: 10,
padding: 20,
}
@@ -388,11 +395,11 @@ const Admin = (props) => {
}
const setUser = (userId, field, value) => {
- const data = {"user_id": userId}
+ const data = { "user_id": userId }
data[field] = value
console.log("DATA: ", data)
- fetch(globalUrl+"/api/v1/users/updateuser", {
+ fetch(globalUrl + "/api/v1/users/updateuser", {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
@@ -401,33 +408,33 @@ const Admin = (props) => {
body: JSON.stringify(data),
credentials: "include",
})
- .then((response) => {
- if (response.status !== 200) {
- console.log("Status not 200 for WORKFLOW EXECUTION :O!")
- } else {
- getUsers()
- }
+ .then((response) => {
+ if (response.status !== 200) {
+ console.log("Status not 200 for WORKFLOW EXECUTION :O!")
+ } else {
+ getUsers()
+ }
- return response.json()
- })
- .then((responseJson) => {
- if (!responseJson.success && responseJson.reason !== undefined) {
- alert.error("Failed setting user: "+responseJson.reason)
- } else {
- alert.success("Set the user field "+field+" to "+value)
- }
- })
- .catch(error => {
- console.log(error)
- });
+ return response.json()
+ })
+ .then((responseJson) => {
+ if (!responseJson.success && responseJson.reason !== undefined) {
+ alert.error("Failed setting user: " + responseJson.reason)
+ } else {
+ alert.success("Set the user field " + field + " to " + value)
+ }
+ })
+ .catch(error => {
+ console.log(error)
+ });
}
const generateApikey = (userId) => {
- const data = {"user_id": userId}
+ const data = { "user_id": userId }
- fetch(globalUrl+"/api/v1/generateapikey", {
+ fetch(globalUrl + "/api/v1/generateapikey", {
method: 'POST',
headers: {
'Content-Type': 'application/json',
@@ -436,49 +443,49 @@ const Admin = (props) => {
body: JSON.stringify(data),
credentials: "include",
})
- .then((response) => {
- if (response.status !== 200) {
- console.log("Status not 200 for WORKFLOW EXECUTION :O!")
- } else {
- getUsers()
- }
+ .then((response) => {
+ if (response.status !== 200) {
+ console.log("Status not 200 for WORKFLOW EXECUTION :O!")
+ } else {
+ getUsers()
+ }
- return response.json()
- })
- .then((responseJson) => {
- console.log("RESP: ", responseJson)
- if (!responseJson.success && responseJson.reason !== undefined) {
- alert.error("Failed getting new: "+responseJson.reason)
- } else {
- alert.success("Got new API key")
- }
- })
- .catch(error => {
- console.log(error)
- });
+ return response.json()
+ })
+ .then((responseJson) => {
+ console.log("RESP: ", responseJson)
+ if (!responseJson.success && responseJson.reason !== undefined) {
+ alert.error("Failed getting new: " + responseJson.reason)
+ } else {
+ alert.success("Got new API key")
+ }
+ })
+ .catch(error => {
+ console.log(error)
+ });
}
- const editAuthenticationModal =
- {setSelectedAuthenticationModalOpen(false)}}
+ onClose={() => { setSelectedAuthenticationModalOpen(false) }}
PaperProps={{
style: {
- backgroundColor: surfaceColor,
+ backgroundColor: theme.palette.surfaceColor,
color: "white",
minWidth: "800px",
minHeight: "320px",
},
}}
>
- Edit authentication Edit authentication
-
+
{
variant="outlined"
onChange={e => setNewPassword(e.target.value)}
/>
- onPasswordChange()}
>
- Submit
+ Submit
-
-
+
deleteUser(selectedUser)}
>
- {selectedUser.active ? "Deactivate" : "Activate"}
+ {selectedUser.active ? "Deactivate" : "Activate"}
-
generateApikey(selectedUser.id)}
@@ -522,27 +529,27 @@ const Admin = (props) => {
- const editUserModal =
- {setSelectedUserModalOpen(false)}}
+ onClose={() => { setSelectedUserModalOpen(false) }}
PaperProps={{
style: {
- backgroundColor: surfaceColor,
+ backgroundColor: theme.palette.surfaceColor,
color: "white",
minWidth: "800px",
minHeight: "320px",
},
}}
>
- Edit user Edit user
-
+
{
variant="outlined"
onChange={e => setNewPassword(e.target.value)}
/>
- onPasswordChange()}
>
- Submit
+ Submit
-
-
+
deleteUser(selectedUser)}
>
- {selectedUser.active ? "Deactivate" : "Activate"}
+ {selectedUser.active ? "Deactivate" : "Activate"}
-
generateApikey(selectedUser.id)}
@@ -586,33 +593,33 @@ const Admin = (props) => {
- const modalView =
- {setModalOpen(false)}}
+ onClose={() => { setModalOpen(false) }}
PaperProps={{
style: {
- backgroundColor: surfaceColor,
+ backgroundColor: theme.palette.surfaceColor,
color: "white",
minWidth: "800px",
minHeight: "320px",
},
}}
>
-
+
{curTab === 0 ? "Add user" : "Add environment"}
- {curTab === 0 ?
+ {curTab === 0 ?
Username
{
variant="outlined"
onChange={(event) => changeModalData("Username", event.target.value)}
/>
- Password
+ Password
{
onChange={(event) => changeModalData("Password", event.target.value)}
/>
- : curTab === 2 ?
-
- Environment Name
+ : curTab === 2 ?
+
+ Environment Name
changeModalData("environment", event.target.value)}
- />
-
- : null }
+ color="primary"
+ style={{ backgroundColor: theme.palette.inputColor }}
+ autoFocus
+ InputProps={{
+ style: {
+ height: "50px",
+ color: "white",
+ fontSize: "1em",
+ },
+ }}
+ required
+ fullWidth={true}
+ placeholder="datacenter froglantern"
+ id="environment_name"
+ margin="normal"
+ variant="outlined"
+ onChange={(event) => changeModalData("environment", event.target.value)}
+ />
+
- setModalOpen(false)} color="primary">
+ setModalOpen(false)} color="primary">
Cancel
- {
+ {
if (curTab === 0) {
submitUser(modalUser)
} else if (curTab === 2) {
submitEnvironment(modalUser)
}
}} color="primary">
- Submit
+ Submit
const usersView = curTab === 0 ?
-
-
User management
-
Add, edit, block or change passwords
+
+
User management
+ Add, edit, block or change passwords
-
-
+
setModalOpen(true)}
- >
- Add user
+ >
+ Add user
-
+
{users === undefined ? null : users.map(data => {
@@ -734,58 +741,58 @@ const Admin = (props) => {
{
- console.log("VALUE: ", e.target.value)
- setUser(data.id, "role", e.target.value)
- }}
- style={{backgroundColor: surfaceColor, color: "white", height: "50px"}}
+ console.log("VALUE: ", e.target.value)
+ setUser(data.id, "role", e.target.value)
+ }}
+ style={{ backgroundColor: theme.palette.surfaceColor, color: "white", height: "50px" }}
>
-
- Admin
+
+ Admin
-
- User
+
+ User
-
- style={{minWidth: 150, maxWidth: 150}}
+ }
+ style = {{ minWidth: 150, maxWidth: 150}}
/>
- {
- setSelectedUserModalOpen(true)
- setSelectedUser(data)
- }}
- >
- Edit user
+ primary={data.active ? "True" : "False"}
+ style={{ minWidth: 180, maxWidth: 180 }}
+ />
+
+ {
+ setSelectedUserModalOpen(true)
+ setSelectedUser(data)
+ }}
+ >
+ Edit user
-
+
)
})}
@@ -799,7 +806,7 @@ const Admin = (props) => {
Schedules
Schedules used in Workflows. Makes locating and control easier.
-
+
{
App Authentication
Control the authentication options for individual apps. Actions can be destructive!
{
>
-
+
{
style={{minWidth: 200, maxWidth: 200, overflow: "hidden"}}
/>
- deleteEnvironment(environment.Name)} color="primary">Delete
+ deleteEnvironment(environment.Name)} color="primary">Delete
)
@@ -986,6 +993,94 @@ const Admin = (props) => {
+
+
Organizations
+ Global admin: control organizations
+
+
setModalOpen(true)}
+ >
+ Add organization
+
+
+
+
+
+
+ {console.log("INVERT")}} />
+ style={{minWidth: 150, maxWidth: 150}}
+ />
+
+
+
+
+
Hybrid
+
+
+
+
+
+
+ {console.log("INVERT")}} />
+ style={{minWidth: 150, maxWidth: 150}}
+ />
+
+
+
-
@@ -1022,6 +1119,8 @@ const Admin = (props) => {
{usersView}
{environmentView}
{schedulesView}
+ {hybridTab}
+ {organizationsTab}
diff --git a/frontend/src/AdminSetup.js b/frontend/src/views/AdminSetup.jsx
similarity index 100%
rename from frontend/src/AdminSetup.js
rename to frontend/src/views/AdminSetup.jsx
diff --git a/frontend/src/AngularWorkflow.js b/frontend/src/views/AngularWorkflow.jsx
similarity index 99%
rename from frontend/src/AngularWorkflow.js
rename to frontend/src/views/AngularWorkflow.jsx
index 31f792c4..294b4d2a 100644
--- a/frontend/src/AngularWorkflow.js
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -68,8 +68,7 @@ import CytoscapeComponent from 'react-cytoscapejs';
import undoRedo from 'cytoscape-undo-redo';
import Draggable from 'react-draggable';
-import environmentdata from './environmentdata';
-import cytoscapestyle from './defaultCytoscapeStyle';
+import cytoscapestyle from '../defaultCytoscapeStyle';
import cxtmenu from 'cytoscape-cxtmenu';
import { w3cwebsocket as W3CWebSocket } from "websocket";
@@ -950,6 +949,10 @@ const AngularWorkflow = (props) => {
if (curaction.selectedAuthentication === null || curaction.selectedAuthentication === undefined || curaction.selectedAuthentication.length === "") {
curaction.selectedAuthentication = {}
}
+ } else {
+ curaction.authentication = []
+ curaction.authentication_id = ""
+ curaction.selectedAuthentication = {}
}
setSelectedApp(curapp)
@@ -2998,7 +3001,7 @@ const AngularWorkflow = (props) => {
paddingLeft: 10,
minHeight: "100%",
zIndex: 1000,
- resize: "horizontal",
+ resize: "vertical",
overflow: "auto",
}
@@ -3513,14 +3516,6 @@ const AngularWorkflow = (props) => {
{data.name}
-
- {
- e.preventDefault()
- changeActionParameterVariant("STATIC_VALUE")
- }}>
-
-