ldapjs / controls Goto Github PK

diff --git a/index.js b/ldapjs-controls/index.js
index 9f260b7..0b85eeb 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { Ber } = require('@ldapjs/asn1')
+const { BerTypes } = require('@ldapjs/asn1')
 
 const Control = require('./lib/control')
 const EntryChangeNotificationControl = require('./lib/controls/entry-change-notification-control')
@@ -32,10 +32,10 @@ module.exports = {
       /* istanbul ignore else */
       if (ber.offset < end) {
         /* istanbul ignore else */
-        if (ber.peek() === Ber.Boolean) { opts.criticality = ber.readBoolean() }
+        if (ber.peek() === BerTypes.Boolean) { opts.criticality = ber.readBoolean() }
       }
 
-      if (ber.offset < end) { opts.value = ber.readString(Ber.OctetString, true) }
+      if (ber.offset < end) { opts.value = ber.readString(BerTypes.OctetString, true) }
     }
 
     let control
diff --git a/lib/controls/paged-results-control.js b/ldapjs-controls/lib/controls/paged-results-control.js
index fe7dc5f..82fcf23 100644
--- a/lib/controls/paged-results-control.js
+++ b/lib/controls/paged-results-control.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { Ber, BerReader, BerWriter } = require('@ldapjs/asn1')
+const { BerTypes, BerReader, BerWriter } = require('@ldapjs/asn1')
 const isObject = require('../is-object')
 const hasOwn = require('../has-own')
 const Control = require('../control')
@@ -71,7 +71,7 @@ class PagedResultsControl extends Control {
     if (ber.readSequence()) {
       this._value = {}
       this._value.size = ber.readInt()
-      this._value.cookie = ber.readString(Ber.OctetString, true)
+      this._value.cookie = ber.readString(BerTypes.OctetString, true)
       // readString returns '' instead of a zero-length buffer
       if (!this._value.cookie) {
         this._value.cookie = Buffer.alloc(0)
@@ -84,14 +84,14 @@ class PagedResultsControl extends Control {
     writer.startSequence()
     writer.writeInt(this._value.size)
     if (this._value.cookie && this._value.cookie.length > 0) {
-      writer.writeBuffer(this._value.cookie, Ber.OctetString)
+      writer.writeBuffer(this._value.cookie, BerTypes.OctetString)
     } else {
       // writeBuffer rejects zero-length buffers
       writer.writeString('')
     }
     writer.endSequence()
 
-    ber.writeBuffer(writer.buffer, Ber.OctetString)
+    ber.writeBuffer(writer.buffer, BerTypes.OctetString)
     return ber
   }
 
diff --git a/lib/controls/server-side-sorting-request-control.js b/ldapjs-controls/lib/controls/server-side-sorting-request-control.js
index 878fa4f..a9e5fc3 100644
--- a/lib/controls/server-side-sorting-request-control.js
+++ b/lib/controls/server-side-sorting-request-control.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { Ber, BerReader, BerWriter } = require('@ldapjs/asn1')
+const { BerTypes, BerReader, BerWriter } = require('@ldapjs/asn1')
 const isObject = require('../is-object')
 const hasOwn = require('../has-own')
 const Control = require('../control')
@@ -84,14 +84,14 @@ class ServerSideSortingRequestControl extends Control {
 
       while (ber.readSequence(0x30)) {
         item = {}
-        item.attributeType = ber.readString(Ber.OctetString)
+        item.attributeType = ber.readString(BerTypes.OctetString)
         /* istanbul ignore else */
         if (ber.peek() === 0x80) {
           item.orderingRule = ber.readString(0x80)
         }
         /* istanbul ignore else */
         if (ber.peek() === 0x81) {
-          item.reverseOrder = (ber._readTag(0x81) !== 0)
+          item.reverseOrder = (ber.readTag(0x81) !== 0)
         }
         this.value.push(item)
       }
@@ -113,7 +113,7 @@ class ServerSideSortingRequestControl extends Control {
       writer.startSequence(0x30)
       /* istanbul ignore else */
       if (hasOwn(item, 'attributeType')) {
-        writer.writeString(item.attributeType, Ber.OctetString)
+        writer.writeString(item.attributeType, BerTypes.OctetString)
       }
       /* istanbul ignore else */
       if (hasOwn(item, 'orderingRule')) {
diff --git a/lib/controls/virtual-list-view-response-control.js b/ldapjs-controls/lib/controls/virtual-list-view-response-control.js
index f9b1efe..f2383d0 100644
--- a/lib/controls/virtual-list-view-response-control.js
+++ b/lib/controls/virtual-list-view-response-control.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { Ber, BerReader, BerWriter } = require('@ldapjs/asn1')
+const { BerTypes, BerReader, BerWriter } = require('@ldapjs/asn1')
 const isObject = require('../is-object')
 const hasOwn = require('../has-own')
 const Control = require('../control')
@@ -106,7 +106,7 @@ class VirtualListViewResponseControl extends Control {
       }
 
       this._value.result = ber.readEnumeration()
-      this._value.cookie = ber.readString(Ber.OctetString, true)
+      this._value.cookie = ber.readString(BerTypes.OctetString, true)
 
       // readString returns '' instead of a zero-length buffer
       if (!this._value.cookie) {
@@ -138,7 +138,7 @@ class VirtualListViewResponseControl extends Control {
 
     writer.writeEnumeration(this.value.result)
     if (this.value.cookie && this.value.cookie.length > 0) {
-      writer.writeBuffer(this.value.cookie, Ber.OctetString)
+      writer.writeBuffer(this.value.cookie, BerTypes.OctetString)
     } else {
       writer.writeString('') // writeBuffer rejects zero-length buffers
     }