#168: Add app authentcation edit

backend/go-app/main.go

@@ -8164,6 +8164,7 @@ func initHandlers() {
 
 	r.HandleFunc("/api/v1/apps/authentication", getAppAuthentication).Methods("GET", "OPTIONS")
 	r.HandleFunc("/api/v1/apps/authentication", addAppAuthentication).Methods("PUT", "OPTIONS")
+	r.HandleFunc("/api/v1/apps/authentication/{appauthId}/config", setAuthenticationConfig).Methods("POST", "OPTIONS")
 
 	r.HandleFunc("/api/v1/apps/authentication/{appauthId}", deleteAppAuthentication).Methods("DELETE", "OPTIONS")
 

backend/go-app/walkoff.go

@@ -4614,6 +4614,149 @@ func getWorkflowAppConfig(resp http.ResponseWriter, request *http.Request) {
 	resp.Write(data)
 }
 
+//r.HandleFunc("/api/v1/apps/authentication/{appauthId}/config", setAuthenticationConfig).Methods("POST", "OPTIONS")
+func setAuthenticationConfig(resp http.ResponseWriter, request *http.Request) {
+	cors := handleCors(resp, request)
+	if cors {
+		return
+	}
+
+	user, userErr := handleApiAuthentication(resp, request)
+	if userErr != nil {
+		log.Printf("Api authentication failed in get all apps: %s", userErr)
+		resp.WriteHeader(401)
+		resp.Write([]byte(`{"success": false}`))
+		return
+	}
+
+	if user.Role != "admin" {
+		log.Printf("[WARNING] User isn't admin during auth edit config")
+		resp.WriteHeader(409)
+		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Must be admin to perform this action"}`)))
+		return
+	}
+
+	var fileId string
+	location := strings.Split(request.URL.String(), "/")
+	if location[1] == "api" {
+		if len(location) <= 5 {
+			resp.WriteHeader(401)
+			resp.Write([]byte(`{"success": false}`))
+			return
+		}
+
+		fileId = location[5]
+	}
+	log.Printf("FILE: %s", fileId)
+
+	body, err := ioutil.ReadAll(request.Body)
+	if err != nil {
+		log.Printf("Error with body read: %s", err)
+		resp.WriteHeader(401)
+		resp.Write([]byte(`{"success": false}`))
+		return
+	}
+
+	type configAuth struct {
+		Id     string `json:"id"`
+		Action string `json:"action"`
+	}
+
+	var config configAuth
+	err = json.Unmarshal(body, &config)
+	if err != nil {
+		log.Printf("Failed unmarshaling (appauth): %s", err)
+		resp.WriteHeader(401)
+		resp.Write([]byte(`{"success": false}`))
+		return
+	}
+
+	if config.Id != fileId {
+		resp.WriteHeader(401)
+		resp.Write([]byte(`{"success": false, "reason": "Bad ID match"}`))
+		return
+	}
+
+	log.Printf("body: %s", string(body))
+	ctx := context.Background()
+	auth, err := getWorkflowAppAuthDatastore(ctx, fileId)
+	if err != nil {
+		log.Printf("Authget error: %s", err)
+		resp.WriteHeader(401)
+		resp.Write([]byte(`{"success": false, "reason": ":("}`))
+		return
+	}
+
+	if auth.OrgId != user.ActiveOrg.Id {
+		resp.WriteHeader(401)
+		resp.Write([]byte(`{"success": false, "reason": "User can't edit this org"}`))
+		return
+	}
+
+	if config.Action == "assign_everywhere" {
+		q := datastore.NewQuery("workflow").Filter("org_id =", user.ActiveOrg.Id)
+		q = q.Order("-edited").Limit(35)
+
+		var workflows []Workflow
+		_, err = dbclient.GetAll(ctx, q, &workflows)
+		if err != nil {
+			log.Printf("Getall error in auth update: %s", err)
+			resp.WriteHeader(401)
+			resp.Write([]byte(`{"success": false, "reason": "Failed getting workflows to update"}`))
+			return
+		}
+
+		// FIXME: Add function to remove auth from other auth's
+		actionCnt := 0
+		workflowCnt := 0
+		for _, workflow := range workflows {
+			newActions := []Action{}
+			edited := false
+			for _, action := range workflow.Actions {
+				if action.AppName == auth.App.Name {
+					//log.Printf("FOUND ACTION TO UPDATE: %#v", action)
+					edited = true
+					actionCnt += 1
+				}
+
+				newActions = append(newActions, action)
+			}
+
+			workflow.Actions = newActions
+			if edited {
+				err = setWorkflow(ctx, workflow, workflow.ID)
+				if err != nil {
+					log.Printf("Failed setting (authupdate) workflow: %s", err)
+					continue
+				}
+
+				workflowCnt += 1
+			}
+		}
+
+		if actionCnt > 0 && workflowCnt > 0 {
+			auth.WorkflowCount = int64(workflowCnt)
+			auth.NodeCount = int64(actionCnt)
+
+			err = setWorkflowAppAuthDatastore(ctx, *auth, auth.Id)
+			if err != nil {
+				log.Printf("Failed setting appauth: %s", err)
+				resp.WriteHeader(401)
+				resp.Write([]byte(`{"success": false, "reason": "Failed setting app auth for all workflows"}`))
+				return
+			} else {
+				// FIXME: Remove ALL workflows from other auths using the same
+			}
+		}
+	}
+
+	resp.WriteHeader(200)
+	resp.Write([]byte(`{"success": true}`))
+	//var config configAuth
+
+	//log.Printf("Should set %s
+}
+
 func addAppAuthentication(resp http.ResponseWriter, request *http.Request) {
 	cors := handleCors(resp, request)
 	if cors {
@@ -4645,11 +4788,43 @@ func addAppAuthentication(resp http.ResponseWriter, request *http.Request) {
 		return
 	}
 
+	ctx := context.Background()
 	if len(appAuth.Id) == 0 {
 		appAuth.Id = uuid.NewV4().String()
+	} else {
+		auth, err := getWorkflowAppAuthDatastore(ctx, appAuth.Id)
+		if err == nil {
+			// OrgId         string                `json:"org_id" datastore:"org_id"`
+			if auth.OrgId != user.ActiveOrg.Id {
+				log.Printf("[WARNING] User isn't a part of the right org during auth edit")
+				resp.WriteHeader(409)
+				resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": ":("}`)))
+				return
+			}
+
+			if user.Role != "admin" {
+				log.Printf("[WARNING] User isn't admin during auth edit")
+				resp.WriteHeader(409)
+				resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": ":("}`)))
+				return
+			}
+
+			if !auth.Active {
+				log.Printf("[WARNING] Auth isn't active for edit")
+				resp.WriteHeader(409)
+				resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Can't update an inactive auth"}`)))
+				return
+			}
+
+			if auth.App.Name != appAuth.App.Name {
+				log.Printf("[WARNING] User tried to modify auth")
+				resp.WriteHeader(409)
+				resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Bad app configuration: need to specify correct name"}`)))
+				return
+			}
+		}
 	}
 
-	ctx := context.Background()
 	if len(appAuth.Label) == 0 {
 		resp.WriteHeader(409)
 		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Label can't be empty"}`)))
@@ -6434,6 +6609,18 @@ func getAllWorkflowAppAuth(ctx context.Context, OrgId string) ([]AppAuthenticati
 	return allworkflowapps, nil
 }
 
+func getWorkflowAppAuthDatastore(ctx context.Context, id string) (*AppAuthenticationStorage, error) {
+
+	key := datastore.NameKey("workflowappauth", id, nil)
+	appAuth := &AppAuthenticationStorage{}
+	// New struct, to not add body, author etc
+	if err := dbclient.Get(ctx, key, appAuth); err != nil {
+		return &AppAuthenticationStorage{}, err
+	}
+
+	return appAuth, nil
+}
+
 func setWorkflowAppAuthDatastore(ctx context.Context, workflowappauth AppAuthenticationStorage, id string) error {
 	timeNow := int64(time.Now().Unix())
 	if workflowappauth.Created == 0 {

frontend/src/components/OrgHeader.js

@@ -11,6 +11,7 @@ import { useAlert } from "react-alert";
 import IconButton from '@material-ui/core/IconButton';
 import ExpandLessIcon from '@material-ui/icons/ExpandLess';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import SaveIcon from '@material-ui/icons/Save';
 
 const useStyles = makeStyles({
 	notchedOutline: {
@@ -121,7 +122,7 @@ const OrgHeader = (props) => {
 				"workflow_download_branch": workflowDownloadBranch,
 			})}
 		>
-			Save Changes	
+			<SaveIcon />
 		</Button>
 
 	var imageData = file.length > 0 ? file : fileBase64 

frontend/src/views/Admin.jsx

@@ -31,6 +31,8 @@ import { useTheme } from '@material-ui/core/styles';
 import HandlePayment from './HandlePayment'
 import OrgHeader from '../components/OrgHeader'
 
+import EditIcon from '@material-ui/icons/Edit';
+import SelectAllIcon from '@material-ui/icons/SelectAll';
 import OpenInNewIcon from '@material-ui/icons/OpenInNew';
 import CloudDownloadIcon from '@material-ui/icons/CloudDownload';
 import DescriptionIcon from '@material-ui/icons/Description';
@@ -87,6 +89,7 @@ const Admin = (props) => {
 	const [selectedUserModalOpen, setSelectedUserModalOpen] = React.useState(false)
 	const [selectedAuthentication, setSelectedAuthentication] = React.useState({})
 	const [selectedAuthenticationModalOpen, setSelectedAuthenticationModalOpen] = React.useState(false)
+	const [authenticationFields, setAuthenticationFields] = React.useState([])
 	const [showArchived, setShowArchived] = React.useState(false)
 
 	const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io" 
@@ -276,9 +279,69 @@ const Admin = (props) => {
 		})
 	}
 
-	
+	const saveAuthentication = (authentication) => {
-	
+		const data = authentication
-	
+		const url = globalUrl + '/api/v1/apps/authentication';
+
+		fetch(url, {
+			mode: 'cors',
+			method: 'PUT',
+			body: JSON.stringify(data),
+			credentials: 'include',
+			crossDomain: true,
+			withCredentials: true,
+			headers: {
+				'Content-Type': 'application/json; charset=utf-8',
+			},
+		})
+		.then(response =>
+			response.json().then(responseJson => {
+				if (responseJson["success"] === false) {
+					alert.error("Failed changing authentication")
+				} else {
+					//alert.success("Successfully password!")
+					setSelectedUserModalOpen(false)
+				}
+			}),
+		)
+		.catch(error => {
+			alert.error("Err: " + error.toString())
+		});
+	}
+
+	const editAuthenticationConfig = (id) => {
+		const data = { 
+			"id": id, 
+			"action": "assign_everywhere",
+		}
+		const url = globalUrl + '/api/v1/apps/authentication/'+id+"/config";
+
+		fetch(url, {
+			mode: 'cors',
+			method: 'POST',
+			body: JSON.stringify(data),
+			credentials: 'include',
+			crossDomain: true,
+			withCredentials: true,
+			headers: {
+				'Content-Type': 'application/json; charset=utf-8',
+			},
+		})
+			.then(response =>
+				response.json().then(responseJson => {
+					if (responseJson["success"] === false) {
+						alert.error("Failed overwriting appauth in workflows")
+					} else {
+						alert.success("Successfully updated auth everywhere!")
+						setSelectedUserModalOpen(false)
+						getAppAuthentication() 
+					}
+				}),
+			)
+			.catch(error => {
+				alert.error("Err: " + error.toString())
+			});
+	}
 
 	const onPasswordChange = () => {
 		const data = { "username": selectedUser.username, "newpassword": newPassword }
@@ -300,7 +363,7 @@ const Admin = (props) => {
 					if (responseJson["success"] === false) {
 						alert.error("Failed setting new password")
 					} else {
-						alert.success("Successfully password!")
+						alert.success("Successfully updated password!")
 						setSelectedUserModalOpen(false)
 					}
 				}),
@@ -599,7 +662,7 @@ const Admin = (props) => {
 				return response.json()
 			})
 			.then((responseJson) => {
-				console.log(responseJson)
+				//console.log(responseJson)
 				setFiles(responseJson)
 			})
 			.catch(error => {
@@ -966,8 +1029,8 @@ const Admin = (props) => {
 			});
 	}
 
-	const editAuthenticationModal =
+	const editAuthenticationModal = selectedAuthenticationModalOpen ? 
-		<Dialog modal
+		<Dialog 
 			open={selectedAuthenticationModalOpen}
 			onClose={() => { setSelectedAuthenticationModalOpen(false) }}
 			PaperProps={{
@@ -979,56 +1042,71 @@ const Admin = (props) => {
 				},
 			}}
 		>
-			<DialogTitle><span style={{ color: "white" }}>Edit authentication</span></DialogTitle>
+			<DialogTitle><span style={{ color: "white" }}>Edit authentication for {selectedAuthentication.app.name} ({selectedAuthentication.label})</span></DialogTitle>
 			<DialogContent>
-				<div style={{ display: "flex" }}>
+				{selectedAuthentication.fields.map((data, index) => {
-					<TextField
+					return (
-						style={{ backgroundColor: theme.palette.inputColor, flex: 3 }}
+						<div key={index}>
-						InputProps={{
+							<Typography style={{marginBottom: 0, marginTop: 10}}>{data.key}</Typography>
-							style: {
+							<TextField
-								height: 50,
+								style={{ backgroundColor: theme.palette.inputColor, marginTop: 0, }}
-								color: "white",
+								InputProps={{
-							},
+									style: {
-						}}
+										height: 50,
-						color="primary"
+										color: "white",
-						required
+									},
-						fullWidth={true}
+								}}
-						placeholder="New password"
+								color="primary"
-						type="password"
+								required
-						id="standard-required"
+								fullWidth={true}
-						autoComplete="password"
+								placeholder={data.key}
-						margin="normal"
+								type="text"
-						variant="outlined"
+								id={`authentication-${index}`}
-						onChange={e => setNewPassword(e.target.value)}
+								margin="normal"
-					/>
+								variant="outlined"
-					<Button
+								onChange={e => {
-						style={{ maxHeight: 50, flex: 1 }}
+									authenticationFields[index].value = e.target.value
-						variant="outlined"
+									setAuthenticationFields(authenticationFields)
-						color="primary"
+								}}
-						onClick={() => onPasswordChange()}
+							/>
-					>
+						</div>
-						Submit
+					)
-					</Button>
+				})}
-				</div>
-				<Divider style={{ marginTop: 20, marginBottom: 20, backgroundColor: theme.palette.inputColor }} />
-				<Button
-					style={{}}
-					variant="outlined"
-					color="primary"
-					onClick={() => deleteUser(selectedUser)}
-				>
-					{selectedUser.active ? "Deactivate" : "Activate"}
-				</Button>
-				<Button
-					style={{}}
-					variant="outlined"
-					color="primary"
-					onClick={() => generateApikey(selectedUser.id)}
-				>
-					Get new API key
-				</Button>
 			</DialogContent>
+			<DialogActions>
+				<Button style={{ borderRadius: "0px" }} onClick={() => setSelectedAuthenticationModalOpen(false)} color="primary">
+					Cancel
+				</Button>
+				<Button variant="contained" style={{ borderRadius: "0px" }} onClick={() => {
+					var error = false
+					for (var key in authenticationFields) {
+						const item = authenticationFields[key]
+						if (item.value.length === 0) {
+							console.log("ITEM: ", item)
+							//var currentnode = cy.getElementById(data.id)
+							var textfield = document.getElementById(`authentication-${key}`)
+							if (textfield !== null && textfield !== undefined) {
+								console.log("HANDLE ERROR FOR KEY ", key)
+							}
+							error = true
+						}
+					}
+
+					if (error) {
+						alert.error("All fields must have a new value")
+					} else {
+						alert.success("Saving new version of this authentication")
+						selectedAuthentication.fields = authenticationFields
+						saveAuthentication(selectedAuthentication)
+						setSelectedAuthentication({})
+						setSelectedAuthenticationModalOpen(false)
+					}
+				}} color="primary">
+					Submit
+				</Button>
+			</DialogActions>
 		</Dialog>
+	 : null
 
 	const editUserModal =
 		<Dialog modal
@@ -1043,7 +1121,7 @@ const Admin = (props) => {
 				},
 			}}
 		>
-			<DialogTitle><span style={{ color: "white" }}>Edit user</span></DialogTitle>
+			<DialogTitle><span style={{ color: "white" }}><EditIcon /></span></DialogTitle>
 			<DialogContent>
 				<div style={{ display: "flex" }}>
 					<TextField
@@ -1936,6 +2014,20 @@ const Admin = (props) => {
 		</div>
 		: null
 
+	const updateAppAuthentication = (field) => {
+		setSelectedAuthenticationModalOpen(true)
+		setSelectedAuthentication(field)
+		//{selectedAuthentication.fields.map((data, index) => {
+		var newfields = []
+		for (var key in field.fields) {
+			newfields.push({
+				"key": field.fields[key].key,
+				"value": "",
+			})
+		}
+		setAuthenticationFields(newfields)
+	}
+
 	const authenticationView = curTab === 2 ?
 		<div>
 			<div style={{marginTop: 20, marginBottom: 20,}}>
@@ -1952,7 +2044,7 @@ const Admin = (props) => {
 					/>
 					<ListItemText
 						primary="Label"
-						style={{minWidth: 250, maxWidth: 250}}
+						style={{minWidth: 275, maxWidth: 275}}
 					/>
 					<ListItemText
 						primary="App Name"
@@ -1960,11 +2052,11 @@ const Admin = (props) => {
 					/>
 					<ListItemText
 						primary="Workflows"
-						style={{minWidth: 150, maxWidth: 150, overflow: "hidden"}}
+						style={{minWidth: 110, maxWidth: 110, overflow: "hidden"}}
 					/>
 					<ListItemText
-						primary="Action amount"
+						primary="Actions"
-						style={{minWidth: 150, maxWidth: 150, overflow: "hidden"}}
+						style={{minWidth: 110, maxWidth: 110, overflow: "hidden"}}
 					/>
 					<ListItemText
 						primary="Fields"
@@ -1988,7 +2080,7 @@ const Admin = (props) => {
 							/>
 							<ListItemText
 								primary={data.label}
-								style={{minWidth: 250, maxWidth: 250}}
+								style={{minWidth: 275, maxWidth: 275}}
 							/>
 							<ListItemText
 								primary={data.app.name}
@@ -1996,11 +2088,11 @@ const Admin = (props) => {
 							/>
 							<ListItemText
 								primary={data.usage === null ? 0 : data.usage.length}
-								style={{minWidth: 150, maxWidth: 150, overflow: "hidden"}}
+								style={{minWidth: 110, maxWidth: 110, overflow: "hidden"}}
 							/>
 							<ListItemText
 								primary={data.node_count}
-								style={{minWidth: 150, maxWidth: 150, overflow: "hidden"}}
+								style={{minWidth: 110, maxWidth: 110, overflow: "hidden"}}
 							/>
 							<ListItemText
 								primary={data.fields.map(data => {
@@ -2009,16 +2101,28 @@ const Admin = (props) => {
 								style={{minWidth: 200, maxWidth: 200, overflow: "hidden"}}
 							/>
 							<ListItemText>
-								<Button 
+								<IconButton
-									style={{}} 
+									onClick={() => {
-									variant="outlined"
+										updateAppAuthentication(data)
-									color="primary"
+									}}
+								>
+									<EditIcon color="primary"/>
+								</IconButton>
+								<IconButton 
+									style={{marginRight: 10}}
+									onClick={() => {
+										editAuthenticationConfig(data.id)
+									}}
+								>
+									<SelectAllIcon color="primary"/>
+								</IconButton>
+								<IconButton 
 									onClick={() => {
 										deleteAuthentication(data)
 									}}
 								>
-									Delete	
+									<DeleteIcon color="primary"/> 
-								</Button>
+								</IconButton>
 							</ListItemText>
 						</ListItem>
 					)