Skip to content

Commit 6b10d04

Browse files
fix sails-auth for sails 0.12.5
1 parent 540c10d commit 6b10d04

File tree

5 files changed

+382
-363
lines changed

5 files changed

+382
-363
lines changed

.babelrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"presets": ["es2015"],
3+
"plugins": [
4+
"add-module-exports"
5+
]
6+
}

api/hooks/auth/index.js

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1+
let authHook = sails.hooks.auth;
2+
13
import _ from 'lodash'
24
import Marlinspike from 'marlinspike'
35

4-
class Auth extends Marlinspike {
6+
if (!authHook) {
7+
class Auth extends Marlinspike {
58

6-
constructor (sails) {
7-
super(sails, module)
8-
}
9+
constructor(sails) {
10+
super(sails, module)
11+
}
912

10-
configure () {
11-
sails.services.passport.loadStrategies()
13+
configure() {
14+
sails.services.passport.loadStrategies()
15+
}
1216
}
17+
18+
authHook = Marlinspike.createSailsHook(Auth)
1319
}
1420

15-
export default Marlinspike.createSailsHook(Auth)
21+
export default authHook;

api/policies/passport.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* @param {Function} next
2323
*/
2424
var http = require('http'),
25-
passport = require('passport'),
25+
passport = sails.services.passport,
2626
_ = require('lodash');
2727

2828
var methods = ['login', 'logIn', 'logout', 'logOut', 'isAuthenticated', 'isUnauthenticated'];

0 commit comments

Comments
 (0)