Commit Graph

5508 Commits

Author SHA1 Message Date
Emily Stark
d19e1f7b3d Merge remote-tracking branch 'origin/devel' into sso
Conflicts:
	packages/accounts-base/accounts_client.js
release/sso-10
2014-01-10 15:21:05 -08:00
David Glasser
e445a4af6a Changes to how Meteor.settings is filled on Galaxy
(a) Prefer $APP_CONFIG over $METEOR_SETTINGS

(b) Allow $APP_CONFIG's settings field to be a string which we
parse (which will be the default soon)
release/sso-9
2014-01-09 16:57:49 -08:00
David Glasser
0b76997e3d Be careful not to send a null ADMIN_APP env var 2014-01-09 15:17:37 -08:00
Michael Bishop
32768a8c05 typo: http => https 2014-01-09 12:47:14 -08:00
David Glasser
6a399dcaf0 Merge remote-tracking branch 'origin/devel' into sso release/sso-8 2014-01-09 10:09:13 -08:00
Emily Stark
d9d4f2139e Add History.md entry for #1616 fix 2014-01-08 22:24:01 -08:00
Emily Stark
6ca5b987fa Merge branch 'fix-issue-1616' into devel
Fixes #1616
2014-01-08 22:22:13 -08:00
Emily Stark
44629cf800 Avoid overwriting fresh tokens from other tabs.
* Before wiping a bad token from storage on reconnect, make sure that
  we're wiping the token that we tried and failed to log in with. Avoids
  logging out another tab that might have gotten a fresh valid token
  while we were logging in with the old, invalid one (though it is still
  theoretically possible).
* In the logoutOtherClients callback, try to log in with the token that
  we get in the response. Accounts for the situation where the server
  disconnects us before the callback runs.
* If we fail to log in with a token found during a localStorage poll,
  make the client logged out.
* Add a test that attempts to simulate one tab getting a fresh new token
  while another tab logs in with an old invalid token on reconnect.
2014-01-08 22:21:38 -08:00
Emily Stark
56d60907cc Simplify logoutOtherClients and fix onReconnect race.
If we called `login` and then called `logoutOtherClients` before the login
result was recieved, then we would end up with no `onReconnect` callback. Fixed
by just leaving `onReconnect` as it is when calling `logoutOtherClients` -- we
were only replacing `onReconnect` for the sake of tests that have since been
rewritten much more cleanly.

Fixes #1616.
2014-01-08 22:21:38 -08:00
Sashko Stubailo
1ee8f2aff6 Fix issues with meteorid popup release/sso-7 2014-01-08 17:06:15 -08:00
Sashko Stubailo
bd9e5d8057 Add log warning when there is an error with OAuth 2014-01-08 14:42:01 -08:00
Sashko Stubailo
8d6e2c72e5 Fix typo in callback name in Facebook package 2014-01-08 11:36:09 -08:00
David Glasser
837f842e7b Fix $type:4 queries and sorts with numeric indices
Add lots of sort tests.  All new tests in this commit have been verified
against MongoDB (2.5).
release/oplog-operators release/oplog-with-operators
2014-01-07 22:53:36 -08:00
David Glasser
6a6df0bff7 Add #594 fix to History 2014-01-07 21:17:36 -08:00
David Glasser
bab936eac9 Patch _.each to not treat {length: 5} as an array
Specifically, in all Underscore "collection" functions which treat their
arguments polymorphically as either "object-like" or "array-like", don't
treat arguments with `x.constructor === Object` as arrays (except for
the 'arguments' object).

Fixes #594. Fixes #1737.
2014-01-07 20:17:47 -08:00
David Glasser
1dc7ccee0f Merge branch 'pr/1732' into devel 2014-01-07 17:24:23 -08:00
David Glasser
8a3f24765b Add Oxford comma
http://www.washingtontimes.com/news/2013/dec/11/comma-twitter-erupts-over-obama-castro-marriage/
2014-01-07 17:23:49 -08:00
Maxime Quandalle
c6bea042b7 Update coffeescript.html 2014-01-07 17:23:34 -08:00
David Glasser
53de3f21ba Improve docs for server-to-server collections
Fixes #1723.
2014-01-07 17:15:06 -08:00
David Glasser
ce77adc22e Remove warning about update/$ 2014-01-07 17:00:18 -08:00
David Glasser
e9f9ec246f Merge branch 'pr/1711' into devel 2014-01-07 16:34:37 -08:00
David Glasser
cc1d47b5c5 Wording tweak. 2014-01-07 16:34:25 -08:00
Denis Gorbachev
f7c3e7621c Update concepts.html 2014-01-07 16:29:49 -08:00
David Glasser
add4f6e015 Disallow {fields:{_id:0}} in observeChanges
This implies it is not allowed in `observe` either, or in cursors
returned from publish functions, or in cursors used in {{#each}}

Why? observeChanges and DDP publication use the ID as part of the
callback/message, and eliding it completely breaks them. Meteor UI uses
the ID with {{#each}} to properly move nodes around instead of
re-rendering. We could try to allow it for `observe` outside of
{{#each}}, but it would feel somewhat inconsistent.
2014-01-06 21:16:23 -08:00
David Glasser
8800564e80 Use OplogObserveDriver for most selectors.
Previously OplogObserveDriver was only used for selectors which
performed equality checks against scalars. Now that we believe minimongo
to be more robust in the face of more MongoDB edge cases, we use
OplogObserveDriver (if configured) for any selector that minimongo can
compile except those containing $near or $where.

(We still do not use OplogObserveDriver for cursors with skip or limit.)
release/release/oplog-with-operators
2014-01-06 17:02:04 -08:00
Emily Stark
8152969597 Merge remote-tracking branch 'origin/devel' into sso 2014-01-06 15:15:02 -08:00
Emily Stark
c74dd9aa62 Add missing 'random' dependency to retry 2014-01-06 15:14:39 -08:00
David Glasser
4f7d14c1f2 Upgrade websocket-driver to 0.3.2
This lowers the max websocket frame length from 1GB to 64MB.

Note that due to #1648, this may not immediately affect existing
checkouts of meteor (but will get into all release builds).
2014-01-03 17:19:59 -08:00
Emily Stark
f4e3a08bae Print human-friendly error messages for common login failures. 2014-01-03 14:31:18 -08:00
Emily Stark
85d8d5300c Confirm that we hit the right URL when revoking tokens.
Require token revoke endpoints to return JSON with a `tokenRevoked` key,
to avoid being fooled by endpoints that don't understand token
revocation but just happened to return 200 status codes.
2014-01-03 13:42:02 -08:00
David Glasser
feac6f03e3 Merge branch 'minimongo-array-updates' into devel
Actually implement updating field 'x.$.y'! Also some related cleanups.
release/mongo-refactor
2014-01-02 23:51:23 -08:00
David Glasser
82739804b8 Implement '$' update for $elemMatch 2014-01-02 23:49:51 -08:00
David Glasser
2063999ce0 Implement '$' update for $near 2014-01-02 23:36:26 -08:00
David Glasser
e3e9cca12a Implement 'a.$.b' modifier
Does not yet work with $near or $elemMatch
2014-01-02 23:00:18 -08:00
David Glasser
5c9e58f2af clean up findModTarget
convert arguments to options
2014-01-02 22:38:50 -08:00
David Glasser
b2e3b08248 Cleanup/modernization of modify.js 2014-01-02 22:07:37 -08:00
David Glasser
0f7e0b54ca Refactor: optionify LocalCollection._modify arg 2014-01-02 21:47:24 -08:00
David Glasser
a8d1798e88 JSON -> EJSON in test 2014-01-02 21:45:13 -08:00
David Glasser
02aad697d7 remove random type tag in test 2014-01-02 21:42:51 -08:00
David Glasser
31d89599a7 rename args in andSomeMatchers 2014-01-02 21:41:49 -08:00
David Glasser
a1627071a7 set arrayIndex in most places
(not $near or $elemMatch yet)
2014-01-02 21:41:49 -08:00
Emily Stark
83fde36e00 Fix hashed login token test failures caused by merge mishap. release/sso-6 2014-01-02 18:23:56 -08:00
David Glasser
7d448eb0d8 Throw on missing distance 2014-01-02 17:58:07 -08:00
Emily Stark
b296dcbdf2 Merge remote-tracking branch 'origin/devel' into sso
Conflicts:
	packages/accounts-base/accounts_server.js
release/sso-5
2014-01-02 17:46:01 -08:00
David Glasser
cf78cefc8b Refactor selector-vs-modifier/projection code
Now they are methods on a compiled Matcher rather than doing their own
operator parsing from scratch. This means less work is happening for
each oplog entry, and it also localizes knowledge about selector
parsing.
2014-01-02 17:34:04 -08:00
David Glasser
e48f08cefc NOTES update. 2014-01-02 16:46:23 -08:00
David Glasser
b383f2cd6a Use $near distances as lowest-priority sort key
Previously, $near was only used in the absence of a sort specifier; now,
it's also used as a tie-breaker when there is a sort specifier. (Tested:
this matches MongoDB.)
2014-01-02 15:37:49 -08:00
David Glasser
63b13ff665 Clear distances passed into _getRawObjects
Add comment suggested by Naomi
2014-01-02 15:37:19 -08:00
Emily Stark
fde0a90b9b Add _noYieldsAllowed safety belts to Deps functions.
Because we want to start experimenting with using Deps.autorun on the
server.
2014-01-02 14:45:43 -08:00
Emily Stark
b44855d70d Send user agent info with galaxy logins 2013-12-31 18:38:03 -08:00