yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 18:29:17 +02:00
Code Issues Releases Wiki Activity

Make auth URLs friendlier to load balancers and allow partials to be loaded as well.

Browse source
This commit is contained in:
Simo Kinnunen 2014-07-15 20:14:35 +09:00
parent beff3d88f2
commit b19e1784ab
6 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/roles/auth/ldap.js
View file

@ -50,7 +50,7 @@ module.exports = function(options) {
next() next()
}) })
app.get('/partials/:name', function(req, res) { app.get('/static/auth/ldap/views/partials/:name.html', function(req, res) {
var whitelist = { var whitelist = {
'signin': true 'signin': true
} }
@ -64,6 +64,10 @@ module.exports = function(options) {
}) })
app.get('/', function(req, res) { app.get('/', function(req, res) {
res.redirect('/auth/ldap')
})
app.get('/auth/ldap', function(req, res) {
res.render('index') res.render('index')
}) })

6
lib/roles/auth/mock.js
View file

@ -49,7 +49,7 @@ module.exports = function(options) {
next() next()
}) })
app.get('/partials/:name', function(req, res) { app.get('/static/auth/mock/views/partials/:name.html', function(req, res) {
var whitelist = { var whitelist = {
'signin': true 'signin': true
} }
@ -63,6 +63,10 @@ module.exports = function(options) {
}) })
app.get('/', function(req, res) { app.get('/', function(req, res) {
res.redirect('/auth/mock')
})
app.get('/auth/mock', function(req, res) {
res.render('index') res.render('index')
}) })

6
res/auth/ldap/scripts/routes.js
View file

@ -5,12 +5,12 @@ define(['./app'], function(app) {
, function($routeProvider, $locationProvider) { , function($routeProvider, $locationProvider) {
$locationProvider.html5Mode(true) $locationProvider.html5Mode(true)
$routeProvider $routeProvider
.when('/', { .when('/auth/ldap', {
templateUrl: 'partials/signin' templateUrl: '/static/auth/ldap/views/signin.html'
, controller: 'SignInCtrl' , controller: 'SignInCtrl'
}) })
.otherwise({ .otherwise({
redirectTo: '/' redirectTo: '/auth/ldap'
}) })
} }
]) ])

2
res/auth/ldap/views/index.jade
View file

@ -7,5 +7,5 @@ html
include partials/styles include partials/styles
body(ng-cloak) body(ng-cloak)
div(ng-view) div(ng-view)
script(src='/static/bower_components/requirejs/require.js', data-main='static/auth/ldap/scripts/main.js') script(src='/static/bower_components/requirejs/require.js', data-main='/static/auth/ldap/scripts/main.js')
script(src='/static/bower_components/stf-analytics/analytics.js') script(src='/static/bower_components/stf-analytics/analytics.js')

6
res/auth/mock/scripts/routes.js
View file

@ -5,12 +5,12 @@ define(['./app'], function(app) {
, function($routeProvider, $locationProvider) { , function($routeProvider, $locationProvider) {
$locationProvider.html5Mode(true) $locationProvider.html5Mode(true)
$routeProvider $routeProvider
.when('/', { .when('/auth/mock', {
templateUrl: 'partials/signin' templateUrl: '/static/auth/mock/views/partials/signin.html'
, controller: 'SignInCtrl' , controller: 'SignInCtrl'
}) })
.otherwise({ .otherwise({
redirectTo: '/' redirectTo: '/auth/mock'
}) })
} }
]) ])

2
res/auth/mock/views/index.jade
View file

@ -7,5 +7,5 @@ html
include partials/styles include partials/styles
body(ng-cloak) body(ng-cloak)
div(ng-view) div(ng-view)
script(src='/static/bower_components/requirejs/require.js', data-main='static/auth/mock/scripts/main.js') script(src='/static/bower_components/requirejs/require.js', data-main='/static/auth/mock/scripts/main.js')
script(src='/static/bower_components/stf-analytics/analytics.js') script(src='/static/bower_components/stf-analytics/analytics.js')