Skip to content

Commit

Permalink
Merge pull request #79 from PlayNetwork/v1.4.5
Browse files Browse the repository at this point in the history
fixing an issue where ensureAuthHeaders was not properly called
  • Loading branch information
brozeph committed Nov 2, 2018
2 parents 0539881 + 2b37310 commit 45f60f4
Show file tree
Hide file tree
Showing 13 changed files with 63 additions and 62 deletions.
4 changes: 4 additions & 0 deletions history.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# v1.4.5 - 2018/11/02

* Fixed bug in many sub-modules where ensuring authentication headers was called improperly

# v1.4.4 - 2018/10/31

* Fixed bug preventing asset downloads
Expand Down
4 changes: 2 additions & 2 deletions lib/asset.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ module.exports = function (assetOptions, ensureAuthHeaders, self) {
options.method = options.method.toLowerCase();
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req[options.method]({
headers : headers,
Expand Down Expand Up @@ -182,7 +182,7 @@ module.exports = function (assetOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('asset is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down
14 changes: 7 additions & 7 deletions lib/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ module.exports = function (contentOptions, ensureAuthHeaders, self) {
options.method = options.method.toLowerCase();
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req[options.method]({
headers : headers,
Expand Down Expand Up @@ -131,7 +131,7 @@ module.exports = function (contentOptions, ensureAuthHeaders, self) {

let assetId = typeof track === 'string' ? track : track.assetId;

return ensureAuthHeaders(options)
return ensureAuthHeaders()
.then((headers) => {
req
.head({
Expand Down Expand Up @@ -177,7 +177,7 @@ module.exports = function (contentOptions, ensureAuthHeaders, self) {
return reject(new Error('track is missing identifier'));
}

return ensureAuthHeaders(options)
return ensureAuthHeaders()
.then((headers) => {
req
.head({
Expand Down Expand Up @@ -229,7 +229,7 @@ module.exports = function (contentOptions, ensureAuthHeaders, self) {

let assetId = typeof track === 'string' ? track : track.assetId;

return ensureAuthHeaders(options)
return ensureAuthHeaders()
.then((headers) => {
req
.head({
Expand Down Expand Up @@ -281,7 +281,7 @@ module.exports = function (contentOptions, ensureAuthHeaders, self) {

let
assetId = typeof track === 'string' ? track : track.assetId,
headers = yield ensureAuthHeaders(options);
headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -314,7 +314,7 @@ module.exports = function (contentOptions, ensureAuthHeaders, self) {

let
alias = self.buildTrackAlias(track),
headers = yield ensureAuthHeaders(options);
headers = yield ensureAuthHeaders();

if (validation.isEmpty(alias)) {
return yield Promise.reject(new Error('track is missing identifier'));
Expand Down Expand Up @@ -361,7 +361,7 @@ module.exports = function (contentOptions, ensureAuthHeaders, self) {

let
assetId = typeof track === 'string' ? track : track.assetId,
headers = yield ensureAuthHeaders(options);
headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down
14 changes: 7 additions & 7 deletions lib/device.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module.exports = function (deviceOptions, ensureAuthHeaders, self) {
}

let exec = co(function *() {
let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand All @@ -74,7 +74,7 @@ module.exports = function (deviceOptions, ensureAuthHeaders, self) {
}

let exec = co(function *() {
let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -252,7 +252,7 @@ module.exports = function (deviceOptions, ensureAuthHeaders, self) {
}

let exec = co(function *() {
let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -282,7 +282,7 @@ module.exports = function (deviceOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('deviceId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -335,7 +335,7 @@ module.exports = function (deviceOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('groupId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -365,7 +365,7 @@ module.exports = function (deviceOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('groupId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -395,7 +395,7 @@ module.exports = function (deviceOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('groupId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down
12 changes: 6 additions & 6 deletions lib/location.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module.exports = function (locationOptions, ensureAuthHeaders, self) {
}

let exec = co(function *() {
let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand All @@ -72,7 +72,7 @@ module.exports = function (locationOptions, ensureAuthHeaders, self) {
}

let exec = co(function *() {
let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand All @@ -92,7 +92,7 @@ module.exports = function (locationOptions, ensureAuthHeaders, self) {
}

let exec = co(function *() {
let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -125,7 +125,7 @@ module.exports = function (locationOptions, ensureAuthHeaders, self) {
options.method = options.method.toLowerCase();
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req[options.method]({
headers : headers,
Expand Down Expand Up @@ -177,7 +177,7 @@ module.exports = function (locationOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('locationId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -230,7 +230,7 @@ module.exports = function (locationOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('physicalLocationId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down
36 changes: 18 additions & 18 deletions lib/music.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('stationId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand All @@ -152,7 +152,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
}

let exec = co(function *() {
let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -182,7 +182,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('collectionId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand All @@ -202,7 +202,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
}

let exec = co(function *() {
let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -232,7 +232,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('playlistId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand All @@ -252,7 +252,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
}

let exec = co(function *() {
let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -282,7 +282,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('stationId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand All @@ -302,7 +302,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
}

let exec = co(function *() {
let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -335,7 +335,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
options.method = options.method.toLowerCase();
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req[options.method]({
headers : headers,
Expand Down Expand Up @@ -413,7 +413,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('stationId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.post({
headers : headers,
Expand Down Expand Up @@ -564,7 +564,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('stationId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -605,7 +605,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('broadcastId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -635,7 +635,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('collectionId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -665,7 +665,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('playlistId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -695,7 +695,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('stationId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -725,7 +725,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('trackAlias is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down Expand Up @@ -760,7 +760,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
}

let
headers = yield ensureAuthHeaders(options),
headers = yield ensureAuthHeaders(),
trackAliasList = tracks
.map((track) => (buildTrackAlias(track)))
.filter((alias) => (!validation.isEmpty(alias)));
Expand Down Expand Up @@ -797,7 +797,7 @@ module.exports = function (musicOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('collectionId is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down
2 changes: 1 addition & 1 deletion lib/playback.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = function (playbackOptions, ensureAuthHeaders, self) {
return yield Promise.reject(new Error('key is required'));
}

let headers = yield ensureAuthHeaders(options);
let headers = yield ensureAuthHeaders();

return yield req.get({
headers : headers,
Expand Down

0 comments on commit 45f60f4

Please sign in to comment.