diff options
| author | Christoph (Sheogorath) Kern | 2018-11-28 13:27:38 +0100 |
|---|---|---|
| committer | GitHub | 2018-11-28 13:27:38 +0100 |
| commit | b749d50e207379e927743f1ca72e55868191814b (patch) | |
| tree | b8a064df56387fbd156c9607d2b6a4ad27c8105b /lib | |
| parent | 769a1c4ccbebfa92d839bc2a6ec2b54017154a0a (diff) | |
| parent | 35a9f72a06dd1ed28f16161028b5407dd3511ac0 (diff) | |
Merge pull request #1082 from cloudyu/pull
Fix wrong config options
In `./lib/web/auth/` some config includes still used `config.serverurl` instead of the correct `config.serverURL`. This causes wrong URL in worst case.
This patch should fix those problems and migrate the wrong statements to camelcase.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/web/auth/oauth2/index.js | 4 | ||||
| -rw-r--r-- | lib/web/auth/openid/index.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/web/auth/oauth2/index.js b/lib/web/auth/oauth2/index.js index b9160f6e..57ab9b9a 100644 --- a/lib/web/auth/oauth2/index.js +++ b/lib/web/auth/oauth2/index.js @@ -100,7 +100,7 @@ oauth2Auth.get('/auth/oauth2', function (req, res, next) { // github auth callback oauth2Auth.get('/auth/oauth2/callback', passport.authenticate('oauth2', { - successReturnToOrRedirect: config.serverurl + '/', - failureRedirect: config.serverurl + '/' + successReturnToOrRedirect: config.serverURL + '/', + failureRedirect: config.serverURL + '/' }) ) diff --git a/lib/web/auth/openid/index.js b/lib/web/auth/openid/index.js index 96f61807..c45c6d71 100644 --- a/lib/web/auth/openid/index.js +++ b/lib/web/auth/openid/index.js @@ -55,7 +55,7 @@ openIDAuth.post('/auth/openid', urlencodedParser, function (req, res, next) { // openID auth callback openIDAuth.get('/auth/openid/callback', passport.authenticate('openid', { - successReturnToOrRedirect: config.serverurl + '/', - failureRedirect: config.serverurl + '/' + successReturnToOrRedirect: config.serverURL + '/', + failureRedirect: config.serverURL + '/' }) ) |