Revert "Merge pull request #1409 from realm/kneth/bugfix/invalid-token"
This reverts commit4055c9e047
, reversing changes made tod6b3fcb8b1
.
This commit is contained in:
parent
32a53cd3e5
commit
0b5aa68c62
|
@ -209,7 +209,6 @@ 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 adminToken or server is invalid.
|
||||
*/
|
||||
static adminUser(adminToken, server) {}
|
||||
|
||||
|
|
|
@ -187,19 +187,7 @@ const staticMethods = {
|
|||
|
||||
adminUser(token, server) {
|
||||
checkTypes(arguments, ['string', 'string']);
|
||||
const user = this._adminUser(server, token);
|
||||
// FIXME: find a better way to detect that token or server is invalid
|
||||
// check if object is empty
|
||||
var isEmpty = true;
|
||||
for(var prop in user) {
|
||||
if (user.hasOwnProperty(prop)) {
|
||||
isEmpty = false;
|
||||
}
|
||||
}
|
||||
if (isEmpty) {
|
||||
throw new Error('Invalid adminToken or server.');
|
||||
}
|
||||
return user;
|
||||
return this._adminUser(server, token);
|
||||
},
|
||||
|
||||
register(server, username, password, callback) {
|
||||
|
|
|
@ -371,38 +371,6 @@ 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.message === 'Invalid adminToken or server.');
|
||||
}
|
||||
TestCase.assertTrue(didThrow);
|
||||
|
||||
// FIXME: find a way to set up a proper admin token
|
||||
didThrow = false;
|
||||
try {
|
||||
Realm.Sync.User.adminUser('THIS_IS_VALID', 'http://foo.bar:9080');
|
||||
}
|
||||
catch (e) {
|
||||
didThrow = true;
|
||||
TestCase.assertTrue(e.message === 'Invalid adminToken or server.');
|
||||
}
|
||||
TestCase.assertTrue(didThrow);
|
||||
resolve();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/* This test fails because of realm-object-store #243 . We should use 2 users.
|
||||
testSynchronizeChangesWithTwoClientsAndOneUser() {
|
||||
// Test Schema
|
||||
|
@ -464,3 +432,4 @@ module.exports = {
|
|||
}, */
|
||||
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue