Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create package for workaround for meteor/meteor#4862.
- Loading branch information
0 parents
commit 9270bc0
Showing
10 changed files
with
361 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
#.editorconfig | ||
# Meteor adapted EditorConfig, http://EditorConfig.org | ||
# By RaiX 2013 | ||
|
||
root = true | ||
|
||
[*.js] | ||
end_of_line = lf | ||
insert_final_newline = true | ||
indent_style = space | ||
indent_size = 2 | ||
trim_trailing_whitespace = true | ||
charset = utf-8 | ||
max_line_length = 80 | ||
indent_brace_style = 1TBS | ||
spaces_around_operators = true | ||
quote_type = auto | ||
# curly_bracket_next_line = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
client/compatibility | ||
packages |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,133 @@ | ||
//.jshintrc | ||
{ | ||
// JSHint Meteor Configuration File | ||
// Match the Meteor Style Guide | ||
// | ||
// By @raix with contributions from @aldeed and @awatson1978 | ||
// Source https://github.com/raix/Meteor-jshintrc | ||
// | ||
// See http://jshint.com/docs/ for more details | ||
|
||
"maxerr" : 50, // {int} Maximum error before stopping | ||
|
||
// Enforcing | ||
"bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.) | ||
"camelcase" : true, // true: Identifiers must be in camelCase | ||
"curly" : true, // true: Require {} for every new block or scope | ||
"eqeqeq" : true, // true: Require triple equals (===) for comparison | ||
"forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty() | ||
"immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());` | ||
"indent" : 2, // {int} Number of spaces to use for indentation | ||
"latedef" : false, // true: Require variables/functions to be defined before being used | ||
"newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()` | ||
"noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee` | ||
"noempty" : true, // true: Prohibit use of empty blocks | ||
"nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment) | ||
"plusplus" : false, // true: Prohibit use of `++` & `--` | ||
"quotmark" : false, // Quotation mark consistency: | ||
// false : do nothing (default) | ||
// true : ensure whatever is used is consistent | ||
// "single" : require single quotes | ||
// "double" : require double quotes | ||
"undef" : true, // true: Require all non-global variables to be declared (prevents global leaks) | ||
"unused" : true, // true: Require all defined variables be used | ||
"strict" : true, // true: Requires all functions run in ES5 Strict Mode | ||
"trailing" : true, // true: Prohibit trailing whitespaces | ||
"maxparams" : false, // {int} Max number of formal params allowed per function | ||
"maxdepth" : false, // {int} Max depth of nested blocks (within functions) | ||
"maxstatements" : false, // {int} Max number statements per function | ||
"maxcomplexity" : false, // {int} Max cyclomatic complexity per function | ||
"maxlen" : 80, // {int} Max number of characters per line | ||
|
||
// Relaxing | ||
"asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons) | ||
"boss" : false, // true: Tolerate assignments where comparisons would be expected | ||
"debug" : false, // true: Allow debugger statements e.g. browser breakpoints. | ||
"eqnull" : false, // true: Tolerate use of `== null` | ||
"es5" : false, // true: Allow ES5 syntax (ex: getters and setters) | ||
"esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`) | ||
"moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features) | ||
// (ex: `for each`, multiple try/catch, function expression…) | ||
"evil" : false, // true: Tolerate use of `eval` and `new Function()` | ||
"expr" : false, // true: Tolerate `ExpressionStatement` as Programs | ||
"funcscope" : false, // true: Tolerate defining variables inside control statements" | ||
"globalstrict" : true, // true: Allow global "use strict" (also enables 'strict') | ||
"iterator" : false, // true: Tolerate using the `__iterator__` property | ||
"lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block | ||
"laxbreak" : false, // true: Tolerate possibly unsafe line breakings | ||
"laxcomma" : false, // true: Tolerate comma-first style coding | ||
"loopfunc" : false, // true: Tolerate functions being defined in loops | ||
"multistr" : false, // true: Tolerate multi-line strings | ||
"proto" : false, // true: Tolerate using the `__proto__` property | ||
"scripturl" : false, // true: Tolerate script-targeted URLs | ||
"smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment | ||
"shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;` | ||
"sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation | ||
"supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;` | ||
"validthis" : false, // true: Tolerate using this in a non-constructor function | ||
|
||
// Environments | ||
"browser" : true, // Web Browser (window, document, etc) | ||
"couch" : false, // CouchDB | ||
"devel" : true, // Development/debugging (alert, confirm, etc) | ||
"dojo" : false, // Dojo Toolkit | ||
"jquery" : false, // jQuery | ||
"mootools" : false, // MooTools | ||
"node" : false, // Node.js | ||
"nonstandard" : false, // Widely adopted globals (escape, unescape, etc) | ||
"prototypejs" : false, // Prototype and Scriptaculous | ||
"rhino" : false, // Rhino | ||
"worker" : false, // Web Workers | ||
"wsh" : false, // Windows Scripting Host | ||
"yui" : false, // Yahoo User Interface | ||
//"meteor" : false, // Meteor.js | ||
|
||
// Legacy | ||
"nomen" : false, // true: Prohibit dangling `_` in variables | ||
"onevar" : false, // true: Allow only one `var` statement per function | ||
"passfail" : false, // true: Stop on first error | ||
"white" : false, // true: Check against strict whitespace and indentation rules | ||
|
||
// Custom globals, from http://docs.meteor.com, in the order they appear there | ||
"globals" : { | ||
"Meteor": false, | ||
"DDP": false, | ||
"Mongo": false, //Meteor.Collection renamed to Mongo.Collection | ||
"Session": false, | ||
"Accounts": false, | ||
"Template": false, | ||
"Blaze": false, //UI is being renamed Blaze | ||
"UI": false, | ||
"Match": false, | ||
"check": false, | ||
"Tracker": false, //Deps renamed to Tracker | ||
"Deps": false, | ||
"ReactiveVar": false, | ||
"EJSON": false, | ||
"HTTP": false, | ||
"Email": false, | ||
"Assets": false, | ||
"Handlebars": false, // https://github.com/meteor/meteor/wiki/Handlebars | ||
"Package": false, | ||
"App": false, //mobile-config.js | ||
|
||
// Meteor internals | ||
"DDPServer": false, | ||
"global": false, | ||
"Log": false, | ||
"MongoInternals": false, | ||
"process": false, | ||
"WebApp": false, | ||
"WebAppInternals": false, | ||
|
||
// globals useful when creating Meteor packages | ||
"Npm": false, | ||
"Tinytest": false, | ||
|
||
// common Meteor packages | ||
"Random": false, | ||
"_": false, // Underscore.js | ||
"$": false, // jQuery | ||
"Router": false // iron-router | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
sudo: required | ||
language: node_js | ||
node_js: | ||
- "0.10" | ||
|
||
before_install: | ||
- "curl -L http://git.io/ejPSng | /bin/sh" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
accounts-base@1.2.0 | ||
base64@1.0.3 | ||
binary-heap@1.0.3 | ||
brettle:accounts-testing-support@0.2.0 | ||
brettle:workaround-issue-4331@0.0.2 | ||
brettle:workaround-issue-4862@0.0.1 | ||
callback-hook@1.0.3 | ||
check@1.0.5 | ||
ddp@1.1.0 | ||
ejson@1.0.6 | ||
geojson-utils@1.0.3 | ||
id-map@1.0.3 | ||
json@1.0.3 | ||
local-test:brettle:workaround-issue-4862@0.0.1 | ||
localstorage@1.0.3 | ||
logging@1.0.7 | ||
meteor@1.1.6 | ||
minimongo@1.0.8 | ||
mongo@1.1.0 | ||
ordered-dict@1.0.3 | ||
random@1.0.3 | ||
retry@1.0.3 | ||
service-configuration@1.0.4 | ||
tinytest@1.0.5 | ||
tracker@1.0.7 | ||
underscore@1.0.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
The MIT License (MIT) | ||
|
||
Copyright (c) 2015 Dean Brettle | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
this software and associated documentation files (the "Software"), to deal in | ||
the Software without restriction, including without limitation the rights to | ||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
the Software, and to permit persons to whom the Software is furnished to do so, | ||
subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in all | ||
copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# brettle:workaround-issue-4862 | ||
|
||
[![Build Status](https://travis-ci.org/brettle/meteor-accounts-workaround-issue-4862.svg?branch=master)](https://travis-ci.org/brettle/meteor-accounts-workaround-issue-4862) | ||
|
||
Workaround [Meteor issue #4862](https://github.com/meteor/meteor/issues/4862) so | ||
that `Meteor.user()` and `Meteor.userId()` work in callbacks registered with | ||
`Accounts.onLogin()` and `Accounts.onLoginFailure()` on the server. | ||
|
||
## Installation | ||
|
||
```sh | ||
meteor add brettle:workaround-issue-4862 | ||
``` | ||
|
||
## Usage | ||
|
||
Just install it and it should work. | ||
|
||
## How it Works | ||
|
||
It monkey patches `Accounts.onLogin()` and `Accounts.onLoginFailure()` so that | ||
during registration `Meteor.bindEnvironment()` is monkey patched to not bind | ||
the registering environment to the callback. This ensures that callback will run | ||
in the environment of the login method invocation. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
"use strict"; | ||
|
||
Package.describe({ | ||
name: 'brettle:workaround-issue-4862', | ||
version: '0.0.1', | ||
summary: | ||
'Workaround Meteor issue 4862 - user/userId broken in server onLogin', | ||
git: 'https://github.com/brettle/meteor-workaround-issue-4862', | ||
documentation: 'README.md' | ||
}); | ||
|
||
Package.onUse(function(api) { | ||
api.versionsFrom('1.0.4'); | ||
api.use('underscore', 'server'); | ||
api.use('accounts-base', 'server'); | ||
api.imply('accounts-base'); | ||
api.addFiles('workaround-issue-4862.js', 'server'); | ||
}); | ||
|
||
Package.onTest(function(api) { | ||
api.use('tinytest'); | ||
api.use('brettle:accounts-testing-support'); | ||
api.use('brettle:workaround-issue-4862'); | ||
api.addFiles('workaround-issue-4862-tests.js', 'server'); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/* globals Accounts */ | ||
"use strict"; | ||
|
||
Tinytest.add( | ||
'brettle:workaround-issue-4862 - Workaround meteor bug #4862', | ||
function (test) { | ||
var makeTestingCallback = function(cbName) { | ||
return function () { | ||
try { | ||
Meteor.userId(); | ||
Meteor.user(); | ||
test.ok(); | ||
} catch (ex) { | ||
test.fail('Unexpected exception in ' + cbName + ' callback:' + ex); | ||
} | ||
return true; | ||
}; | ||
}; | ||
|
||
var validateLoginStopper = Accounts.validateLoginAttempt( | ||
makeTestingCallback('validateLoginAttempt')); | ||
var onLoginStopper = Accounts.onLogin( | ||
makeTestingCallback('onLogin')); | ||
var onLoginFailureStopper = Accounts.onLoginFailure( | ||
makeTestingCallback('onLoginFailure')); | ||
|
||
var connection = DDP.connect(Meteor.absoluteUrl()); | ||
|
||
try { | ||
// Successful login | ||
Meteor.users.remove({ 'services.test1.name': "testname" }); | ||
connection.call('login', { test1: "testname" }); | ||
|
||
// Failing login (bogus service) | ||
try { | ||
connection.call('login', { bogusLoginService: "testname" }); | ||
} catch (ex) { | ||
test.instanceOf(ex, Meteor.Error, 'Unexpected exception'); | ||
} | ||
} finally { | ||
validateLoginStopper.stop(); | ||
onLoginStopper.stop(); | ||
onLoginFailureStopper.stop(); | ||
} | ||
} | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
// Workaround Meteor issue #4862 by registering handlers with | ||
// Meteor.bindEnvironment effectively disabled. | ||
|
||
"use strict"; | ||
/* globals Accounts */ | ||
|
||
// If meteor version >= 1.2, this issues is fixed, so do nothing. | ||
if (Accounts._onLoginHook) { | ||
return; | ||
} | ||
|
||
Accounts.validateLoginAttempt = wrapUnbound(Accounts.validateLoginAttempt); | ||
Accounts.onLogin = wrapUnbound(Accounts.onLogin); | ||
Accounts.onLoginFailure = wrapUnbound(Accounts.onLoginFailure); | ||
|
||
|
||
// Return a function that will run the passed function with | ||
// Meteor.bindEnvironment effectively disabled | ||
function wrapUnbound(func) { | ||
return function( /* arguments */ ) { | ||
var self = this; | ||
var saved = Meteor.bindEnvironment; | ||
try { | ||
Meteor.bindEnvironment = dontBindEnvironment; | ||
return func.apply(self, arguments); | ||
} finally { | ||
Meteor.bindEnvironment = saved; | ||
} | ||
return; | ||
}; | ||
} | ||
|
||
// Copied from Meteor.bindEnvironment and removed all the env stuff. | ||
function dontBindEnvironment(func, onException, _this) { | ||
if (!onException || typeof(onException) === 'string') { | ||
var description = onException || "callback of async function"; | ||
onException = function(error) { | ||
Meteor._debug( | ||
"Exception in " + description + ":", | ||
error && error.stack || error | ||
); | ||
}; | ||
} | ||
|
||
return function( /* arguments */ ) { | ||
var args = _.toArray(arguments); | ||
|
||
var runAndHandleExceptions = function() { | ||
var ret; | ||
try { | ||
ret = func.apply(_this, args); | ||
} catch (e) { | ||
onException(e); | ||
} | ||
return ret; | ||
}; | ||
|
||
return runAndHandleExceptions(); | ||
}; | ||
} |