status-im/realm-js
2
0
Fork 0
mirror of https://github.com/status-im/realm-js.git synced 2025-02-22 19:28:33 +00:00
Code Issues Projects Releases Wiki Activity

remove unneded server argument for adminUser, update care and sync dependencies

Browse Source
This commit is contained in:
Ari Lazier 2016-10-26 17:20:34 -07:00
parent e52351fc50
commit 60d9da1b44
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/user-methods.js
View File

@ -65,12 +65,12 @@ module.exports = function(realmConstructor) {
}
var methods = {};
methods['adminUser'] = function(server, token) {
methods['adminUser'] = function(token) {
var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
return v.toString(16);
});
var user = realmConstructor.Sync.User.createUser(server, uuid, token, true);
var user = realmConstructor.Sync.User.createUser('', uuid, token, true);
return user;
}

9
scripts/download-core.sh
View File

@ -5,7 +5,7 @@ set -o pipefail
# Set to "latest" for the latest build.
: ${REALM_CORE_VERSION:=2.1.0}
: ${REALM_SYNC_VERSION:=1.0.0-BETA-2.0}
: ${REALM_SYNC_VERSION:=1.0.0-BETA-3.3}
if [ "$1" = '--version' ]; then
echo "$REALM_CORE_VERSION"
@ -15,7 +15,6 @@ fi
# The 'node' argument will result in realm-node build being downloaded.
if [ "$1" = 'node' ]; then
CORE_DIR="core-node"
SYNC_DIR="sync-node"
if [ "$(uname)" = 'Darwin' ]; then
PLATFORM_TAG="node-osx-"
@ -26,11 +25,12 @@ if [ "$1" = 'node' ]; then
fi
else
CORE_DIR='core'
SYNC_DIR='sync'
PLATFORM_TAG=""
SYNC_PLATFORM_TAG="cocoa-"
fi
SYNC_DIR='sync'
SYNC_PLATFORM_TAG="cocoa-"
CORE_DOWNLOAD_FILE="realm-core-$PLATFORM_TAG$REALM_CORE_VERSION.tar.xz"
SYNC_DOWNLOAD_FILE="realm-sync-$SYNC_PLATFORM_TAG$REALM_SYNC_VERSION.tar.xz"
@ -56,6 +56,7 @@ download_core() {
mkdir -p "$TMP_DIR"
if [ ! -f "$TAR" ]; then
echo "https://static.realm.io/downloads/$SERVER_DIR/$DOWNLOAD_FILE"
curl -f -L -s "https://static.realm.io/downloads/$SERVER_DIR/$DOWNLOAD_FILE" -o "$TMP_TAR" ||
die "Downloading $DIR failed. Please try again once you have an Internet connection."
mv "$TMP_TAR" "$TAR"

2
src/object-store

@ -1 +1 @@
Subproject commit e4a0ff9493c1559fae7ec64a42fa87dc52be8fd2
Subproject commit d8f5765c574357635e09e25cb2bad58c68d08939