Skip to content

Commit

Permalink
Use new dataservices endpoint (not platform); updates to platform-client
Browse files Browse the repository at this point in the history
  • Loading branch information
darinkrauss committed Oct 5, 2016
1 parent 1f3cac5 commit a267fbd
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .config.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ module.exports = {
// the defaults for these need to be pointing to prod
API_URL: process.env.API_URL || 'https://api.tidepool.org',
UPLOAD_URL: process.env.UPLOAD_URL || 'https://uploads.tidepool.org',
DATA_URL: process.env.DATA_URL || 'https://api.tidepool.org/platform',
DATA_URL: process.env.DATA_URL || 'https://api.tidepool.org/dataservices',
BLIP_URL: process.env.BLIP_URL || 'https://blip.tidepool.org',
DEFAULT_TIMEZONE: process.env.DEFAULT_TIMEZONE || 'America/Los_Angeles',
DEFAULT_CARELINK_DAYS: process.env.DEFAULT_CARELINK_DAYS || '180'
Expand Down
2 changes: 1 addition & 1 deletion config/integration.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export API_URL='https://int-api.tidepool.org'
export UPLOAD_URL='https://int-uploads.tidepool.org'
export BLIP_URL='https://int-blip.tidepool.org'
export DATA_URL='https://int-api.tidepool.org/platform'
export DATA_URL='https://int-api.tidepool.org/dataservices'
export DEBUG_ERROR=false
export REDUX_LOG=false
export REDUX_DEV_UI=false
2 changes: 1 addition & 1 deletion config/staging.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export API_URL='https://stg-api.tidepool.org'
export UPLOAD_URL='https://stg-uploads.tidepool.org'
export BLIP_URL='https://stg-blip.tidepool.org'
export DATA_URL='https://stg-api.tidepool.org/platform'
export DATA_URL='https://stg-api.tidepool.org/dataservices'
export DEBUG_ERROR=false
export REDUX_LOG=false
export REDUX_DEV_UI=false
2 changes: 1 addition & 1 deletion lib/core/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ api.upload.toPlatform = function(data, sessionInfo, progress, groupId, cb, uploa
post_dataset_create(uploadItem, function(err, dataset){
if(_.isEmpty(err)){
api.log('created dataset');
datasetId = _.get(dataset, 'uploadId');
datasetId = _.get(dataset, 'data.uploadId');
if(_.isEmpty(datasetId)){
api.log('created dataset does not include uploadId');
return callback(new Error(format('Dataset response does not contain uploadId.')));
Expand Down
8 changes: 4 additions & 4 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,25 +93,25 @@ function setServer(window, info) {
Development: {
API_URL: 'https://dev-api.tidepool.org',
UPLOAD_URL: 'https://dev-uploads.tidepool.org',
DATA_URL: 'https://dev-api.tidepool.org/platform',
DATA_URL: 'https://dev-api.tidepool.org/dataservices',
BLIP_URL: 'https://dev-blip.tidepool.org'
},
Staging: {
API_URL: 'https://stg-api.tidepool.org',
UPLOAD_URL: 'https://stg-uploads.tidepool.org',
DATA_URL: 'https://stg-api.tidepool.org/platform',
DATA_URL: 'https://stg-api.tidepool.org/dataservices',
BLIP_URL: 'https://stg-blip.tidepool.org'
},
Integration: {
API_URL: 'https://int-api.tidepool.org',
UPLOAD_URL: 'https://int-uploads.tidepool.org',
DATA_URL: 'https://int-api.tidepool.org/platform',
DATA_URL: 'https://int-api.tidepool.org/dataservices',
BLIP_URL: 'https://int-blip.tidepool.org'
},
Production: {
API_URL: 'https://api.tidepool.org',
UPLOAD_URL: 'https://uploads.tidepool.org',
DATA_URL: 'https://api.tidepool.org/platform',
DATA_URL: 'https://api.tidepool.org/dataservices',
BLIP_URL: 'https://blip.tidepool.org'
}
};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"semver": "5.1.0",
"stack-trace": "0.0.9",
"sundial": "1.6.0",
"tidepool-platform-client": "0.27.0"
"tidepool-platform-client": "0.28.0"
},
"devDependencies": {
"babel-core": "5.8.38",
Expand Down

0 comments on commit a267fbd

Please sign in to comment.