wip

docs/sync.js

@@ -209,7 +209,7 @@ class User {
      * @param {string} adminToken - existing admin token
      * @param {string} server - authentication server
      * @return {User} - admin user populated with the given token and server
-     * @throws {Error} If token or server is invalid.
+     * @throws {Error} If admin token or server is invalid.
      */
     static adminUser(adminToken, server) {}
 

src/js_sync.hpp

@@ -150,10 +150,12 @@ void UserClass<T>::admin_user(ContextType ctx, FunctionType, ObjectType this_obj
         Value::validated_to_string(ctx, arguments[0], "authServerUrl"),
         Value::validated_to_string(ctx, arguments[1], "refreshToken")
     ));
-    if (user) {
+    if ((*user)->is_admin()) {
         return_value.set(create_object<T, UserClass<T>>(ctx, user));
     }
-    throw std::runtime_error("Invalid token or server.");
+    else {
+        throw std::runtime_error("Invalid admin token or server.");
+    }
 }
 
 template<typename T>

src/object-store

@@ -1 +1 @@
-Subproject commit 0b1a2ad7bc1269d4399785240a525e587cd9ddda
+Subproject commit 001dc5f8e5f2bb6ebb95f511339c347410710b6a

tests/js/index.js

@@ -23,30 +23,30 @@ const Realm = require('realm');
 global.enableSyncTests = Realm.Sync;
 
 var TESTS = {
-/*    ListTests: require('./list-tests'),
+    ListTests: require('./list-tests'),
     LinkingObjectsTests: require('./linkingobjects-tests'),
     ObjectTests: require('./object-tests'),
     RealmTests: require('./realm-tests'),
     ResultsTests: require('./results-tests'),
     QueryTests: require('./query-tests'),
-    MigrationTests: require('./migration-tests'),*/
+    MigrationTests: require('./migration-tests'),
     // GarbageCollectionTests: require('./garbage-collection'),
 };
 
 // encryption is not supported on windows
 if (!(typeof process === 'object' && process.platform === 'win32')) {
-//    TESTS.EncryptionTests = require('./encryption-tests');
+    TESTS.EncryptionTests = require('./encryption-tests');
 }
 
 // If sync is enabled, run the sync tests
 if (global.enableSyncTests) {
-  //  TESTS.UserTests = require('./user-tests');
+    TESTS.UserTests = require('./user-tests');
     TESTS.SessionTests = require('./session-tests');
 
     // FIXME: Permission tests currently fail in chrome debugging mode.
     if (typeof navigator === 'undefined' ||
       !/Chrome/.test(navigator.userAgent)) { // eslint-disable-line no-undef
-    // TESTS.PermissionTests = require('./permission-tests');
+        TESTS.PermissionTests = require('./permission-tests');
     }
 }
 

tests/js/session-tests.js

@@ -249,31 +249,6 @@ module.exports = {
             });
     },
 
-    testRealmOpenAsyncInvalidToken() {
-        if (!isNodeProccess) {
-            return Promise.resolve();
-        }
-
-        const username = uuid();
-        const realmName = uuid();
-
-        return runOutOfProcess(__dirname + '/download-api-helper.js', username, realmName, REALM_MODULE_PATH)
-            .then(() => {
-                const invalidFeatureToken = 'THIS_IS_INVALID';
-                const url = `http://localhost:9080/~/${realmName}`;
-                return new Promise((resolve, reject) => {
-                    try {
-                        const user = Realm.Sync.User.adminUser(invalidFeatureToken, url);
-                    }
-                    catch (e) {
-                        TestCase.assertTrue(e == 'Error: Invalid token or server.');
-                        resolve();
-                    }
-                    reject();
-                });
-            });
-    },
-
     testRealmOpenAsyncNoSchema() {
         if (!isNodeProccess) {
             return Promise.resolve();

tests/js/user-tests.js

@@ -371,6 +371,37 @@ module.exports = {
     });
   },
 
+  testAdminUser() {
+      return new Promise((resolve, reject) => {
+          if (!isNodeProcess) {
+              resolve();
+          }
+
+          // FIXME: check if adminUser() returns user iff valid token/server
+          let didThrow = false;
+          try {
+              let user = Realm.Sync.User.adminUser('THIS_IS_INVALID', 'http://localhost:9080');
+          }
+          catch (e) {
+              didThrow = true;
+              TestCase.assertTrue(e === 'Error: Invalid admin token or server.');
+          }
+          TestCase.assertTrue(didThrow);
+
+          didThrow = false;
+          try {
+              Realm.Sync.User.adminUser('', 'http://foo.bar:9080');
+          }
+          catch (e) {
+              didThrow = true;
+              TestCase.assertTrue(e === 'Error: Invalid admin token or server.');
+          }
+          TestCase.assertTrue(didThrow);
+          resolve();
+      });
+  }
+
+
   /* This test fails because of realm-object-store #243 . We should use 2 users.
   testSynchronizeChangesWithTwoClientsAndOneUser() {
     // Test Schema
@@ -432,4 +463,3 @@ module.exports = {
   }, */
 
 };
-