1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 18:29:17 +02:00

Support custom auth URLs in stf local and map oauth2 to the correct URL by default.

This commit is contained in:
Simo Kinnunen 2015-07-08 12:50:09 +09:00
parent afa30eff71
commit 751fda6b30

View file

@ -826,6 +826,9 @@ program
, 'auth type' , 'auth type'
, String , String
, 'mock') , 'mock')
.option('-a, --auth-url <url>'
, 'URL to auth client'
, String)
.option('--auth-port <port>' .option('--auth-port <port>'
, 'auth port' , 'auth port'
, Number , Number
@ -965,11 +968,11 @@ program
'app' 'app'
, '--port', options.appPort , '--port', options.appPort
, '--secret', options.authSecret , '--secret', options.authSecret
, '--auth-url', util.format( , '--auth-url', options.authUrl || util.format(
'http://%s:%d/auth/%s/' 'http://%s:%d/auth/%s/'
, options.publicIp , options.publicIp
, options.poorxyPort , options.poorxyPort
, options.authType , ({oauth2: 'oauth'}[options.authType]) || options.authType
) )
, '--websocket-url', util.format( , '--websocket-url', util.format(
'http://%s:%d/' 'http://%s:%d/'