verdnatura-mirror
/
loopback-component-storage
mirror of https://github.com/strongloop/loopback-component-storage.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename uploading files

This commit is contained in:
Hage Yaapa 2018-05-14 22:22:40 +05:30
parent eb11b4d660
commit ffa04a7992
3 changed files with 121 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/storage-handler.js
View File

@ -82,6 +82,11 @@ exports.upload = function(provider, req, res, options, cb) {
field: part.name,
};
// Rename file before saving
if (options.hasOwnProperty('targetFileName')) {
file.name = options.targetFileName;
}
// Options for this file
// Build a filename

6
test/images/album1/.gitignore vendored
View File

@ -1,4 +1,2 @@
test.jpg
image-*.jpg
customimagefield_test.jpg
customimagefield1_test.jpg
*
!.gitignore

94
test/upload-download.test.js
View File

@ -11,6 +11,7 @@ var semver = require('semver');
var app = loopback();
var path = require('path');
var fs = require('fs');
// configure errorHandler to show full error message
app.set('remoting', {errorHandler: {debug: true, log: false}});
@ -77,6 +78,14 @@ var ds = loopback.createDataSource({
var Container = ds.createModel('container', {}, {base: 'Model'});
app.model(Container);
var RenamingContainer = ds.createModel('rename', {}, {base: 'Model'});
app.model(RenamingContainer);
RenamingContainer.beforeRemote('upload', function(ctx, unused, cb) {
ctx.targetFileName = 'renamed-test.jpg';
cb();
});
/*!
* Verify that the JSON response has the correct metadata properties.
* Please note the metadata vary by storage providers. This test assumes
@ -107,13 +116,22 @@ function verifyMetadata(containerOrFile, name) {
describe('storage service', function() {
var server = null;
before(function(done) {
beforeEach(function(done) {
server = app.listen(0, function() {
done();
});
});
after(function() {
afterEach(function() {
var temporaryImagesPath = path.join(__dirname, 'images', 'album1');
var files = fs.readdirSync(temporaryImagesPath);
files.forEach(function(fileName) {
var ext = fileName.substr(-4);
if (ext === '.jpg') {
var filePath = path.join(temporaryImagesPath, fileName);
fs.unlinkSync(filePath);
}
});
server.close();
});
@ -206,6 +224,23 @@ describe('storage service', function() {
});
});
it('renames uploading file', function(done) {
request('http://localhost:' + app.get('port'))
.post('/renames/album1/upload')
.attach('image', path.join(__dirname, './fixtures/test.jpg'))
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
assert.deepEqual(res.body, {'result': {'files': {'image': [
{'container': 'album1', 'name': 'renamed-test.jpg', 'type': 'image/jpeg', 'field': 'image', 'size': 60475},
]}, 'fields': {}}});
request('http://localhost:' + app.get('port'))
.get('/renames/album1/download/renamed-test.jpg')
.expect(200, done);
});
});
it('fails to upload using dotdot file path', function(done) {
request('http://localhost:' + app.get('port'))
.post('/containers/%2e%2e/upload')
@ -312,6 +347,12 @@ describe('storage service', function() {
});
it('should get file by name', function(done) {
request('http://localhost:' + app.get('port'))
.post('/containers/album1/upload')
.attach('image', path.join(__dirname, './fixtures/test.jpg'))
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
request('http://localhost:' + app.get('port'))
.get('/containers/album1/files/test.jpg')
.set('Accept', 'application/json')
@ -321,8 +362,15 @@ describe('storage service', function() {
done();
});
});
});
it('should get file by renamed file name', function(done) {
request('http://localhost:' + app.get('port'))
.post('/imageContainers/album1/upload')
.attach('image', path.join(__dirname, './fixtures/test.jpg'))
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
request('http://localhost:' + app.get('port'))
.get('/imageContainers/album1/files/image-test.jpg')
.set('Accept', 'application/json')
@ -332,16 +380,24 @@ describe('storage service', function() {
done();
});
});
});
it('downloads files', function(done) {
request('http://localhost:' + app.get('port'))
.post('/containers/album1/upload')
.attach('image', path.join(__dirname, './fixtures/test.jpg'))
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
request('http://localhost:' + app.get('port'))
.get('/containers/album1/download/test.jpg')
.expect('Content-Type', 'image/jpeg')
.expect(200, function(err, res) {
if (err) done(err);
if (err) return done(err);
done();
});
});
});
it('should run a function before a download is started by a client', function(done) {
var hookCalled = false;
@ -353,15 +409,22 @@ describe('storage service', function() {
cb();
});
request('http://localhost:' + app.get('port'))
.post('/containers/album1/upload')
.attach('image', path.join(__dirname, './fixtures/test.jpg'))
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
request('http://localhost:' + app.get('port'))
.get('/containers/album1/download/test.jpg')
.expect('Content-Type', 'image/jpeg')
.expect(200, function(err, res) {
if (err) done(err);
if (err) return done(err);
assert(hookCalled, 'beforeRemote hook was not called');
done();
});
});
});
it('should run a function after a download is started by a client', function(done) {
var hookCalled = false;
@ -373,15 +436,22 @@ describe('storage service', function() {
cb();
});
request('http://localhost:' + app.get('port'))
.post('/containers/album1/upload')
.attach('image', path.join(__dirname, './fixtures/test.jpg'))
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
request('http://localhost:' + app.get('port'))
.get('/containers/album1/download/test.jpg')
.expect('Content-Type', 'image/jpeg')
.expect(200, function(err, res) {
if (err) done(err);
if (err) return done(err);
assert(hookCalled, 'afterRemote hook was not called');
done();
});
});
});
it('should run a function after a download failed', function(done) {
var hookCalled = false;
@ -392,6 +462,12 @@ describe('storage service', function() {
cb();
});
request('http://localhost:' + app.get('port'))
.post('/containers/album1/upload')
.attach('image', path.join(__dirname, './fixtures/test.jpg'))
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
request('http://localhost:' + app.get('port'))
.get('/containers/album1/download/does-not-exist')
.expect(404, function(err, res) {
@ -400,8 +476,15 @@ describe('storage service', function() {
done();
});
});
});
it('should delete a file', function(done) {
request('http://localhost:' + app.get('port'))
.post('/containers/album1/upload')
.attach('image', path.join(__dirname, './fixtures/test.jpg'))
.set('Accept', 'application/json')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
request('http://localhost:' + app.get('port'))
.del('/containers/album1/files/test.jpg')
.set('Accept', 'application/json')
@ -410,6 +493,7 @@ describe('storage service', function() {
done();
});
});
});
it('reports errors if it fails to find the file to download', function(done) {
request('http://localhost:' + app.get('port'))