Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Commit 55c6a8b

Browse files
author
James Cori
committed
Merge branch 'develop'
2 parents 5c973e2 + 102033e commit 55c6a8b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1350
-620
lines changed

.circleci/config.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,12 @@ workflows:
6666
context : org-global
6767
filters:
6868
branches:
69-
only:
70-
- develop
69+
only: [develop, "feature/Auth0-RS256-Token"]
7170

7271
# Production builds are exectuted only on tagged commits to the
7372
# master branch.
7473
- "build-prod":
7574
context : org-global
7675
filters:
7776
branches:
78-
only: master
77+
only: master

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,10 @@ Note: heroku domain should match subdomain of topcoder-dev or topcoder depending
8787
- click get link button to get the shareable link which can be used by topcoder member to self assign to the repository. Click to icon next to url to copy to clipboard.
8888
- normal member cannot use the application, allowed roles are configured in API, if normal user tries to access the app, error is shown in login page.
8989

90+
## Topcoder Direct ID to Connect ID migration
91+
92+
Direct ID migration can be done with script located in **topcoder-x-processor** codebase called direct-connect-migration
93+
```shell
94+
npm run direct-connect-migration
95+
```
96+
By default it takes 15 projects at time, but you can change this by specifying BATCH_SIZE environment variable.

TopcoderXDeploy.md

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ You can do this by clicking your logged in username in the upper right of the To
157157

158158
Once you have registered your account, go into `Project Management` and add a new project for either a Gitlab or Github project you have access to. Gitlab is likely easier for testing - you can create a free test project under your own account.
159159

160-
Use Topcoder Direct ID `7377` since this has a valid billing account in the dev environment.
160+
Use Topcoder Connect ID `16665` since this has a valid billing account in the dev environment.
161161

162162
Once it's been added, click `Manage` for the project in the list on `Project Management` and click `Add Webhooks`. Once the webhook has been added, you should be able to see it in the Gitlab project under `Settings` --> `Integrations` --> `Webhooks`
163163

@@ -194,9 +194,6 @@ KAFKA_CLIENT_CERT_KEY: <key>
194194
KAFKA_URL: silver-craft-01.srvs.cloudkafka.com:9093,silver-craft-01.srvs.cloudkafka.com:9094
195195
KAFKA_GROUP_ID topcoder-x-processor
196196
LOG_LEVEL: debug
197-
MAILGUN_API_KEY: key-5ebe7a0fae37a9008721ec0bfe5bdd95
198-
MAILGUN_DOMAIN: sandbox3fcf4920781449f2a5293f8ef18e4bb6.mailgun.org
199-
MAILGUN_PUBLIC_KEY: pubkey-cb9640c444199bcec987010b6d9ef0d2
200197
MAILGUN_SMTP_LOGIN: [email protected]
201198
MAILGUN_SMTP_PASSWORD: c8aefb446e76febdbc31d57ef30b9c10
202199
MAILGUN_SMTP_PORT: 587
@@ -212,8 +209,8 @@ AWS_REGION: FAKE_REGION
212209
IS_LOCAL: true
213210
AUTH0_URL: https://topcoder-dev.auth0.com/oauth/token
214211
AUTH0_AUDIENCE: https://m2m.topcoder-dev.com/
215-
AUTH0_CLIENT_ID: LU2Nt7YPHQ3lxrFNKitJ82syB4wIMR7G
216-
AUTH0_CLIENT_SECRET: O8S2YOb-0lI4NS3smR4d4uf0VM9BN0y1Ra4ABRktGUPOXc34mUO25uJrCpU-TBAT
212+
AUTH0_CLIENT_ID: <client id>
213+
AUTH0_CLIENT_SECRET: <secret>
217214
```
218215

219216
#### Topcoder-X receiver
@@ -240,24 +237,21 @@ IS_LOCAL: true
240237
Justins-Mac-Pro:~ justingasper$ heroku config --app topcoder-x-ui-dev
241238
=== topcoder-x-ui-dev Config Vars
242239
BUILD_ENV: heroku
243-
GITHUB_CLIENT_ID: 92c7cb8cfe7561dd61b8
244-
GITHUB_CLIENT_SECRET: ee677a9d6a8f29629d0cb74886d521df69293515
245-
GITLAB_CLIENT_ID: 6a4f73563e7a984eef7511e2a5a6cf38567d3664628360f632cfc6c8e4e5f612
246-
GITLAB_CLIENT_SECRET: 70367d8255e160828ae47f35ff71723202afc7be1f29a4c7319bc82c4dd47c6b
240+
GITHUB_CLIENT_ID:
241+
GITHUB_CLIENT_SECRET:
242+
GITLAB_CLIENT_ID:
243+
GITLAB_CLIENT_SECRET:
247244
HOOK_BASE_URL: https://topcoder-x-receiver-dev.herokuapp.com
248245
KAFKA_CLIENT_CERT: <cert>
249246
KAFKA_CLIENT_CERT_KEY: <key>
250247
KAFKA_URL: silver-craft-01.srvs.cloudkafka.com:9093,silver-craft-01.srvs.cloudkafka.com:9094
251248
NPM_CONFIG_PRODUCTION: false
252249
SESSION_SECRET: kjsdfkj34857
253-
TC_LOGIN_URL: https://accounts.topcoder-dev.com/member
254-
TC_USER_PROFILE_URL: http://api.topcoder-dev.com/v2/user/profile
255250
TOPIC: topcoder-x
256251
WEBSITE: https://x.topcoder-dev.com
257252
AWS_ACCESS_KEY_ID: FAKE_ACCESS_KEY_ID
258253
AWS_SECRET_ACCESS_KEY: FAKE_SECRET_ACCESS_KEY
259254
AWS_REGION: FAKE_REGION
260255
IS_LOCAL: true
261-
TC_LOGIN_URL: https://accounts.topcoder-dev.com/member
262-
TC_USER_PROFILE_URL: https://api.topcoder-dev.com/v2/user/profile
256+
TC_LOGIN_URL: https://accounts-auth0.topcoder-dev.com/
263257
```

certs/nginx-selfsigned.crt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDdTCCAl2gAwIBAgIUXZRXuC8geqyvofW3Lf/Vq97o2cIwDQYJKoZIhvcNAQEL
3+
BQAwSjELMAkGA1UEBhMCVVMxEzARBgNVBAgMClNvbWUtU3RhdGUxETAPBgNVBAoM
4+
CFRvcGNvZGVyMRMwEQYDVQQDDAp0b3Bjb2Rlci14MB4XDTIwMDMzMTEyNDUzNVoX
5+
DTIxMDMzMTEyNDUzNVowSjELMAkGA1UEBhMCVVMxEzARBgNVBAgMClNvbWUtU3Rh
6+
dGUxETAPBgNVBAoMCFRvcGNvZGVyMRMwEQYDVQQDDAp0b3Bjb2Rlci14MIIBIjAN
7+
BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAobG89/+fnyOK9iQb7LSK6wz/qxJr
8+
RejnAjUqqkcWUMtpyi7slCIZByVVMwiCoZlJbkuBZocdRc8ZLdNLDg+M5PPRA+dz
9+
ZDA3c3qL1mMjSeEwixt8es4Pl//KyWk7QBPfwzVetncAOVr6p9F7nuFBabaDtJjg
10+
gjaAA0QTwnrrr9LL7qjcJBd0V9Sgw18AaNxY9Sj5K3qbFj7/oHddt4etavUqhOdB
11+
OdWc2WCqdHSqyzoRnp1opg3mKicGom/wOH4kkBdDX6g3qTtbTcmR5An81Per1FYV
12+
0D7TXJgK2rUMRPde4d2jPi+KjdDldoy5XODokdililVbde5IAEZ5K0aiJQIDAQAB
13+
o1MwUTAdBgNVHQ4EFgQU4tg6EI8GVJpE5S6owg9n0/be+RowHwYDVR0jBBgwFoAU
14+
4tg6EI8GVJpE5S6owg9n0/be+RowDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0B
15+
AQsFAAOCAQEAAgOFnD/RWZ73Vgih5gRkYbiqxCgIM1wsnEf48OFogmD8RiYffaCa
16+
uB7KzMEwJTHTUgAqqNbV6jmtYxwoXGRkEr61gRNliVmNTRDOxa6DWaN9OYRBDr+3
17+
d94/V4htel+FnYWQcejoafAAEuBJVyzaIA0lmU1sjKQmMRwHGgFTwwPOw4zwyxxu
18+
T8gnUO1ib/cFUHiYUAKnW93jKXyZNi8JRczKoX3Guu8iHCJ1z4fTNvUEsImLSuug
19+
OXFyPbfu7HHX7UiLJX8EP9lJDfQ+IVSNbaxYxHsP2iiB4FISfuK9VmO3+lmaxHI1
20+
diwNfj74dpae4wVl1HX523L3tkZQoQmPbA==
21+
-----END CERTIFICATE-----

certs/nginx-selfsigned.key

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQChsbz3/5+fI4r2
3+
JBvstIrrDP+rEmtF6OcCNSqqRxZQy2nKLuyUIhkHJVUzCIKhmUluS4Fmhx1Fzxkt
4+
00sOD4zk89ED53NkMDdzeovWYyNJ4TCLG3x6zg+X/8rJaTtAE9/DNV62dwA5Wvqn
5+
0Xue4UFptoO0mOCCNoADRBPCeuuv0svuqNwkF3RX1KDDXwBo3Fj1KPkrepsWPv+g
6+
d123h61q9SqE50E51ZzZYKp0dKrLOhGenWimDeYqJwaib/A4fiSQF0NfqDepO1tN
7+
yZHkCfzU96vUVhXQPtNcmAratQxE917h3aM+L4qN0OV2jLlc4OiR2KWKVVt17kgA
8+
RnkrRqIlAgMBAAECggEBAJq2SRx171JCnOzlIf77xMwgtOUIC7Jppde77WXd/OEz
9+
sLZu7ZjTg2UN+JaK9wsOc29gOaFTeNPZ07rAKFl80ZAkJoL4y7U6WWRaBkEMvLAt
10+
EtiXZSTP06XZbzwGP1YRbhIHF+e4t3MptRor23/rAj7XDvAXMwIEiboWQl3cZXTl
11+
1TQdq8ABhhbg5p8fcZvzDasbi8NnyOs0dszHh53IReuqgvhxt8sxH9XKCZHak8Zu
12+
r4cpN1a3jFb6R43oyCYCVlnWzu9pjbZYtZrsaRAmk1PHnATbfQde61gjavV7lc6Y
13+
0R2fne6tMzjK4LnA6da2CvlGTWObo5pByEhFNm0IYOECgYEAzYNzyG9rb1dzkGUt
14+
DiZAJetfJjljBDpkow+J4LudXFFC+Pd+OQYwRS2SRIMKLPaFET3K9Bou0e6R+P+n
15+
cf18RW1t9xEFHFgUt+CdzQo7IkRMNj+iUo6kkpQKhGdncAfrxDWahGXRJycfkzpJ
16+
EZFpQt7atY1fYBn8BRujVh8z5I0CgYEAyWqJzzLxIJn6dxIeKvXLrRM68zSjbd/1
17+
WMS3d51Dc2XEaDA5kn7/G59OZAAOHmk74OpIxpR5QOzydEGhjNJ3HWecEl8vfYq2
18+
UDHCMz81yZWqvuVtVANsKshevmF6EkdMR62q61j8lbKDFcV1G7GeGwIHETc+Ahh+
19+
edW785It6fkCgYAnsYYBZpPHk4p8jy4el4C4Uje0eE0JmgWqAOxOfa4tEHzw/Uxh
20+
0zIrilu/49dpS8vzwo2ajBwS7BNBlo9O0vjXqAUfPShRiymlQjr4SUuWmL5nk+7U
21+
JzzeGr3VSOuPldgRs5C+lbPJ7iKJGy7Vt9Iu2kA/5KhRNXOZwPbRQYGSWQKBgQCU
22+
x4fIb97BsDvdHJsALNQoop3W7LkT/mzjB1xmlNowMaolNAoy9nBG3SQwpgHH4QAE
23+
IctkNGRk2yI1Ug2dUhH+vHwC7iDMYVxOXJMQ+84le9LGc/6QIn8SEzQ4+RQM0HG+
24+
OMCaW/8oLNa7jEH3FPqvBI5n3yCEt8clBAZz4zTbMQKBgQCChOHosnIo789xqVej
25+
cmOpMSkFfosR53IoCwIgsNOSMQEqAVBNN1l2p+7zYH3WqBQLml2MqZgDlEPMrNqS
26+
ZI607uP1uwCAHZDDvkNCVY4e0vXAjXxha0MfE10fQX+lwNzcTSATgivQoJu8NEuU
27+
6rPnc5poMEcSlopRThUR3obQfA==
28+
-----END PRIVATE KEY-----

configuration.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ The following config parameters are supported, they are defined in `src/config.j
3434
|IS_LOCAL | Use Amazon DynamoDB Local or server. |true |
3535
|AWS_CONNECTION_TIMEOUT | The timeout used to check if the app is healthy. |10000 |
3636
|TC_LOGIN_URL | TC login url | |
37-
|TC_USER_PROFILE_URL | TC user profile url | |
3837

3938
## GitHub OAuth App Setup
4039

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use the base image with Node.js
2-
FROM node:8.12
2+
FROM node:14
33

44
# Copy the current directory into the Docker image
55
COPY . /topcoder-x-ui
@@ -12,4 +12,4 @@ RUN npm install
1212
RUN npm run build
1313
#RUN npm test
1414

15-
CMD npm start
15+
CMD npm start

npm-shrinkwrap.json

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

package-lock.json

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

0 commit comments

Comments
 (0)