Skip to content

Hotfix/security comp 10 #3293

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
vikasrohit merged 2 commits into from
Sep 9, 2019
Merged

Hotfix/security comp 10 #3293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e29d5d
Merge pull request #3290 from appirio-tech/hotfix/handling_missing_fi…
Sep 3, 2019
3238c43
Confluence#SEC-10 - File upload for connect
Sep 5, 2019
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
1 change: 1 addition & 0 deletions config/constants/dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ module.exports = {

FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY_DEV,
FILE_PICKER_SUBMISSION_CONTAINER_NAME: 'submission-staging-dev',
FILE_PICKER_ACCEPT: process.env.FILE_PICKER_ACCEPT_DEV,

SALESFORCE_PROJECT_LEAD_LINK: 'https://c.cs18.visual.force.com/apex/ConnectLead?connectProjectId=',

Expand Down
1 change: 1 addition & 0 deletions config/constants/master.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ module.exports = {

FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY_PROD,
FILE_PICKER_SUBMISSION_CONTAINER_NAME: 'submission-staging-prod',
FILE_PICKER_ACCEPT: process.env.FILE_PICKER_ACCEPT_PROD,

SALESFORCE_PROJECT_LEAD_LINK: 'https://topcoder.my.salesforce.com/apex/ConnectLead?connectProjectId=',
CONNECT_SEGMENT_KEY: process.env.PROD_SEGMENT_KEY,
Expand Down
1 change: 1 addition & 0 deletions config/constants/qa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ module.exports = {

FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY_QA,
FILE_PICKER_SUBMISSION_CONTAINER_NAME: 'submission-staging-qa',
FILE_PICKER_ACCEPT: process.env.FILE_PICKER_ACCEPT_QA,

SALESFORCE_PROJECT_LEAD_LINK: 'https://c.cs18.visual.force.com/apex/ConnectLead?connectProjectId=',
CONNECT_SEGMENT_KEY: process.env.QA_SEGMENT_KEY,
Expand Down
5 changes: 4 additions & 1 deletion src/components/Feed/NewPostMobile.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import {
FILE_PICKER_API_KEY,
FILE_PICKER_CNAME,
FILE_PICKER_FROM_SOURCES,
FILE_PICKER_SUBMISSION_CONTAINER_NAME, PROJECT_ATTACHMENTS_FOLDER
FILE_PICKER_SUBMISSION_CONTAINER_NAME,
PROJECT_ATTACHMENTS_FOLDER,
FILE_PICKER_ACCEPT,
} from '../../config/constants'
import BtnRemove from '../../assets/icons/ui-16px-1_trash-simple.svg'
import _ from 'lodash'
Expand Down Expand Up @@ -114,6 +116,7 @@ class NewPostMobile extends React.Component {
},
maxFiles: 4,
fromSources: FILE_PICKER_FROM_SOURCES,
accept: FILE_PICKER_ACCEPT,
uploadInBackground: false,
onFileUploadFinished: (files) => {
this.processUploadedFiles(files)
Expand Down
9 changes: 8 additions & 1 deletion src/components/FileList/AddFiles.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ import PropTypes from 'prop-types'
import FilePicker from 'appirio-tech-react-components/components/FilePicker/FilePicker'
import './AddFiles.scss'

import { FILE_PICKER_API_KEY, FILE_PICKER_SUBMISSION_CONTAINER_NAME, FILE_PICKER_CNAME, FILE_PICKER_FROM_SOURCES } from '../../config/constants'
import {
FILE_PICKER_API_KEY,
FILE_PICKER_SUBMISSION_CONTAINER_NAME,
FILE_PICKER_CNAME,
FILE_PICKER_FROM_SOURCES,
FILE_PICKER_ACCEPT
} from '../../config/constants'

const AddFiles = props => {
const { successHandler, category, storePath } = props
Expand All @@ -20,6 +26,7 @@ const AddFiles = props => {
location: 's3',
storeContainer: FILE_PICKER_SUBMISSION_CONTAINER_NAME,
fromSources: FILE_PICKER_FROM_SOURCES,
accept: FILE_PICKER_ACCEPT,
path: storePath,
multiple: 'true',
services: ['COMPUTER', 'GOOGLE_DRIVE', 'BOX', 'DROPBOX', 'SKYDRIVE']
Expand Down
4 changes: 3 additions & 1 deletion src/components/LinksMenu/FileLinksMenu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import {
FILE_PICKER_API_KEY,
FILE_PICKER_FROM_SOURCES,
FILE_PICKER_CNAME,
FILE_PICKER_SUBMISSION_CONTAINER_NAME
FILE_PICKER_SUBMISSION_CONTAINER_NAME,
FILE_PICKER_ACCEPT,
} from '../../config/constants'

const FileLinksMenu = ({
Expand Down Expand Up @@ -119,6 +120,7 @@ const FileLinksMenu = ({
},
maxFiles: 4,
fromSources: FILE_PICKER_FROM_SOURCES,
accept: FILE_PICKER_ACCEPT,
uploadInBackground: false,
onFileUploadFinished: (files) => {
processUploadedFiles(files, category)
Expand Down
7 changes: 5 additions & 2 deletions src/components/RichTextArea/RichTextArea.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ import TitleSaveIcon from '../../assets/icons/icon-save.svg'

import {
FILE_PICKER_API_KEY,
FILE_PICKER_CNAME, FILE_PICKER_FROM_SOURCES,
FILE_PICKER_CNAME,
FILE_PICKER_FROM_SOURCES,
FILE_PICKER_SUBMISSION_CONTAINER_NAME,
PROJECT_ATTACHMENTS_FOLDER
PROJECT_ATTACHMENTS_FOLDER,
FILE_PICKER_ACCEPT,
} from '../../config/constants'
import * as filepicker from 'filestack-js'
import BtnRemove from '../../assets/icons/ui-16px-1_trash-simple.svg'
Expand Down Expand Up @@ -339,6 +341,7 @@ class RichTextArea extends React.Component {
},
maxFiles: 4,
fromSources: FILE_PICKER_FROM_SOURCES,
accept: FILE_PICKER_ACCEPT,
uploadInBackground: false,
onFileUploadFinished: (files) => {
this.processUploadedFiles(files)
Expand Down
3 changes: 2 additions & 1 deletion src/config/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,11 +644,12 @@ export const ROLE_ADMINISTRATOR = 'administrator'
export const ROLE_CONNECT_COPILOT_MANAGER = 'Connect Copilot Manager'

// FIXME .. remove defaults
export const FILE_PICKER_API_KEY = process.env.FILE_PICKER_API_KEY || 'AzFINuQoqTmqw0QEoaw9az'
export const FILE_PICKER_API_KEY = process.env.FILE_PICKER_API_KEY || ''
export const FILE_PICKER_SUBMISSION_CONTAINER_NAME = process.env.FILE_PICKER_SUBMISSION_CONTAINER_NAME || 'submission-staging-dev'
export const FILE_PICKER_CNAME = process.env.FILE_PICKER_CNAME || 'fs.topcoder.com'
export const FILE_PICKER_FROM_SOURCES = process.env.FILE_PICKER_FROM_SOURCES || ['local_file_system', 'googledrive', 'dropbox']
export const PROJECT_ATTACHMENTS_FOLDER = process.env.PROJECT_ATTACHMENTS_FOLDER || 'PROJECT_ATTACHMENTS'
export const FILE_PICKER_ACCEPT = process.env.FILE_PICKER_ACCEPT || ['.bmp', '.gif', '.jpg', '.tex', '.xls', '.xlsx', '.doc', '.docx', '.zip', '.txt', '.pdf', '.png', '.ppt', '.pptx', '.rtf']

export const SEGMENT_KEY = process.env.CONNECT_SEGMENT_KEY
/*
Expand Down
5 changes: 4 additions & 1 deletion src/projects/detail/containers/AssetsInfoContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import { PROJECT_ATTACHMENTS_FOLDER,
FILE_PICKER_API_KEY,
FILE_PICKER_FROM_SOURCES,
FILE_PICKER_CNAME,
FILE_PICKER_SUBMISSION_CONTAINER_NAME } from '../../../config/constants'
FILE_PICKER_SUBMISSION_CONTAINER_NAME,
FILE_PICKER_ACCEPT,
} from '../../../config/constants'
import AddLink from '../../../components/AssetsLibrary/AddLink'
import PERMISSIONS from '../../../config/permissions'
import { checkPermission } from '../../../helpers/permissions'
Expand Down Expand Up @@ -517,6 +519,7 @@ class AssetsInfoContainer extends React.Component {
},
maxFiles: 4,
fromSources: FILE_PICKER_FROM_SOURCES,
accept: FILE_PICKER_ACCEPT,
uploadInBackground: false,
onFileUploadFinished: (files) => {
processUploadedFiles(files, category)
Expand Down