From 8e43eb7441cbd8be1ed769912c9da0c46d95d931 Mon Sep 17 00:00:00 2001 From: Ari Lazier Date: Tue, 18 Apr 2017 10:58:50 -0700 Subject: [PATCH 1/2] use notifier fix in latest object store, update core --- dependencies.list | 2 +- src/js_sync.hpp | 2 +- src/object-store | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.list b/dependencies.list index 5eecf97c..d4f2e4aa 100644 --- a/dependencies.list +++ b/dependencies.list @@ -1,5 +1,5 @@ PACKAGE_NAME=realm-js VERSION=1.2.0 -REALM_CORE_VERSION=2.5.1 +REALM_CORE_VERSION=2.6.0 REALM_SYNC_VERSION=1.5.0 REALM_OBJECT_SERVER_VERSION=1.3.0 diff --git a/src/js_sync.hpp b/src/js_sync.hpp index 6776b9cd..5dea24c8 100644 --- a/src/js_sync.hpp +++ b/src/js_sync.hpp @@ -123,7 +123,7 @@ void UserClass::create_user(ContextType ctx, FunctionType, ObjectType this_ob Value::validated_to_string(ctx, arguments[1]), Value::validated_to_string(ctx, arguments[2]), (std::string)Value::validated_to_string(ctx, arguments[0]), - Value::validated_to_boolean(ctx, arguments[3]))); + Value::validated_to_boolean(ctx, arguments[3]) ? SyncUser::TokenType::Admin : SyncUser::TokenType::Normal)); return_value.set(create_object>(ctx, user)); } diff --git a/src/object-store b/src/object-store index dd68cd72..91b460fa 160000 --- a/src/object-store +++ b/src/object-store @@ -1 +1 @@ -Subproject commit dd68cd727ae8702390f3231ef4df934fe214acd3 +Subproject commit 91b460fa5ad4083bdb5c59955cfd231bb2b25c54 From e1479026c6cdf16f0960664228178ee787e114ab Mon Sep 17 00:00:00 2001 From: Radu Tutueanu Date: Wed, 19 Apr 2017 10:22:04 +0300 Subject: [PATCH 2/2] Update sync version --- dependencies.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.list b/dependencies.list index d4f2e4aa..8a44bc5a 100644 --- a/dependencies.list +++ b/dependencies.list @@ -1,5 +1,5 @@ PACKAGE_NAME=realm-js VERSION=1.2.0 REALM_CORE_VERSION=2.6.0 -REALM_SYNC_VERSION=1.5.0 +REALM_SYNC_VERSION=1.5.2 REALM_OBJECT_SERVER_VERSION=1.3.0