Skip to content

Commit 8990be2

Browse files
jmgasperjmgasper
committed
Revert "Hacks for v6 challenge API"
This reverts commit a2ec0d9.
1 parent fb2d638 commit 8990be2

File tree

15 files changed

+137
-160
lines changed

15 files changed

+137
-160
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ yarn-error.log*
2727
*.env
2828

2929
*.vscode
30-
*.pem
30+
3131
# e2e test case
3232
test-automation/temp
3333
test-automation/test-results

‎config/constants/development.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ module.exports = {
1212
ACCOUNTS_APP_LOGIN_URL: `https://accounts-auth0.${DOMAIN}`,
1313
COMMUNITY_APP_URL: `https://www.${DOMAIN}`,
1414
MEMBER_API_URL: `${DEV_API_HOSTNAME}/v5/members`,
15-
CHALLENGE_API_URL: `${DEV_API_HOSTNAME}/v6/challenges`,
15+
CHALLENGE_API_URL: `${DEV_API_HOSTNAME}/v5/challenges`,
1616
CHALLENGE_API_VERSION: '1.1.0',
17-
CHALLENGE_TIMELINE_TEMPLATES_URL: `${DEV_API_HOSTNAME}/v6/timeline-templates`,
18-
CHALLENGE_TYPES_URL: `${DEV_API_HOSTNAME}/v6/challenge-types`,
19-
CHALLENGE_TRACKS_URL: `${DEV_API_HOSTNAME}/v6/challenge-tracks`,
20-
CHALLENGE_PHASES_URL: `${DEV_API_HOSTNAME}/v6/challenge-phases`,
21-
CHALLENGE_TIMELINES_URL: `${DEV_API_HOSTNAME}/v6/challenge-timelines`,
17+
CHALLENGE_TIMELINE_TEMPLATES_URL: `${DEV_API_HOSTNAME}/v5/timeline-templates`,
18+
CHALLENGE_TYPES_URL: `${DEV_API_HOSTNAME}/v5/challenge-types`,
19+
CHALLENGE_TRACKS_URL: `${DEV_API_HOSTNAME}/v5/challenge-tracks`,
20+
CHALLENGE_PHASES_URL: `${DEV_API_HOSTNAME}/v5/challenge-phases`,
21+
CHALLENGE_TIMELINES_URL: `${DEV_API_HOSTNAME}/v5/challenge-timelines`,
2222
PROJECT_API_URL: `${DEV_API_HOSTNAME}/v5/projects`,
2323
GROUPS_API_URL: `${DEV_API_HOSTNAME}/v5/groups`,
2424
TERMS_API_URL: `${DEV_API_HOSTNAME}/v5/terms`,
25-
RESOURCES_API_URL: `${DEV_API_HOSTNAME}/v6/resources`,
26-
RESOURCE_ROLES_API_URL: `${DEV_API_HOSTNAME}/v6/resource-roles`,
25+
RESOURCES_API_URL: `${DEV_API_HOSTNAME}/v5/resources`,
26+
RESOURCE_ROLES_API_URL: `${DEV_API_HOSTNAME}/v5/resource-roles`,
2727
SUBMISSIONS_API_URL: `${DEV_API_HOSTNAME}/v5/submissions`,
2828
REVIEW_TYPE_API_URL: `${DEV_API_HOSTNAME}/v5/reviewTypes`,
2929
SUBMISSION_REVIEW_APP_URL: `https://submission-review.${DOMAIN}/challenges`,

‎local.topcoder-dev.com-key.pem‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDSaA4EMTt5Dgoc
3+
VnvkZx1g0LoRfFDjM+iKbL/rly9c71gnqIwdGZNo3t14XdAE+soGZwsiclmBIHXb
4+
6AfY9mOjSeCsWyqKuCGNp7kvP6/rQ/OAeWiVqa7y339Fl2JTEGnHd0aMps9hdSMR
5+
UINpkBkMKTTeVVoF1d2Ybv5G8bwMOg0xyOConwla2yZoCZWUffHH2er93t8n0r0I
6+
L3kYOyRNQUeEH01+bjwilVAEIih6lT78mKMp3Bj49RC1+IDr0OnLEp4onBwIhXGX
7+
UCpxGvacxRXFGIx/1JvReHnKMCJw+YVthYv4PfPbsqf04zYjdRv1WH8SPy0QbN7U
8+
J6Xs2K1HAgMBAAECggEAWWSkL9vK7M+uNAP6dzvoG24S38L1itJPBiDWGX4OPWnj
9+
BlZx0RtAqdmmNrGE49i5ZKb68BOtO1NTP68BRojIJGQK9K93D6DTgJ+16gEg+M/R
10+
8M+kQ5HoJoAWTrbWq3vZtUlTzAZDLaDa2UxfyMXUHnqTX7LboIcQsubVWcbyoi5y
11+
myReflYeootcbw1uuSrIAIUubDnJHhTTl+A/Sh65orNgJhhCkwNAxnYlm1bjPHUr
12+
NKkqjD9kRfS3/VOYOSmdB3sfQ7onTILhmqtvvtAQbdVuOPDjEtSdlU+QlR0rCB2U
13+
VrxsWk20EANVM8uam4x54cZfsAmV9wOMXhlCK80LQQKBgQDlX43y/P/5PbmRPm+u
14+
9iStmQJPfLEdY6rstov+LXaw0tXkBlLIsr/CCvidyhqQjo7MbCNDRU39SlaMyuK8
15+
QyQfgkpuFojfffKFXFg9aX8d1+AjT9x6rbYF6Mya7QjQT86W4Wb01RUMvgBS/yzu
16+
WnwU/nUWqjHP8OfWo6H/B+Ts3wKBgQDq1NnJfpCQa5fwMtCbkilyRSeRoreCN8yX
17+
0vIULdQxj9nNPyDXN9LsmRMdhr2TZ42ahflMbNSRGLW0CiozmylCBJjnqyl1VhL1
18+
X5aOh9l9qB4+fVVoir1O8xr0VcOLmWJGqRece0sxf6ye0I9+/n2hJZeGW2OyN9Cc
19+
70QTx4BkmQKBgQCnlRrW73XtmeVccuuSPxApLWN8w7N7r3gQHodFm93d7wyK3vvY
20+
2pAzq2RdlG24NA+s100kNxx19LwrfYgO2FcqFj1fFWPHNfPc780ggVV4bmK6Kf0C
21+
PKyCwMXMY2ZPHB/qKKDaPFx2xNLj0L/5HW8Ov6K4fnyKWo5oSYFwHUpqrQKBgQCy
22+
i/WvGxkFhZj3W1t6/Y2fwW7Nb1+BlbVsNkozB4lPyaT7RiVNHbe0hsqe54SaX+Ct
23+
fXHIJvMUAyqcYiImLLIY7O/pLR2PhktR30TUx/uYa8vbDWZz3xECxxpWbiMIsC2l
24+
tgkqxB+u2flAoyiHkS2p6bAkyrWpmoB14gHr3AMF+QKBgA+1sH680K56YB9P0FBI
25+
EDZW51oJmA4r8w8IZvsAtkZHVof9/3RYWfO/E5ePfSl+yRpeNB4bo/99+Xy1vNId
26+
B8PJPCenfEtgj2QBvOD6kA8hoppv4HibAzVyc8LlK8eM5L6A47pSRuBq7EiZRcLc
27+
p1bK9xhVfFP3PcqEPlpO0IGR
28+
-----END PRIVATE KEY-----

‎local.topcoder-dev.com.pem‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIEbzCCAtegAwIBAgIRANBdmrQ+KH/NSLEuY4nIXlswDQYJKoZIhvcNAQELBQAw
3+
gZcxHjAcBgNVBAoTFW1rY2VydCBkZXZlbG9wbWVudCBDQTE2MDQGA1UECwwtam1n
4+
YXNwZXJAam1nYXNwZXItd29ya3N0YXRpb24gKEp1c3RpbiBHYXNwZXIpMT0wOwYD
5+
VQQDDDRta2NlcnQgam1nYXNwZXJAam1nYXNwZXItd29ya3N0YXRpb24gKEp1c3Rp
6+
biBHYXNwZXIpMB4XDTI1MDYyMDAxNTEyM1oXDTI3MDkyMDAxNTEyM1owYTEnMCUG
7+
A1UEChMebWtjZXJ0IGRldmVsb3BtZW50IGNlcnRpZmljYXRlMTYwNAYDVQQLDC1q
8+
bWdhc3BlckBqbWdhc3Blci13b3Jrc3RhdGlvbiAoSnVzdGluIEdhc3BlcikwggEi
9+
MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSaA4EMTt5DgocVnvkZx1g0LoR
10+
fFDjM+iKbL/rly9c71gnqIwdGZNo3t14XdAE+soGZwsiclmBIHXb6AfY9mOjSeCs
11+
WyqKuCGNp7kvP6/rQ/OAeWiVqa7y339Fl2JTEGnHd0aMps9hdSMRUINpkBkMKTTe
12+
VVoF1d2Ybv5G8bwMOg0xyOConwla2yZoCZWUffHH2er93t8n0r0IL3kYOyRNQUeE
13+
H01+bjwilVAEIih6lT78mKMp3Bj49RC1+IDr0OnLEp4onBwIhXGXUCpxGvacxRXF
14+
GIx/1JvReHnKMCJw+YVthYv4PfPbsqf04zYjdRv1WH8SPy0QbN7UJ6Xs2K1HAgMB
15+
AAGjazBpMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAfBgNV
16+
HSMEGDAWgBRxIB1YaQdvuHWwlakpJZq5033a2TAhBgNVHREEGjAYghZsb2NhbC50
17+
b3Bjb2Rlci1kZXYuY29tMA0GCSqGSIb3DQEBCwUAA4IBgQCSmrglluhmi34XlHQv
18+
RlNNUz0upkklYJdjIOKAuuodlqgm3rL7XaDj1g9U9iAkPQGpXHMDfn8cS7SEjyyL
19+
wsD+aK+qZbTwtcAcqeHGj2gYze90TY5ZzSHUYoaq4MAaDSZp3bOTc9g9l5cdT8tM
20+
OEeeJkDMBDCMm+a7DmuIJW+1JW83vBqKqSfOmWqRvFVcEmQYVMiEmuEor5mXTjrt
21+
nrWm/bDq0h1ezRU3ZPNbKniynlUYExOGPAuE6zBNOmJmKQXo7SEd8s5XAKGa+vvh
22+
ieTPCvWQmcxmTQm4D5yozjPT0nnzCzar8cqo7FTLHjDSQPEIgB6AwturhqAF6CSa
23+
D3QA5S/wvJES5cWdnWf2+adWXDXg+kM0cWWwhVoW70SDKHF//pevMuXFIE2Ejm+g
24+
vym1GSxOMgkdKYkRya1hvO2AovcOWY9bgtf3yphBIbnAnk2YXXtFxEiAsqu6bObi
25+
v9pXKgWJRCB3AifgJBH9EnJljgvndEj+To0eq07PYQVcsos=
26+
-----END CERTIFICATE-----

‎localhost-key.pem‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDGvwkNFXuhP0A6
3+
Nt3SZ3D6FQrmxxKYK7mFbHzmqCRNnBj054NUBswEc82y+3oCorgzw9jCqCt5bQSR
4+
GuvBEJPS9/rc3R3Mdr+ImDzo4FJiE6yPFx9rnbQPHIpMRWY21fvWqPcnkJM/FKoN
5+
xoLxS2tQyF9dlSPpixhmoZQoDSC30Ijd7tGOTOAuoBUc80hl02NpRT/eBIcbN9A9
6+
8C3DAkJUCNrxwB3lhvz2LqiYBalDJo2PUsTjAMEaLfkj9SGmR9M9Ua7YcSIhimyu
7+
mY/Q3GLCxHnPE3stVyjbwiZQIKYxI5nZgiyErJkVfVubx1vnguJcBvs/rfyH3DZ8
8+
3oklx7inAgMBAAECggEAdbHHkGH6doDYbiDzt5feRZqUfBnDny21jZezV3yXEwav
9+
mMhI80ebJb/WPnnBxTHLV4xRHuUr6Zpvq+Z/WjOQ9sw3WPfwn5Zq0l8lIttEriPs
10+
ekg9KSOY76H9HDG02CBcJMCmrF1ndWGtWr8F6BK7mHkwUGDzhWgDqTNiY11y1Ka0
11+
XlpR0IPr1tHg2iUoIOxLMIjUcAtbnn5OmClaIegHZyYBnxztubgiDNLPDdhEbmCk
12+
6R7POweD+SUoOOutcHwJqvZe0dSOJaDVVScPe7GPGl8cVpXaeGJYUGZF16QRd5xH
13+
Tbvj5pREgqYe3DowL0jzJ6c87J0BXpO/KzSaSXynYQKBgQDgrdHD/ozxO7f3VK79
14+
HcctuVKWiv5ksbxksYQU7dVacr1uN6u2yfSLhVKoLpLwcBhCL0LHBJ6cpwwO4jym
15+
ab0Fr06qxhWSqOlwI3EXFR54oDOmRxItkEegW1nIxTyP2j9hPJ7VSqbMs4oE0N12
16+
yieaQgTvPyuwIMWz1+OQ4t4diQKBgQDic78smRC8JyaZGvvJUmNHgT8UOvm1lpnS
17+
U/jVGCBMX2EHZrnbdgimNFb+8XeP0WZRv67yDJ46PUX5ahO7O2yeGETIJnDTrNM0
18+
M+aEqubA1HA/1+/h1FTvKRiTYbEDCnt65EqCIB/s7CM3v5nM/TZTnVmFut3J04kx
19+
tyydzMtIrwKBgET2lXBnbbON9QXBxISE42IxhBwZRcR6maz+n+AcsGQ229Y82EQe
20+
8STyI1DkGs4aWhfWkdSsolLLI3ReFOevhQl9qdPZQT3nAuAcwNWo8dVstu3O2tGJ
21+
e7LI12I8yD4Pa2zZQpeNdm1WnoKj6ZZQrp82rHUTGsHRDV4KYhtSx4KhAoGBAJrf
22+
GE8S++wCRpaNasfcDcP4c8CNOPxk3ByJi3OJhYVV8dETA2dBSVcKErlXQTLdvkGI
23+
e8hUst4Xy8RxNL9nO7i/1kKgb6eE2gkoua3gB+K3J3GyZ/+lrNTH4WPieyIeSCba
24+
/M4T1GG/ebKF2lTklAQJaBFapJaEkp6qrNvbFOhHAoGAMhssYAAweMeUpLSIQgN3
25+
Ndr/dTYLK3XrynJN+5cRW29mwy1DhJgN5VSl3d4m/g02H5KppOMQ0qdiuJc2w/ua
26+
9RbUERNkZRLT4XtJPZd2kdNeiMtWaqyY6rNyrdc/yIJzl7vwZ2rxTekw0bWKnqjK
27+
4qjSsqK57kqy+gtIrG4hH6s=
28+
-----END PRIVATE KEY-----

‎localhost.pem‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIEYTCCAsmgAwIBAgIQCIX2MHOIoWm0a+ATrRb6oDANBgkqhkiG9w0BAQsFADCB
3+
lzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMTYwNAYDVQQLDC1qbWdh
4+
c3BlckBqbWdhc3Blci13b3Jrc3RhdGlvbiAoSnVzdGluIEdhc3BlcikxPTA7BgNV
5+
BAMMNG1rY2VydCBqbWdhc3BlckBqbWdhc3Blci13b3Jrc3RhdGlvbiAoSnVzdGlu
6+
IEdhc3BlcikwHhcNMjUwNjIwMDE1MDU1WhcNMjcwOTIwMDE1MDU1WjBhMScwJQYD
7+
VQQKEx5ta2NlcnQgZGV2ZWxvcG1lbnQgY2VydGlmaWNhdGUxNjA0BgNVBAsMLWpt
8+
Z2FzcGVyQGptZ2FzcGVyLXdvcmtzdGF0aW9uIChKdXN0aW4gR2FzcGVyKTCCASIw
9+
DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMa/CQ0Ve6E/QDo23dJncPoVCubH
10+
EpgruYVsfOaoJE2cGPTng1QGzARzzbL7egKiuDPD2MKoK3ltBJEa68EQk9L3+tzd
11+
Hcx2v4iYPOjgUmITrI8XH2udtA8cikxFZjbV+9ao9yeQkz8Uqg3GgvFLa1DIX12V
12+
I+mLGGahlCgNILfQiN3u0Y5M4C6gFRzzSGXTY2lFP94Ehxs30D3wLcMCQlQI2vHA
13+
HeWG/PYuqJgFqUMmjY9SxOMAwRot+SP1IaZH0z1RrthxIiGKbK6Zj9DcYsLEec8T
14+
ey1XKNvCJlAgpjEjmdmCLISsmRV9W5vHW+eC4lwG+z+t/IfcNnzeiSXHuKcCAwEA
15+
AaNeMFwwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB8GA1Ud
16+
IwQYMBaAFHEgHVhpB2+4dbCVqSklmrnTfdrZMBQGA1UdEQQNMAuCCWxvY2FsaG9z
17+
dDANBgkqhkiG9w0BAQsFAAOCAYEAp6SCoXbaCDD+c00td5jN31HuRnxUe6Yfz7s7
18+
OWh9FlN9KAQi+KnaDe7mBBmz8mbO84Q7eLG12IHYq0/kWHObLdBuRoBZAi13vNOD
19+
J+9NBiQdiwkkA9FYTjMxJpMz41qYspxt1NKlCDZ3GA1l5eQcT45YEXLQd8xzUpKk
20+
GJrIlkPn2mvZaYA/01Nd7QgYTilrlshHkmG80F1Cof7Js5I56s82/RFwY5syxvwW
21+
1g4rgakG2o5VsUm3arAB9aWLuA/fbwbewGcQ46SLKAD9mDRgL8sZYwacdZmeAGhz
22+
m1enUx0xn7U6DoOo7/Vltqm7j5mHKwv0ExnZkeyYr39b7Kl4R6HLiYP0TAHd44Q5
23+
CZwuLphRmq/ZShXQ6vbg2pif5IjYLNd+eTZm3JgZk1rn7vZPApiiB21jf0it3Bwa
24+
XnlqlNw8rcKliQeCXO6OxdE9EttM9QzbbKNQM/ounr+g3h+/hHtARUPwo0OUhbzc
25+
ye8dz2blamHZgpr9BIeVkdRoBVj0
26+
-----END CERTIFICATE-----

‎package-lock.json‎

Lines changed: 0 additions & 129 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@
129129
"build": "node scripts/build.js",
130130
"lint": "eslint ./src",
131131
"lint:fix": "eslint --fix ./src",
132-
"test": "node scripts/test.js",
133-
"restart": "node scripts/build.js && node server.js"
132+
"test": "node scripts/test.js"
134133
},
135134
"eslintConfig": {
136135
"extends": [

‎server.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ function check () {
1717
}
1818
app.use(healthCheck.middleware([check]))
1919
app.use((req, res, next) => {
20-
//res.header('Referrer-Policy', 'strict-origin-when-cross-origin')
20+
res.header('Referrer-Policy', 'strict-origin-when-cross-origin')
2121
res.header('Permissions-Policy', 'geolocation=(), microphone=(), camera=()')
2222
res.header('X-Content-Type-Options', 'nosniff')
23-
// res.header('Strict-Transport-Security', 'max-age=31536000; includeSubDomains; preload')
23+
res.header('Strict-Transport-Security', 'max-age=31536000; includeSubDomains; preload')
2424
res.header('Cache-control', 'public, max-age=0')
2525
res.header('Pragma', 'no-cache')
2626
res.setHeader('X-Frame-Options', 'DENY')

‎src/components/ChallengeEditor/ChallengeViewTabs/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ const ChallengeViewTabs = ({
210210
(<div className={styles['cancel-button']}><CancelDropDown challenge={challenge} onSelectMenu={cancelChallenge} /></div>)}
211211
{canLaunch && (
212212
<div className={styles.button}>
213-
{challenge ? (
213+
{challenge.legacyId || isTask ? (
214214
<PrimaryButton
215215
text='Launch'
216216
type='info'

0 commit comments

Comments
 (0)