marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lots of fixes towards making Oauth2 smooth

Browse Source
This commit is contained in:
frikky
2021-08-27 16:02:59 +02:00
parent faa555e26f
commit f213451f9b
6 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/go.mod
+2 -2
View File
@@ -2,7 +2,7 @@ module shuffle
go 1.13
replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
//replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
//replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
@@ -22,7 +22,7 @@ require (
github.com/docker/go-units v0.4.0 // indirect
github.com/elastic/go-elasticsearch/v7 v7.13.1 // indirect
github.com/frikky/kin-openapi v0.40.0
github.com/frikky/shuffle-shared v0.0.84
github.com/frikky/shuffle-shared v0.0.87
github.com/fsouza/go-dockerclient v1.7.2
github.com/ghodss/yaml v1.0.0
github.com/go-git/go-billy/v5 v5.0.0
frontend/src/components/AlertTemplate.js
+1 -1
View File
@@ -15,7 +15,7 @@ const alertStyle = {
justifyContent: 'space-between',
alignItems: 'center',
boxShadow: '0px 2px 2px 2px rgba(0, 0, 0, 0.03)',
width: 400,
width: 300,
boxSizing: 'border-box',
zIndex: 100001,
overflow: "hidden",
frontend/src/components/Oauth2Auth.jsx
+20 -15
View File
@@ -57,27 +57,32 @@ const AuthenticationOauth2 = (props) => {
try {
var newwin = window.open(url, "", "width=400,height=200")
console.log(newwin)
setTimeout(() => {
console.log(newwin)
console.log("CLOSED", newwin.closed)
}, 1000)
//console.log(newwin)
var open = true
const timer = setInterval(() => {
if (newwin.closed) {
clearInterval(timer);
//alert('"Secure Payment" window closed!');
setTimeout(() => {
console.log(newwin)
console.log("CLOSED", newwin.closed)
if (newwin.closed) {
getAppAuthentication(true, true)
setTimeout(() => {
console.log("APPAUTH: ", appAuthentication)
//{selectedAction.authentication.map(data => {
setAuthenticationModalOpen(false)
saveWorkflow(workflow)
}, 1500)
}
}, 10000)
}
}, 1000);
//do {
// setTimeout(() => {
// console.log(newwin)
// console.log("CLOSED", newwin.closed)
// if (newwin.closed) {
// open = false
// }
// }, 1000)
//}
//while(open === true)
} catch (e) {
alert.error("Failed authentication - probably bad credentials. Try again")
setButtonClicked(false)
frontend/src/components/ParsedAction.jsx
+1 -1
View File
@@ -1397,7 +1397,7 @@ const ParsedAction = (props) => {
<Tooltip color="primary" title={"Add authentication option"} placement="top">
<span>
<Button color="primary" style={{}} fullWidth variant="contained" onClick={() => {
console.log(authenticationType)
//console.log(authenticationType)
setAuthenticationModalOpen(true)
}}>
frontend/src/views/Admin.jsx
+2 -2
View File
@@ -156,7 +156,7 @@ const Admin = (props) => {
setTimeout(() => {
getAppAuthentication()
}, 1000)
alert.success("Successfully deleted authentication!")
//alert.success("Successfully deleted authentication!")
}
}),
)
@@ -188,7 +188,7 @@ const Admin = (props) => {
setTimeout(() => {
getSchedules()
}, 1500)
alert.success("Successfully stopped schedule!")
//alert.success("Successfully stopped schedule!")
}
}),
)
frontend/src/views/AngularWorkflow.jsx
+28 -9
View File
@@ -1204,6 +1204,18 @@ const AngularWorkflow = (props) => {
if (item.edited > latest) {
latest = item.edited
selectedAction.selectedAuthentication = item
for (var key in workflow.actions) {
console.log(workflow.actions[key].app_name)
if (workflow.actions[key].app_name == selectedApp.name) {
console.log("Setting auth at: ", workflow.actions[key], item.id)
workflow.actions[key].selectedAuthentication = item
workflow.actions[key].authentication_id = item.id
//if (workflow.actions[key].selectedAuthentication === undefined || workflow.actions[key].selectedAuthentication === null || workflow.actions[key].selectedAuthentication.length === 0) {
// console.log("Setting inner auth: ", workflow.actions[key])
//}
}
}
}
}
}
@@ -1221,8 +1233,11 @@ const AngularWorkflow = (props) => {
}
setSelectedAction(selectedAction)
setWorkflow(workflow)
saveWorkflow(workflow)
//for (var key in
alert.info("Updated authentication for app?")
alert.info("Added and updated authentication!")
} else {
alert.info("No authentication to update")
}
@@ -2006,8 +2021,8 @@ const AngularWorkflow = (props) => {
setSelectedAction(curaction)
//return
} else {
console.log("AUTHENTICATION: ", curapp.authentication)
console.log(curapp.authentication)
//console.log("AUTHENTICATION: ", curapp.authentication)
//console.log(curapp.authentication)
setAuthenticationType(curapp.authentication.type === "oauth2" && curapp.authentication.redirect_uri !== undefined && curapp.authentication.redirect_uri !== null ?
{
"type": "oauth2",
@@ -2022,7 +2037,7 @@ const AngularWorkflow = (props) => {
)
const requiresAuth = curapp.authentication.required //&& ((curapp.authentication.parameters !== undefined && curapp.authentication.parameters !== null) || (curapp.authentication.type === "oauth2" && curapp.authentication.redirect_uri !== undefined && curapp.authentication.redirect_uri !== null))
console.log("AUTHCHECK: ", requiresAuth)
//console.log("AUTHCHECK: ", requiresAuth)
setRequiresAuthentication(requiresAuth)
if (curapp.authentication.required) {
//console.log("App requires auth.")
@@ -2541,7 +2556,7 @@ const AngularWorkflow = (props) => {
const node = event.target
const nodedata = event.target.data()
if (nodedata.finished === false || (nodedata.id !== undefined && nodedata.is_valid === undefined)) {
console.log("RETURNING (NOT ADDING) NODE ADD FOR: ", nodedata)
//console.log("RETURNING (NOT ADDING) NODE ADD FOR: ", nodedata)
return
}
@@ -7721,16 +7736,20 @@ const AngularWorkflow = (props) => {
copy = copy.src
}
console.log("NEW: ", copy)
console.log("NAVIGATOR: ", navigator)
const clipboard = navigator.clipboard
if (clipboard === undefined) {
alert.error("Can only copy over HTTPS (port 3443)")
return
}
navigator.clipboard.writeText(JSON.stringify(copy))
var stringified = JSON.stringify(copy)
if (stringified.startsWith("\"") && stringified.endsWith("\"")) {
stringified = stringified.substring(1, stringified.length-1)
}
console.log("NEW: ", stringified)
navigator.clipboard.writeText(stringified)
copyText.select()
copyText.setSelectionRange(0, 99999) /* For mobile devices */