starred/stf
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-20 15:55:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change all "api" URLs. Ideally the path prefix would be an option.

Browse Source
This commit is contained in:
Simo Kinnunen
2014-12-17 21:29:51 +09:00
parent 436fa6eff9
commit b2e114c9be
14 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/units/app/index.js
View File

@@ -91,7 +91,7 @@ module.exports = function(options) {
res.render('index')
})
app.get('/api/v1/app/state.js', function(req, res) {
app.get('/app/api/v1/state.js', function(req, res) {
var state = {
config: {
websocketUrl: (function() {
@@ -106,14 +106,14 @@ module.exports = function(options) {
res.send('var GLOBAL_APPSTATE = ' + JSON.stringify(state))
})
app.get('/api/v1/app/user', function(req, res) {
app.get('/app/api/v1/user', function(req, res) {
res.json({
success: true
, user: req.user
})
})
app.get('/api/v1/app/group', function(req, res) {
app.get('/app/api/v1/group', function(req, res) {
dbapi.loadGroup(req.user.email)
.then(function(cursor) {
return Promise.promisify(cursor.toArray, cursor)()
@@ -135,7 +135,7 @@ module.exports = function(options) {
})
})
app.get('/api/v1/app/devices', function(req, res) {
app.get('/app/api/v1/devices', function(req, res) {
dbapi.loadDevices()
.then(function(cursor) {
return Promise.promisify(cursor.toArray, cursor)()
@@ -158,7 +158,7 @@ module.exports = function(options) {
})
})
app.get('/api/v1/app/devices/:serial', function(req, res) {
app.get('/app/api/v1/devices/:serial', function(req, res) {
dbapi.loadDevice(req.params.serial)
.then(function(device) {
if (device) {

2
lib/units/auth/ldap.js
View File

@@ -71,7 +71,7 @@ module.exports = function(options) {
res.render('index')
})
app.post('/api/v1/auth/ldap', function(req, res) {
app.post('/auth/api/v1/ldap', function(req, res) {
var log = logger.createLogger('auth-ldap')
log.setLocalIdentifier(req.ip)
switch (req.accepts(['json'])) {

2
lib/units/auth/mock.js
View File

@@ -70,7 +70,7 @@ module.exports = function(options) {
res.render('index')
})
app.post('/api/v1/auth/mock', function(req, res) {
app.post('/auth/api/v1/mock', function(req, res) {
var log = logger.createLogger('auth-mock')
log.setLocalIdentifier(req.ip)
switch (req.accepts(['json'])) {

2
lib/units/device/support/storage.js
View File

@@ -15,7 +15,7 @@ module.exports = syrup.serial()
var resolver = Promise.defer()
var req = request.post({
url: util.format('%sapi/v1/s/%s', options.storageUrl, type)
url: util.format('%ss/api/v1/%s', options.storageUrl, type)
}
, function(err, res, body) {
if (err) {

8
lib/units/poorxy/index.js
View File

@@ -19,7 +19,7 @@ module.exports = function(options) {
app.set('case sensitive routing', true)
app.set('trust proxy', true)
;['/api/v1/auth/*', '/static/auth/*', '/auth/*'].forEach(function(route) {
;['/static/auth/*', '/auth/*'].forEach(function(route) {
app.all(route, function(req, res) {
proxy.web(req, res, {
target: options.authUrl
@@ -27,7 +27,7 @@ module.exports = function(options) {
})
})
;['/api/v1/s/image/*'].forEach(function(route) {
;['/s/api/v1/image/*'].forEach(function(route) {
app.all(route, function(req, res) {
proxy.web(req, res, {
target: options.storagePluginImageUrl
@@ -35,7 +35,7 @@ module.exports = function(options) {
})
})
;['/api/v1/s/apk/*'].forEach(function(route) {
;['/s/api/v1/apk/*'].forEach(function(route) {
app.all(route, function(req, res) {
proxy.web(req, res, {
target: options.storagePluginApkUrl
@@ -43,7 +43,7 @@ module.exports = function(options) {
})
})
;['/api/v1/s*'].forEach(function(route) {
;['/s/api/v1/*'].forEach(function(route) {
app.all(route, function(req, res) {
proxy.web(req, res, {
target: options.storageUrl

4
lib/units/storage/plugins/apk/index.js
View File

@@ -22,7 +22,7 @@ module.exports = function(options) {
app.set('case sensitive routing', true)
app.set('trust proxy', true)
app.get('/api/v1/s/apk/:id/*/manifest', function(req, res) {
app.get('/s/api/v1/apk/:id/*/manifest', function(req, res) {
download(url.resolve(options.storageUrl, req.url), {
dir: options.cacheDir
})
@@ -43,7 +43,7 @@ module.exports = function(options) {
})
})
app.get('/api/v1/s/apk/:id/*', function(req, res) {
app.get('/s/api/v1/apk/:id/*', function(req, res) {
proxy.web(req, res, {
target: options.storageUrl
})

2
lib/units/storage/plugins/image/index.js
View File

@@ -20,7 +20,7 @@ module.exports = function(options) {
app.set('trust proxy', true)
app.get(
'/api/v1/s/image/:id/*'
'/s/api/v1/image/:id/*'
, requtil.limit(options.concurrency, function(req, res) {
return get(req.url, options)
.then(function(stream) {

10
lib/units/storage/temp.js
View File

@@ -30,7 +30,7 @@ module.exports = function(options) {
log.info('Cleaning up inactive resource "%s"', id)
})
app.post('/api/v1/s/:type/download', function(req, res) {
app.post('/s/api/v1/:type/download', function(req, res) {
requtil.validate(req, function() {
req.checkBody('url').notEmpty()
})
@@ -55,7 +55,7 @@ module.exports = function(options) {
, id: file.id
, name: file.name
, href: util.format(
'/api/v1/s/%s/%s%s'
'/s/api/v1/%s/%s%s'
, req.params.type
, file.id
, file.name
@@ -83,7 +83,7 @@ module.exports = function(options) {
})
})
app.post('/api/v1/s/:type', function(req, res) {
app.post('/s/api/v1/:type', function(req, res) {
var form = new formidable.IncomingForm()
Promise.promisify(form.parse, form)(req)
.spread(function(fields, files) {
@@ -110,7 +110,7 @@ module.exports = function(options) {
, id: file.id
, name: file.name
, href: util.format(
'/api/v1/s/%s/%s%s'
'/s/api/v1/%s/%s%s'
, req.params.type
, file.id
, file.name
@@ -133,7 +133,7 @@ module.exports = function(options) {
})
})
app.get('/api/v1/s/:type/:id/*', function(req, res) {
app.get('/s/api/v1/:type/:id/*', function(req, res) {
var file = storage.retrieve(req.params.id)
if (file) {
res.set('Content-Type', file.type)