Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cab75d57
Commit
cab75d57
authored
Nov 05, 2020
by
Paul Gascou-Vaillancourt
Committed by
Simon Knox
Nov 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Realign DAST site validation frontend with backend
parent
e8ee5540
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_profile_form.vue
..._site_profiles_form/components/dast_site_profile_form.vue
+3
-5
ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/graphql/dast_site_token_create.mutation.graphql
...iles_form/graphql/dast_site_token_create.mutation.graphql
+2
-2
ee/spec/frontend/security_configuration/dast_site_profiles_form/components/dast_site_profile_form_spec.js
...e_profiles_form/components/dast_site_profile_form_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/components/dast_site_profile_form.vue
View file @
cab75d57
...
...
@@ -219,9 +219,7 @@ export default {
try
{
const
{
data
:
{
project
:
{
dastSiteValidation
:
{
status
},
},
project
:
{
dastSiteValidation
},
},
}
=
await
this
.
$apollo
.
query
({
query
:
dastSiteValidationQuery
,
...
...
@@ -231,7 +229,7 @@ export default {
},
fetchPolicy
:
fetchPolicies
.
NETWORK_ONLY
,
});
this
.
validationStatus
=
status
;
this
.
validationStatus
=
dastSiteValidation
?.
status
||
null
;
if
(
this
.
validationStatusMatches
(
INPROGRESS
))
{
await
new
Promise
(
resolve
=>
{
...
...
@@ -259,7 +257,7 @@ export default {
}
=
await
this
.
$apollo
.
mutate
({
mutation
:
dastSiteTokenCreateMutation
,
variables
:
{
projectF
ullPath
:
this
.
fullPath
,
f
ullPath
:
this
.
fullPath
,
targetUrl
:
this
.
form
.
fields
.
targetUrl
.
value
,
},
});
...
...
ee/app/assets/javascripts/security_configuration/dast_site_profiles_form/graphql/dast_site_token_create.mutation.graphql
View file @
cab75d57
mutation
dastSiteTokenCreate
(
$
projectF
ullPath
:
ID
!,
$targetUrl
:
String
!)
{
dastSiteTokenCreate
(
input
:
{
projectFullPath
:
$projectF
ullPath
,
targetUrl
:
$targetUrl
})
{
mutation
dastSiteTokenCreate
(
$
f
ullPath
:
ID
!,
$targetUrl
:
String
!)
{
dastSiteTokenCreate
(
input
:
{
fullPath
:
$f
ullPath
,
targetUrl
:
$targetUrl
})
{
id
token
errors
...
...
ee/spec/frontend/security_configuration/dast_site_profiles_form/components/dast_site_profile_form_spec.js
View file @
cab75d57
...
...
@@ -237,7 +237,7 @@ describe('DastSiteProfileForm', () => {
await
waitForPromises
();
expect
(
requestHandlers
.
dastSiteTokenCreate
).
toHaveBeenCalledWith
({
projectFullPath
:
fullPath
,
fullPath
,
targetUrl
,
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment