OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

move CORS allowance to the REST API router

pull/753/head
William Lahti 2018-06-28 20:23:26 -07:00 committed by Chocobozzz
parent b229e38d50
commit 12daa83784
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server.ts
View File

@ -84,8 +84,9 @@ import { UpdateVideosScheduler } from './server/lib/schedulers/update-videos-sch
// ----------- App ----------- // ----------- App -----------
// Enable CORS // Enable CORS for develop
app.use((req, res, next) => { if (isTestInstance()) {
app.use((req, res, next) => {
// These routes have already cors // These routes have already cors
if ( if (
req.path.indexOf(STATIC_PATHS.TORRENTS) === -1 && req.path.indexOf(STATIC_PATHS.TORRENTS) === -1 &&
@ -99,7 +100,8 @@ app.use((req, res, next) => {
} }
return next() return next()
}) })
}
// For the logger // For the logger
app.use(morgan('combined', { app.use(morgan('combined', {

7
server/controllers/api/index.ts
View File

@ -8,9 +8,16 @@ import { accountsRouter } from './accounts'
import { videosRouter } from './videos' import { videosRouter } from './videos'
import { badRequest } from '../../helpers/express-utils' import { badRequest } from '../../helpers/express-utils'
import { videoChannelRouter } from './video-channel' import { videoChannelRouter } from './video-channel'
import * as cors from 'cors'
const apiRouter = express.Router() const apiRouter = express.Router()
apiRouter.use(cors({
origin: '*',
exposedHeaders: 'Retry-After',
credentials: true
}))
apiRouter.use('/server', serverRouter) apiRouter.use('/server', serverRouter)
apiRouter.use('/oauth-clients', oauthClientsRouter) apiRouter.use('/oauth-clients', oauthClientsRouter)
apiRouter.use('/config', configRouter) apiRouter.use('/config', configRouter)