Remove @ldapjs/codes dependency

Author: jsumners

lib/controls/server-side-sorting-response-control.js

@@ -4,23 +4,23 @@ const { BerReader, BerWriter } = require('@ldapjs/asn1')
 const Control = require('../control')
 const isObject = require('../is-object')
 const hasOwn = require('../has-own')
-const CODES = require('@ldapjs/codes')
+const { resultCodes: RESULT_CODES } = require('@ldapjs/protocol')
 
 const validCodeNames = [
-  'LDAP_SUCCESS',
-  'LDAP_OPERATIONS_ERROR',
-  'LDAP_TIME_LIMIT_EXCEEDED',
-  'LDAP_STRONG_AUTH_REQUIRED',
-  'LDAP_ADMIN_LIMIT_EXCEEDED',
-  'LDAP_NO_SUCH_ATTRIBUTE',
-  'LDAP_INAPPROPRIATE_MATCHING',
-  'LDAP_INSUFFICIENT_ACCESS_RIGHTS',
-  'LDAP_BUSY',
-  'LDAP_UNWILLING_TO_PERFORM',
-  'LDAP_OTHER'
+  'SUCCESS',
+  'OPERATIONS_ERROR',
+  'TIME_LIMIT_EXCEEDED',
+  'STRONGER_AUTH_REQUIRED',
+  'ADMIN_LIMIT_EXCEEDED',
+  'NO_SUCH_ATTRIBUTE',
+  'INAPPROPRIATE_MATCHING',
+  'INSUFFICIENT_ACCESS_RIGHTS',
+  'BUSY',
+  'UNWILLING_TO_PERFORM',
+  'OTHER'
 ]
 
-const filteredCodes = Object.entries(CODES).filter(([k, v]) => validCodeNames.includes(k))
+const filteredCodes = Object.entries(RESULT_CODES).filter(([k, v]) => validCodeNames.includes(k))
 const VALID_CODES = new Map([
   ...filteredCodes,
   ...filteredCodes.map(([k, v]) => { return [v, k] })
@@ -119,7 +119,7 @@ class ServerSideSortingResponseControl extends Control {
     writer.startSequence(0x30)
     writer.writeEnumeration(this.value.result)
     /* istanbul ignore else */
-    if (this.value.result !== CODES.LDAP_SUCCESS && this.value.failedAttribute) {
+    if (this.value.result !== RESULT_CODES.SUCCESS && this.value.failedAttribute) {
       writer.writeString(this.value.failedAttribute, 0x80)
     }
     writer.endSequence()

lib/controls/server-side-sorting-response-control.test.js

@@ -20,7 +20,7 @@ tap.test('constructor', t => {
       type: '1.2.840.113556.1.4.474',
       criticality: true,
       value: {
-        result: SSSRC.RESPONSE_CODES.get('LDAP_OPERATIONS_ERROR'),
+        result: SSSRC.RESPONSE_CODES.get('OPERATIONS_ERROR'),
         failedAttribute: 'foo'
       }
     })
@@ -112,7 +112,7 @@ tap.test('toBer', t => {
 
     const control = new SSSRC({
       value: {
-        result: SSSRC.RESPONSE_CODES.get('LDAP_OPERATIONS_ERROR'),
+        result: SSSRC.RESPONSE_CODES.get('OPERATIONS_ERROR'),
         failedAttribute: 'foo'
       }
     })

lib/controls/virtual-list-view-response-control.js

@@ -4,24 +4,24 @@ const { Ber, BerReader, BerWriter } = require('@ldapjs/asn1')
 const isObject = require('../is-object')
 const hasOwn = require('../has-own')
 const Control = require('../control')
-const CODES = require('@ldapjs/codes')
+const { resultCodes: RESULT_CODES } = require('@ldapjs/protocol')
 
 const validCodeNames = [
-  'LDAP_SUCCESS',
-  'LDAP_OPERATIONS_ERROR',
-  'LDAP_UNWILLING_TO_PERFORM',
-  'LDAP_INSUFFICIENT_ACCESS_RIGHTS',
-  'LDAP_BUSY',
-  'LDAP_TIME_LIMIT_EXCEEDED',
-  'LDAP_STRONG_AUTH_REQUIRED',
-  'LDAP_ADMIN_LIMIT_EXCEEDED',
-  'LDAP_SORT_CONTROL_MISSING',
-  'LDAP_INDEX_RANGE_ERROR',
-  'LDAP_CONTROL_ERROR',
-  'LDAP_OTHER'
+  'SUCCESS',
+  'OPERATIONS_ERROR',
+  'UNWILLING_TO_PERFORM',
+  'INSUFFICIENT_ACCESS_RIGHTS',
+  'BUSY',
+  'TIME_LIMIT_EXCEEDED',
+  'STRONGER_AUTH_REQUIRED',
+  'ADMIN_LIMIT_EXCEEDED',
+  'SORT_CONTROL_MISSING',
+  'OFFSET_RANGE_ERROR',
+  'CONTROL_ERROR',
+  'OTHER'
 ]
 
-const filteredCodes = Object.entries(CODES).filter(([k, v]) => validCodeNames.includes(k))
+const filteredCodes = Object.entries(RESULT_CODES).filter(([k, v]) => validCodeNames.includes(k))
 const VALID_CODES = new Map([
   ...filteredCodes,
   ...filteredCodes.map(([k, v]) => { return [v, k] })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ldapjs/controls",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc.2",
   "description": "LDAP control objects",
   "main": "index.js",
   "scripts": {
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@ldapjs/asn1": "^1.0.1",
-    "@ldapjs/codes": "^1.0.0"
+    "@ldapjs/protocol": "^1.2.1"
   },
   "pre-commit": [
     "lint",