Browse Source

all controllers now use this.createMulter()

develop
Rob Colbert 2 years ago
parent
commit
7e1a2d9561
  1. 5
      app/controllers/admin/content-report.js
  2. 2
      app/controllers/admin/core-node.js
  3. 2
      app/controllers/admin/core-user.js
  4. 3
      app/controllers/auth.js
  5. 2
      app/controllers/chat.js
  6. 3
      app/controllers/image.js
  7. 2
      app/controllers/newsletter.js
  8. 3
      app/controllers/user.js
  9. 9
      lib/site-controller.js

5
app/controllers/admin/content-report.js

@ -5,9 +5,8 @@
'use strict';
const express = require('express');
const multer = require('multer');
const { /*SiteError,*/ SiteController } = require('../../../lib/site-lib');
const { SiteController } = require('../../../lib/site-lib');
class ContentReportController extends SiteController {
@ -16,7 +15,7 @@ class ContentReportController extends SiteController {
}
async start ( ) {
const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/upload` });
const upload = this.createMulter();
const router = express.Router();
router.use(async (req, res, next) => {

2
app/controllers/admin/core-node.js

@ -16,8 +16,6 @@ class CoreNodeController extends SiteController {
}
async start ( ) {
// const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/upload` });
const router = express.Router();
router.use(async (req, res, next) => {
res.locals.currentView = 'admin';

2
app/controllers/admin/core-user.js

@ -16,8 +16,6 @@ class CoreUserController extends SiteController {
}
async start ( ) {
// const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/upload` });
const router = express.Router();
router.use(async (req, res, next) => {
res.locals.currentView = 'admin';

3
app/controllers/auth.js

@ -25,7 +25,8 @@ class AuthController extends SiteController {
coreNode: coreNodeService,
limiter: limiterService,
} = this.dtp.services;
const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/uploads/${this.component.slug}` });
const upload = this.createMulter();
const router = express.Router();
this.dtp.app.use('/auth', router);

2
app/controllers/chat.js

@ -23,7 +23,7 @@ class ChatController extends SiteController {
session: sessionService,
} = this.dtp.services;
const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/uploads/${this.component.slug}` });
const upload = this.createMulter();
const router = express.Router();
this.dtp.app.use('/chat', router);

3
app/controllers/image.js

@ -26,8 +26,7 @@ class ImageController extends SiteController {
const router = express.Router();
dtp.app.use('/image', router);
const imageUpload = multer({
dest: `/tmp/${this.dtp.config.site.domainKey}/uploads/${this.component.slug}`,
const imageUpload = this.createMulter('uploads', {
limits: {
fileSize: 1024 * 1000 * 12,
},

2
app/controllers/newsletter.js

@ -19,7 +19,7 @@ class NewsletterController extends SiteController {
const { dtp } = this;
const { limiter: limiterService } = dtp.services;
const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/uploads/${module.exports.slug}` });
const upload = this.createMulter();
const router = express.Router();
dtp.app.use('/newsletter', router);

3
app/controllers/user.js

@ -24,7 +24,8 @@ class UserController extends SiteController {
session: sessionService,
} = dtp.services;
const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/uploads/${this.component.slug}` });
const upload = this.createMulter();
const router = express.Router();
dtp.app.use('/user', router);

9
lib/site-controller.js

@ -36,9 +36,14 @@ class SiteController extends SiteCommon {
return pagination;
}
createMulter (slug) {
createMulter (slug, options) {
slug = slug || 'uploads';
return multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/${slug}/${this.component.slug}` });
options = Object.assign({
dest: `/tmp/${this.dtp.config.site.domainKey}/${slug}/${this.component.slug}`
}, options || { });
return multer(options);
}
createDisplayList (name) {

Loading…
Cancel
Save