couchbase 4.4.3 → 4.4.4

package/dist/usermanager.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserManager = exports.Group = exports.UserAndMetadata = exports.User = exports.RoleAndOrigin = exports.RoleAndDescription = exports.Role = exports.Origin = void 0;
-const errors_1 = require("./errors");
-const httpexecutor_1 = require("./httpexecutor");
+const bindingutilities_1 = require("./bindingutilities");
 const utilities_1 = require("./utilities");
 /**
  * Contains information about an origin for a role.
@@ -20,7 +19,7 @@ class Origin {
     /**
      * @internal
      */
-    static _fromNsData(data) {
+    static _fromCppData(data) {
         return new Origin({
             type: data.type,
             name: data.name,
@@ -46,33 +45,24 @@ class Role {
     /**
      * @internal
      */
-    static _fromNsData(data) {
+    static _fromCppData(data) {
         return new Role({
-            name: data.role,
-            bucket: data.bucket_name,
-            scope: data.scope_name,
-            collection: data.collection_name,
+            name: data.name,
+            bucket: data.bucket,
+            scope: data.scope,
+            collection: data.collection,
         });
     }
     /**
      * @internal
      */
-    static _toNsStr(role) {
-        if (typeof role === 'string') {
-            return role;
-        }
-        if (role.bucket && role.scope && role.collection) {
-            return `${role.name}[${role.bucket}:${role.scope}:${role.collection}]`;
-        }
-        else if (role.bucket && role.scope) {
-            return `${role.name}[${role.bucket}:${role.scope}]`;
-        }
-        else if (role.bucket) {
-            return `${role.name}[${role.bucket}]`;
-        }
-        else {
-            return role.name;
-        }
+    static _toCppData(data) {
+        return {
+            name: data.name,
+            bucket: data.bucket,
+            scope: data.scope,
+            collection: data.collection,
+        };
     }
 }
 exports.Role = Role;
@@ -93,9 +83,10 @@ class RoleAndDescription extends Role {
     /**
      * @internal
      */
-    static _fromNsData(data) {
+    static _fromCppData(data) {
+        const role = Role._fromCppData(data);
         return new RoleAndDescription({
-            ...Role._fromNsData(data),
+            ...role,
             displayName: data.name,
             description: data.description,
         });
@@ -118,16 +109,15 @@ class RoleAndOrigin extends Role {
     /**
      * @internal
      */
-    static _fromNsData(data) {
-        let origins;
-        if (data.origins) {
-            origins = data.origins.map((originData) => Origin._fromNsData(originData));
-        }
-        else {
-            origins = [];
-        }
+    static _fromCppData(data) {
+        const origins = data.origins.map((origin) => Origin._fromCppData(origin));
         return new RoleAndOrigin({
-            ...Role._fromNsData(data),
+            ...Role._fromCppData({
+                name: data.name,
+                bucket: data.bucket,
+                scope: data.scope,
+                collection: data.collection,
+            }),
             origins,
         });
     }
@@ -151,48 +141,38 @@ class User {
     /**
      * @internal
      */
-    static _fromNsData(data) {
-        let roles;
-        if (data.roles) {
-            roles = data.roles
-                .filter((roleData) => {
-                // Check whether or not this role has originated from the user directly
-                // or whether it was through a group.
-                if (!roleData.origins || roleData.origins.length === 0) {
-                    return false;
-                }
-                return !!roleData.origins.find((originData) => originData.type === 'user');
-            })
-                .map((roleData) => Role._fromNsData(roleData));
-        }
-        else {
-            roles = [];
-        }
+    static _fromCppData(data) {
         return new User({
-            username: data.id,
-            displayName: data.name,
+            username: data.username,
+            displayName: data.display_name,
             groups: data.groups,
-            roles: roles,
+            roles: data.roles.map((role) => Role._fromCppData(role)),
             password: undefined,
         });
     }
     /**
      * @internal
      */
-    static _toNsData(user) {
-        let groups = undefined;
-        if (user.groups && user.groups.length > 0) {
-            groups = user.groups;
-        }
-        let roles = undefined;
-        if (user.roles && user.roles.length > 0) {
-            roles = user.roles.map((role) => Role._toNsStr(role)).join(',');
+    static _toCppData(data) {
+        const roles = [];
+        if (data.roles) {
+            data.roles.forEach((role) => {
+                if (typeof role === 'string') {
+                    roles.push({
+                        name: role,
+                    });
+                }
+                else {
+                    roles.push(Role._toCppData(role));
+                }
+            });
         }
         return {
-            name: user.displayName,
-            groups: groups,
-            password: user.password,
+            username: data.username,
+            display_name: data.displayName,
+            groups: data.groups ? data.groups : [],
             roles: roles,
+            password: data.password,
         };
     }
 }
@@ -226,20 +206,23 @@ class UserAndMetadata extends User {
     /**
      * @internal
      */
-    static _fromNsData(data) {
-        let effectiveRoles;
-        if (data.roles) {
-            effectiveRoles = data.roles.map((roleData) => RoleAndOrigin._fromNsData(roleData));
-        }
-        else {
-            effectiveRoles = [];
-        }
+    static _fromCppData(data) {
+        const user = User._fromCppData({
+            username: data.username,
+            display_name: data.display_name,
+            groups: data.groups,
+            roles: data.roles,
+            password: data.password,
+        });
+        const effectiveRoles = data.effective_roles.map((erole) => RoleAndOrigin._fromCppData(erole));
         return new UserAndMetadata({
-            ...User._fromNsData(data),
-            domain: data.domain,
+            ...user,
+            domain: (0, bindingutilities_1.authDomainFromCpp)(data.domain),
             effectiveRoles: effectiveRoles,
             effectiveRolesAndOrigins: effectiveRoles,
-            passwordChanged: new Date(data.password_change_date),
+            passwordChanged: data.password_changed
+                ? new Date(data.password_changed)
+                : undefined,
             externalGroups: data.external_groups,
         });
     }
@@ -263,33 +246,36 @@ class Group {
     /**
      * @internal
      */
-    static _fromNsData(data) {
-        let roles;
-        if (data.roles) {
-            roles = data.roles.map((roleData) => Role._fromNsData(roleData));
-        }
-        else {
-            roles = [];
-        }
+    static _fromCppData(data) {
         return new Group({
-            name: data.id,
-            description: data.description,
-            roles: roles,
+            name: data.name,
+            description: data.description || '',
+            roles: data.roles.map((role) => Role._fromCppData(role)),
             ldapGroupReference: data.ldap_group_reference,
         });
     }
     /**
      * @internal
      */
-    static _toNsData(group) {
-        let roles = undefined;
-        if (group.roles && group.roles.length > 0) {
-            roles = group.roles.map((role) => Role._toNsStr(role)).join(',');
+    static _toCppData(data) {
+        const roles = [];
+        if (data.roles) {
+            data.roles.forEach((role) => {
+                if (typeof role === 'string') {
+                    roles.push({
+                        name: role,
+                    });
+                }
+                else {
+                    roles.push(Role._toCppData(role));
+                }
+            });
         }
         return {
-            description: group.description,
+            name: data.name,
+            description: data.description,
             roles: roles,
-            ldap_group_reference: group.ldapGroupReference,
+            ldap_group_reference: data.ldapGroupReference,
         };
     }
 }
@@ -307,9 +293,6 @@ class UserManager {
     constructor(cluster) {
         this._cluster = cluster;
     }
-    get _http() {
-        return new httpexecutor_1.HttpExecutor(this._cluster.conn);
-    }
     /**
      * Returns a specific user by their username.
      *
@@ -325,24 +308,20 @@ class UserManager {
         if (!options) {
             options = {};
         }
-        const domainName = options.domainName || 'local';
+        const cppDomain = (0, bindingutilities_1.authDomainToCpp)(options.domainName || 'local');
         const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const res = await this._http.request({
-                type: httpexecutor_1.HttpServiceType.Management,
-                method: httpexecutor_1.HttpMethod.Get,
-                path: `/settings/rbac/users/${domainName}/${username}`,
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementUserGet({
+                username: username,
+                domain: cppDomain,
                 timeout: timeout,
-            });
-            if (res.statusCode !== 200) {
-                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                if (res.statusCode === 404) {
-                    throw new errors_1.UserNotFoundError(undefined, errCtx);
+            }, (cppErr, resp) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
                 }
-                throw new errors_1.CouchbaseError('failed to get the user', undefined, errCtx);
-            }
-            const userData = JSON.parse(res.body.toString());
-            return UserAndMetadata._fromNsData(userData);
+                wrapCallback(null, UserAndMetadata._fromCppData(resp.user));
+            });
         }, callback);
     }
     /**
@@ -359,22 +338,20 @@ class UserManager {
         if (!options) {
             options = {};
         }
-        const domainName = options.domainName || 'local';
+        const cppDomain = (0, bindingutilities_1.authDomainToCpp)(options.domainName || 'local');
         const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const res = await this._http.request({
-                type: httpexecutor_1.HttpServiceType.Management,
-                method: httpexecutor_1.HttpMethod.Get,
-                path: `/settings/rbac/users/${domainName}`,
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementUserGetAll({
+                domain: cppDomain,
                 timeout: timeout,
+            }, (cppErr, resp) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
+                }
+                const users = resp.users.map((user) => UserAndMetadata._fromCppData(user));
+                wrapCallback(null, users);
             });
-            if (res.statusCode !== 200) {
-                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                throw new errors_1.CouchbaseError('failed to get users', undefined, errCtx);
-            }
-            const usersData = JSON.parse(res.body.toString());
-            const users = usersData.map((userData) => UserAndMetadata._fromNsData(userData));
-            return users;
         }, callback);
     }
     /**
@@ -392,22 +369,20 @@ class UserManager {
         if (!options) {
             options = {};
         }
-        const domainName = options.domainName || 'local';
+        const cppDomain = (0, bindingutilities_1.authDomainToCpp)(options.domainName || 'local');
         const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const userData = User._toNsData(user);
-            const res = await this._http.request({
-                type: httpexecutor_1.HttpServiceType.Management,
-                method: httpexecutor_1.HttpMethod.Put,
-                path: `/settings/rbac/users/${domainName}/${user.username}`,
-                contentType: 'application/x-www-form-urlencoded',
-                body: (0, utilities_1.cbQsStringify)(userData),
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementUserUpsert({
+                user: User._toCppData(user),
+                domain: cppDomain,
                 timeout: timeout,
+            }, (cppErr) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
+                }
+                wrapCallback(err);
             });
-            if (res.statusCode !== 200) {
-                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                throw new errors_1.CouchbaseError('failed to upsert user', undefined, errCtx);
-            }
         }, callback);
     }
     /**
@@ -426,23 +401,17 @@ class UserManager {
             options = {};
         }
         const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const passwordData = { password: newPassword };
-            const res = await this._http.request({
-                type: httpexecutor_1.HttpServiceType.Management,
-                method: httpexecutor_1.HttpMethod.Post,
-                path: `/controller/changePassword`,
-                contentType: 'application/x-www-form-urlencoded',
-                body: (0, utilities_1.cbQsStringify)(passwordData),
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementChangePassword({
+                newPassword: newPassword,
                 timeout: timeout,
-            });
-            if (res.statusCode !== 200) {
-                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                if (res.statusCode === 404) {
-                    throw new errors_1.UserNotFoundError(undefined, errCtx);
+            }, (cppErr) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
                 }
-                throw new errors_1.CouchbaseError('failed to change password for the current user', undefined, errCtx);
-            }
+                wrapCallback(err);
+            });
         }, callback);
     }
     /**
@@ -460,22 +429,20 @@ class UserManager {
         if (!options) {
             options = {};
         }
-        const domainName = options.domainName || 'local';
+        const cppDomain = (0, bindingutilities_1.authDomainToCpp)(options.domainName || 'local');
         const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const res = await this._http.request({
-                type: httpexecutor_1.HttpServiceType.Management,
-                method: httpexecutor_1.HttpMethod.Delete,
-                path: `/settings/rbac/users/${domainName}/${username}`,
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementUserDrop({
+                username: username,
+                domain: cppDomain,
                 timeout: timeout,
-            });
-            if (res.statusCode !== 200) {
-                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                if (res.statusCode === 404) {
-                    throw new errors_1.UserNotFoundError(undefined, errCtx);
+            }, (cppErr) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
                 }
-                throw new errors_1.CouchbaseError('failed to drop the user', undefined, errCtx);
-            }
+                wrapCallback(err);
+            });
         }, callback);
     }
     /**
@@ -493,20 +460,17 @@ class UserManager {
             options = {};
         }
         const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const res = await this._http.request({
-                type: httpexecutor_1.HttpServiceType.Management,
-                method: httpexecutor_1.HttpMethod.Get,
-                path: `/settings/rbac/roles`,
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementRoleGetAll({
                 timeout: timeout,
+            }, (cppErr, resp) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
+                }
+                const roles = resp.roles.map((role) => Role._fromCppData(role));
+                wrapCallback(null, roles);
             });
-            if (res.statusCode !== 200) {
-                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                throw new errors_1.CouchbaseError('failed to get roles', undefined, errCtx);
-            }
-            const rolesData = JSON.parse(res.body.toString());
-            const roles = rolesData.map((roleData) => RoleAndDescription._fromNsData(roleData));
-            return roles;
         }, callback);
     }
     /**
@@ -525,22 +489,17 @@ class UserManager {
             options = {};
         }
         const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const res = await this._http.request({
-                type: httpexecutor_1.HttpServiceType.Management,
-                method: httpexecutor_1.HttpMethod.Get,
-                path: `/settings/rbac/groups/${groupName}`,
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementGroupGet({
+                name: groupName,
                 timeout: timeout,
-            });
-            if (res.statusCode !== 200) {
-                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                if (res.statusCode === 404) {
-                    throw new errors_1.GroupNotFoundError(undefined, errCtx);
+            }, (cppErr, resp) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
                 }
-                throw new errors_1.CouchbaseError('failed to get the group', undefined, errCtx);
-            }
-            const groupData = JSON.parse(res.body.toString());
-            return Group._fromNsData(groupData);
+                wrapCallback(null, Group._fromCppData(resp.group));
+            });
         }, callback);
     }
     /**
@@ -558,20 +517,17 @@ class UserManager {
             options = {};
         }
         const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const res = await this._http.request({
-                type: httpexecutor_1.HttpServiceType.Management,
-                method: httpexecutor_1.HttpMethod.Get,
-                path: `/settings/rbac/groups`,
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementGroupGetAll({
                 timeout: timeout,
+            }, (cppErr, resp) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
+                }
+                const groups = resp.groups.map((group) => Group._fromCppData(group));
+                wrapCallback(null, groups);
             });
-            if (res.statusCode !== 200) {
-                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                throw new errors_1.CouchbaseError('failed to get groups', undefined, errCtx);
-            }
-            const groupsData = JSON.parse(res.body.toString());
-            const groups = groupsData.map((groupData) => Group._fromNsData(groupData));
-            return groups;
         }, callback);
     }
     /**
@@ -590,20 +546,17 @@ class UserManager {
             options = {};
         }
         const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const groupData = Group._toNsData(group);
-            const res = await this._http.request({
-                type: httpexecutor_1.HttpServiceType.Management,
-                method: httpexecutor_1.HttpMethod.Put,
-                path: `/settings/rbac/groups/${group.name}`,
-                contentType: 'application/x-www-form-urlencoded',
-                body: (0, utilities_1.cbQsStringify)(groupData),
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementGroupUpsert({
+                group: Group._toCppData(group),
                 timeout: timeout,
+            }, (cppErr) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
+                }
+                wrapCallback(err);
             });
-            if (res.statusCode !== 200) {
-                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                throw new errors_1.CouchbaseError('failed to upsert group', undefined, errCtx);
-            }
         }, callback);
     }
     /**
@@ -622,20 +575,17 @@ class UserManager {
             options = {};
         }
         const timeout = options.timeout || this._cluster.managementTimeout;
-        return utilities_1.PromiseHelper.wrapAsync(async () => {
-            const res = await this._http.request({
-                type: httpexecutor_1.HttpServiceType.Management,
-                method: httpexecutor_1.HttpMethod.Delete,
-                path: `/settings/rbac/groups/${groupName}`,
+        return utilities_1.PromiseHelper.wrap((wrapCallback) => {
+            this._cluster.conn.managementGroupDrop({
+                name: groupName,
                 timeout: timeout,
-            });
-            if (res.statusCode !== 200) {
-                const errCtx = httpexecutor_1.HttpExecutor.errorContextFromResponse(res);
-                if (res.statusCode === 404) {
-                    throw new errors_1.GroupNotFoundError(undefined, errCtx);
+            }, (cppErr) => {
+                const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
+                if (err) {
+                    return wrapCallback(err, null);
                 }
-                throw new errors_1.CouchbaseError('failed to drop the group', undefined, errCtx);
-            }
+                wrapCallback(err);
+            });
         }, callback);
     }
 }

package/dist/utilities.js

@@ -40,9 +40,8 @@ class PromiseHelper {
         // callback specified.  We directly return the promise.
         if (callback) {
             const prom = fn();
-            prom
-                .then((res) => callback(null, res))
-                .catch((err) => callback(err, null));
+            prom.then((res) => callback(null, res));
+            prom.catch((err) => callback(err, null));
             return prom;
         }
         return fn();
@@ -62,9 +61,8 @@ class PromiseHelper {
             });
         });
         if (callback) {
-            prom
-                .then((res) => callback(null, res))
-                .catch((err) => callback(err, null));
+            prom.then((res) => callback(null, res));
+            prom.catch((err) => callback(err, null));
         }
         return prom;
     }

package/dist/utilities_internal.js

@@ -9,10 +9,9 @@ function generateClientString() {
     // off as some Node.js versions insert strange characters into
     // the version identifiers (mainly newlines and such).
     /* eslint-disable-next-line @typescript-eslint/no-var-requires */
-    const couchnodeVer = require('../package.json').version.trim();
     const nodeVer = process.versions.node.trim();
     const v8Ver = process.versions.v8.trim();
     const sslVer = process.versions.openssl.trim();
-    return `couchnode/${couchnodeVer} (node/${nodeVer}; v8/${v8Ver}; ssl/${sslVer})`;
+    return `node/${nodeVer}; v8/${v8Ver}; ssl/${sslVer}`;
 }
 exports.generateClientString = generateClientString;

package/package.json

@@ -54,7 +54,7 @@
     "type": "git",
     "url": "http://github.com/couchbase/couchnode.git"
   },
-  "version": "4.4.3",
+  "version": "4.4.4",
   "config": {
     "native": false
   },
@@ -79,13 +79,13 @@
     ]
   },
   "optionalDependencies": {
-    "@couchbase/couchbase-darwin-arm64-napi": "4.4.3",
-    "@couchbase/couchbase-darwin-x64-napi": "4.4.3",
-    "@couchbase/couchbase-linux-arm64-napi": "4.4.3",
-    "@couchbase/couchbase-linuxmusl-arm64-napi": "4.4.3",
-    "@couchbase/couchbase-linuxmusl-x64-napi": "4.4.3",
-    "@couchbase/couchbase-linux-x64-napi": "4.4.3",
-    "@couchbase/couchbase-win32-x64-napi": "4.4.3"
+    "@couchbase/couchbase-darwin-arm64-napi": "4.4.4",
+    "@couchbase/couchbase-darwin-x64-napi": "4.4.4",
+    "@couchbase/couchbase-linux-arm64-napi": "4.4.4",
+    "@couchbase/couchbase-linuxmusl-arm64-napi": "4.4.4",
+    "@couchbase/couchbase-linuxmusl-x64-napi": "4.4.4",
+    "@couchbase/couchbase-linux-x64-napi": "4.4.4",
+    "@couchbase/couchbase-win32-x64-napi": "4.4.4"
   },
   "files": [
     "LICENSE",
@@ -93,6 +93,7 @@
     "CONTRIBUTING.md",
     "package.json",
     "README.md",
+    "BUILDING.md",
     "couchbase-sdk-nodejs-black-duck-manifest.yaml",
     "scripts/*.js",
     "src/*.{c,h}pp",