diff --git a/src/hooks/index.js b/src/hooks/index.js index 6b19587f..43bee0b9 100644 --- a/src/hooks/index.js +++ b/src/hooks/index.js @@ -7,7 +7,6 @@ import setUserId from './set-user-id'; import toLowerCase from './to-lower-case'; import verifyToken from './verify-token'; import populateUser from './populate-user'; -import normalizeAuthToken from './normalize-auth-token'; let hooks = { hashPassword, @@ -18,8 +17,7 @@ let hooks = { setUserId, toLowerCase, verifyToken, - populateUser, - normalizeAuthToken + populateUser }; export default hooks; diff --git a/src/hooks/normalize-auth-token.js b/src/hooks/normalize-auth-token.js deleted file mode 100644 index 981f1191..00000000 --- a/src/hooks/normalize-auth-token.js +++ /dev/null @@ -1,23 +0,0 @@ -export default function() { - return function(hook) { - const hasDataToken = hook.data && hook.data.token; - const hasQueryToken = hook.params.query && hook.params.query.token; - - if (!hook.params.token) { - if (hasDataToken) { - hook.params.token = hook.data.token; - } - else if (hasQueryToken) { - hook.params.token = hook.params.query.token; - } - } - - if (hasDataToken) { - delete hook.data.token; - } - - if (hasQueryToken) { - delete hook.params.query.token; - } - }; -} \ No newline at end of file diff --git a/src/index.js b/src/index.js index b9f655ac..82a50000 100644 --- a/src/index.js +++ b/src/index.js @@ -19,11 +19,6 @@ export default function(providers) { const app = this; let _super = app.setup; - // Add mixin to normalize the auth token on the params - app.mixins.push(function(service){ - service.before(hooks.normalizeAuthToken()); - }); - // REST middleware if (app.rest) { debug('registering REST authentication middleware');