Skip to content

Commit 8ba850c

Browse files
authored
Merge pull request #270 from opencomponents/setCorrectCacheHeaders
Set cache control header on blob storage
2 parents c9fefc6 + d726ff1 commit 8ba850c

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

packages/oc-azure-storage-adapter/__mocks__/azure-storage.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,18 @@ const blobService = {
8888
].filter(entry => entry.name.startsWith(prefix));
8989
return callback(null, { entries: entriesToReturn });
9090
},
91-
createWriteStreamToBlockBlob: (containerName, fileName, _, callback) => {
91+
createWriteStreamToBlockBlob: (
92+
containerName,
93+
fileName,
94+
settings,
95+
callback
96+
) => {
9297
let lengthWritten = 0;
9398
const writeStream = new LengthCallbackStream(
9499
length => (lengthWritten += length)
95100
);
96101
writeStream.on('finish', () =>
97-
callback(null, { lengthWritten, container: containerName })
102+
callback(null, { lengthWritten, container: containerName, settings })
98103
);
99104
return writeStream;
100105
},

packages/oc-azure-storage-adapter/__test__/azure.test.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,9 @@ test('test private putFileContent stream', done => {
290290
expect(err).toBe(null);
291291
expect(result.container).toBe('privcon');
292292
expect(result.lengthWritten).toBe(fileContent.length);
293+
expect(result.settings.contentSettings.cacheControl).toBe(
294+
'public, max-age=31556926'
295+
);
293296
done();
294297
});
295298
});

packages/oc-azure-storage-adapter/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,9 @@ module.exports = function(conf) {
209209

210210
const putFileContent = (fileContent, fileName, isPrivate, callback) => {
211211
const fileInfo = getFileInfo(fileName);
212-
const contentSettings = {};
212+
const contentSettings = {
213+
cacheControl: 'public, max-age=31556926'
214+
};
213215
if (fileInfo.mimeType) {
214216
contentSettings.contentType = fileInfo.mimeType;
215217
}

0 commit comments

Comments
 (0)