Skip to content

Commit 4191f94

Browse files
mgyarmathymgyarmathy
committed
fix merge conflict resolution
1 parent 7ea9405 commit 4191f94

5 files changed

+52
-108
lines changed

‎test/e2e/recordings/should-deploy-while-deleting-resources-if-AUTH0_ALLOW_DELETE-is-true.json‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2467,7 +2467,6 @@
24672467
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
24682468
"method": "PUT",
24692469
"path": "/api/v2/guardian/factors/recovery-code",
2470-
"path": "/api/v2/guardian/factors/recovery-code",
24712470
"body": {
24722471
"enabled": false
24732472
},
@@ -2482,15 +2481,12 @@
24822481
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
24832482
"method": "PUT",
24842483
"path": "/api/v2/guardian/factors/webauthn-roaming",
2485-
"path": "/api/v2/guardian/factors/webauthn-roaming",
24862484
"body": {
24872485
"enabled": false
2488-
"enabled": false
24892486
},
24902487
"status": 200,
24912488
"response": {
24922489
"enabled": false
2493-
"enabled": false
24942490
},
24952491
"rawHeaders": [],
24962492
"responseIsBinary": false
@@ -2499,7 +2495,6 @@
24992495
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
25002496
"method": "PUT",
25012497
"path": "/api/v2/guardian/factors/sms",
2502-
"path": "/api/v2/guardian/factors/sms",
25032498
"body": {
25042499
"enabled": false
25052500
},
@@ -4165,7 +4160,6 @@
41654160
"clients": [
41664161
{
41674162
"client_id": "Vp0gMRF8PtMzekil38qWoj4Fjw2VjRZE"
4168-
"client_id": "Vp0gMRF8PtMzekil38qWoj4Fjw2VjRZE"
41694163
}
41704164
]
41714165
},
@@ -11392,7 +11386,6 @@
1139211386
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1139311387
"method": "PUT",
1139411388
"path": "/api/v2/guardian/factors/duo",
11395-
"path": "/api/v2/guardian/factors/duo",
1139611389
"body": {
1139711390
"enabled": false
1139811391
},
@@ -16735,7 +16728,6 @@
1673516728
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1673616729
"method": "GET",
1673716730
"path": "/api/v2/prompts/login-id/custom-text/en",
16738-
"path": "/api/v2/prompts/login-id/custom-text/en",
1673916731
"body": "",
1674016732
"status": 200,
1674116733
"response": {},
@@ -16746,7 +16738,6 @@
1674616738
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1674716739
"method": "GET",
1674816740
"path": "/api/v2/prompts/login/custom-text/en",
16749-
"path": "/api/v2/prompts/login/custom-text/en",
1675016741
"body": "",
1675116742
"status": 200,
1675216743
"response": {},
@@ -16767,7 +16758,6 @@
1676716758
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1676816759
"method": "GET",
1676916760
"path": "/api/v2/prompts/login-passwordless/custom-text/en",
16770-
"path": "/api/v2/prompts/login-passwordless/custom-text/en",
1677116761
"body": "",
1677216762
"status": 200,
1677316763
"response": {},
@@ -16778,7 +16768,6 @@
1677816768
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1677916769
"method": "GET",
1678016770
"path": "/api/v2/prompts/login-email-verification/custom-text/en",
16781-
"path": "/api/v2/prompts/login-email-verification/custom-text/en",
1678216771
"body": "",
1678316772
"status": 200,
1678416773
"response": {},
@@ -16999,7 +16988,6 @@
1699916988
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1700016989
"method": "GET",
1700116990
"path": "/api/v2/prompts/device-flow/custom-text/en",
17002-
"path": "/api/v2/prompts/device-flow/custom-text/en",
1700316991
"body": "",
1700416992
"status": 200,
1700516993
"response": {},
@@ -17010,7 +16998,6 @@
1701016998
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1701116999
"method": "GET",
1701217000
"path": "/api/v2/prompts/email-verification/custom-text/en",
17013-
"path": "/api/v2/prompts/email-verification/custom-text/en",
1701417001
"body": "",
1701517002
"status": 200,
1701617003
"response": {},
@@ -17051,7 +17038,6 @@
1705117038
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1705217039
"method": "GET",
1705317040
"path": "/api/v2/prompts/common/custom-text/en",
17054-
"path": "/api/v2/prompts/common/custom-text/en",
1705517041
"body": "",
1705617042
"status": 200,
1705717043
"response": {},
@@ -17062,7 +17048,6 @@
1706217048
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1706317049
"method": "GET",
1706417050
"path": "/api/v2/prompts/captcha/custom-text/en",
17065-
"path": "/api/v2/prompts/captcha/custom-text/en",
1706617051
"body": "",
1706717052
"status": 200,
1706817053
"response": {},
@@ -17103,7 +17088,6 @@
1710317088
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1710417089
"method": "GET",
1710517090
"path": "/api/v2/prompts/login-id/partials",
17106-
"path": "/api/v2/prompts/login-id/partials",
1710717091
"body": "",
1710817092
"status": 200,
1710917093
"response": {},
@@ -17840,16 +17824,13 @@
1784017824
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1784117825
"method": "GET",
1784217826
"path": "/api/v2/flows?page=0&per_page=100&include_totals=true",
17843-
"path": "/api/v2/flows?page=0&per_page=100&include_totals=true",
1784417827
"body": "",
1784517828
"status": 200,
1784617829
"response": {
1784717830
"limit": 100,
1784817831
"start": 0,
1784917832
"total": 0,
1785017833
"flows": []
17851-
"total": 0,
17852-
"flows": []
1785317834
},
1785417835
"rawHeaders": [],
1785517836
"responseIsBinary": false
@@ -17858,7 +17839,7 @@
1785817839
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1785917840
"method": "GET",
1786017841
"path": "/api/v2/forms?page=0&per_page=100&include_totals=true",
17861-
"path": "/api/v2/forms?page=0&per_page=100&include_totals=true",
17842+
1786217843
"body": "",
1786317844
"status": 200,
1786417845
"response": {
@@ -17951,15 +17932,14 @@
1795117932
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1795217933
"method": "GET",
1795317934
"path": "/api/v2/flows/vault/connections?page=0&per_page=100&include_totals=true",
17954-
"path": "/api/v2/flows/vault/connections?page=0&per_page=100&include_totals=true",
17935+
1795517936
"body": "",
1795617937
"status": 200,
1795717938
"response": {
1795817939
"limit": 100,
1795917940
"start": 0,
1796017941
"total": 0,
1796117942
"connections": []
17962-
"connections": []
1796317943
},
1796417944
"rawHeaders": [],
1796517945
"responseIsBinary": false
@@ -17968,15 +17948,14 @@
1796817948
"scope": "https://deploy-cli-dev.eu.auth0.com:443",
1796917949
"method": "GET",
1797017950
"path": "/api/v2/flows?page=0&per_page=100&include_totals=true",
17971-
"path": "/api/v2/flows?page=0&per_page=100&include_totals=true",
17951+
1797217952
"body": "",
1797317953
"status": 200,
1797417954
"response": {
1797517955
"limit": 100,
1797617956
"start": 0,
1797717957
"total": 0,
1797817958
"flows": []
17979-
"flows": []
1798017959
},
1798117960
"rawHeaders": [],
1798217961
"responseIsBinary": false
@@ -18219,4 +18198,4 @@
1821918198
"rawHeaders": [],
1822018199
"responseIsBinary": false
1822118200
}
18222-
]
18201+
]

0 commit comments

Comments
 (0)