Skip to content

Grab the Topgear submission changes #7100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kkartunov merged 10 commits into from
Jun 20, 2025
Merged

Grab the Topgear submission changes #7100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d6897f7
Merge pull request #7075 from topcoder-platform/develop
kkartunov Feb 24, 2025
3430cd8
Merge pull request #7080 from topcoder-platform/develop
kkartunov Mar 18, 2025
089bb68
Merge pull request #7084 from topcoder-platform/develop
kkartunov Mar 28, 2025
fa48bc2
Merge pull request #7088 from topcoder-platform/develop
jmgasper Apr 2, 2025
c66f5a7
Merge pull request #7090 from topcoder-platform/develop
kkartunov Apr 16, 2025
609d44c
Merge pull request #7093 from topcoder-platform/develop
kkartunov May 13, 2025
e99f2fd
PM-967 - expose "TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS" to app
vas3a Jun 17, 2025
e00107e
PM-967 - dockerfile: add TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS arg
vas3a Jun 17, 2025
d98dc9d
PM-967 - keep env var as string
vas3a Jun 17, 2025
f992867
Merge pull request #7098 from topcoder-platform/HOTFIX_PM-967_tg-subm…
kkartunov Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ ARG GAMIFICATION_ORG_ID
# Universal Nav
ARG UNIVERSAL_NAV_URL

# Topgear submissions allowed domains
ARG TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS

################################################################################
# Setting of environment variables in the Docker image.

Expand Down Expand Up @@ -154,6 +157,9 @@ ENV GAMIFICATION_ORG_ID=$GAMIFICATION_ORG_ID
# Universal nav
ENV UNIVERSAL_NAV_URL=$UNIVERSAL_NAV_URL

# Topgear submissions allowed domains
ENV TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS=$TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS

################################################################################
# Testing and build of the application inside the container.

Expand Down
1 change: 1 addition & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ docker build -t $TAG \
--build-arg CONTENTFUL_EDU_CDN_API_KEY=$CONTENTFUL_EDU_CDN_API_KEY \
--build-arg CONTENTFUL_EDU_PREVIEW_API_KEY=$CONTENTFUL_EDU_PREVIEW_API_KEY \
--build-arg FILESTACK_API_KEY=$FILESTACK_API_KEY \
--build-arg TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS=$TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS \
--build-arg FILESTACK_SUBMISSION_CONTAINER=$FILESTACK_SUBMISSION_CONTAINER \
--build-arg MAILCHIMP_API_KEY=$MAILCHIMP_API_KEY \
--build-arg MAILCHIMP_BASE_URL=$MAILCHIMP_BASE_URL \
Expand Down
1 change: 1 addition & 0 deletions config/custom-environment-variables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,5 @@ module.exports = {
ORG_ID: 'GAMIFICATION_ORG_ID',
ENABLE_BADGE_UI: 'GAMIFICATION_ENABLE_BADGE_UI',
},
TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS: 'TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS',
};
2 changes: 1 addition & 1 deletion config/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,5 +472,5 @@ module.exports = {
ACCOUNT_SETTINGS_REDIRECT_URL: 'https://account-settings.topcoder-dev.com',
INNOVATION_CHALLENGES_TAG: 'Innovation Challenge',
PLATFORM_SITE_URL: 'https://platform.topcoder-dev.com',
TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS: ['wipro365.sharepoint.com', 'wipro365-my.sharepoint.com', 'wipro365-my.sharepoint.com.mcas.ms'],
TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS: 'wipro365.sharepoint.com|wipro365-my.sharepoint.com|wipro365-my.sharepoint.com.mcas.ms',
Copy link

@github-actions github-actions bot Jun 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change from an array to a string for TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS may affect how this configuration is used in the application. If the application logic expects an array, this change could lead to errors. Consider verifying that the application can handle a string with domains separated by | or update the logic accordingly.

};
2 changes: 1 addition & 1 deletion src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class FilestackFilePicker extends React.Component {
}

isDomainAllowed(url) {
const domainReg = new RegExp(`^https?://(${config.TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS.join('|')})/.+`);
const domainReg = new RegExp(`^https?://(${config.TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS})/.+`);
Copy link

@github-actions github-actions bot Jun 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change from join('|') to directly using config.TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS might cause issues if TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS is an array. If it is intended to be a single string, ensure that it is formatted correctly as a regex pattern. Otherwise, if it is an array, the previous implementation using join('|') is necessary to construct a valid regex pattern that matches any of the allowed domains.

return !!url.match(domainReg);
}

Expand Down