From 235766c7eb7a55276f89e107cee8c4b4f8b64a84 Mon Sep 17 00:00:00 2001 From: mjuniper Date: Mon, 21 Oct 2019 14:41:45 -0600 Subject: [PATCH 1/3] feat(arcgis-rest-portal): add searchUsers function AFFECTS PACKAGES: @esri/arcgis-rest-portal --- package-lock.json | 187 ++++----- packages/arcgis-rest-portal/src/index.ts | 1 + .../src/users/search-users.ts | 37 ++ .../src/util/generic-search.ts | 23 +- .../arcgis-rest-portal/src/util/search.ts | 4 +- .../test/mocks/users/user-search.ts | 388 ++++++++++++++++++ .../test/users/search.test.ts | 42 ++ 7 files changed, 571 insertions(+), 111 deletions(-) create mode 100644 packages/arcgis-rest-portal/src/users/search-users.ts create mode 100644 packages/arcgis-rest-portal/test/mocks/users/user-search.ts create mode 100644 packages/arcgis-rest-portal/test/users/search.test.ts diff --git a/package-lock.json b/package-lock.json index 6faed117a4..3839abd9da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -156,7 +156,7 @@ "@types/mz": { "version": "0.0.32", "resolved": "https://registry.npmjs.org/@types/mz/-/mz-0.0.32.tgz", - "integrity": "sha1-6CSLTkFCTAUu3Bcl3TNlDDE6Nlk=", + "integrity": "sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g==", "dev": true, "requires": { "@types/node": "*" @@ -335,7 +335,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { "is-fullwidth-code-point": "^2.0.0", @@ -438,7 +438,7 @@ "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true }, "are-we-there-yet": { @@ -475,7 +475,7 @@ "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", "dev": true }, "arr-union": { @@ -1347,7 +1347,7 @@ "base": { "version": "0.11.2", "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, "requires": { "cache-base": "^1.0.1", @@ -1371,7 +1371,7 @@ "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { "kind-of": "^6.0.0" @@ -1380,7 +1380,7 @@ "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { "kind-of": "^6.0.0" @@ -1389,7 +1389,7 @@ "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { "is-accessor-descriptor": "^1.0.0", @@ -1651,7 +1651,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { "is-fullwidth-code-point": "^2.0.0", @@ -2013,7 +2013,7 @@ "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "dev": true, "requires": { "collection-visit": "^1.0.0", @@ -2182,7 +2182,7 @@ "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "dev": true, "requires": { "arr-union": "^3.1.0", @@ -2636,7 +2636,7 @@ "configstore": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", - "integrity": "sha1-xvJd767vJt8S3TNBSwAf6BpUP48=", + "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", "dev": true, "requires": { "dot-prop": "^4.1.0", @@ -3971,7 +3971,7 @@ "define-property": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "dev": true, "requires": { "is-descriptor": "^1.0.2", @@ -3981,7 +3981,7 @@ "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { "kind-of": "^6.0.0" @@ -3990,7 +3990,7 @@ "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { "kind-of": "^6.0.0" @@ -3999,7 +3999,7 @@ "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { "is-accessor-descriptor": "^1.0.0", @@ -4191,7 +4191,7 @@ "dot-prop": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=", + "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", "dev": true, "requires": { "is-obj": "^1.0.0" @@ -4551,7 +4551,7 @@ }, "event-stream": { "version": "3.3.4", - "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", "dev": true, "requires": { @@ -4903,7 +4903,7 @@ "fetch-mock": { "version": "5.13.1", "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-5.13.1.tgz", - "integrity": "sha1-lVeUp389ly8WRLms5loP39YPHfc=", + "integrity": "sha512-eWUo2KI4sRGnRu8tKELCBfasALM5BfvrCxdI7J02j3eUM9mf+uYzJkURA0PSn/29JVapVrYFm+z+9XijXu1PdA==", "dev": true, "requires": { "glob-to-regexp": "^0.3.0", @@ -5205,8 +5205,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -5230,15 +5229,13 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5255,22 +5252,19 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -5401,8 +5395,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -5416,7 +5409,6 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5433,7 +5425,6 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5442,15 +5433,13 @@ "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5471,7 +5460,6 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5560,8 +5548,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5575,7 +5562,6 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -5671,8 +5657,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -5714,7 +5699,6 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5736,7 +5720,6 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5785,15 +5768,13 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true, - "optional": true + "dev": true } } }, @@ -5834,7 +5815,7 @@ "gaze": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", - "integrity": "sha1-xEFzPhO5J6yMD/C0w7Az8ogSkko=", + "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { "globule": "^1.0.0" @@ -5924,7 +5905,7 @@ }, "commander": { "version": "2.15.1", - "resolved": "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", "dev": true }, @@ -6536,7 +6517,7 @@ "globule": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", - "integrity": "sha1-Xf+xsZHyLSB5epNptJ6rTpg5aW0=", + "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", "dev": true, "requires": { "glob": "~7.1.1", @@ -6869,7 +6850,7 @@ "husky": { "version": "0.14.3", "resolved": "https://registry.npmjs.org/husky/-/husky-0.14.3.tgz", - "integrity": "sha1-xp7XTi0neXaaF7qDmbVM4LY8EsM=", + "integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==", "dev": true, "requires": { "is-ci": "^1.0.10", @@ -7037,7 +7018,7 @@ "ini": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true }, "inline-source-map": { @@ -7214,7 +7195,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { "is-fullwidth-code-point": "^2.0.0", @@ -7293,7 +7274,7 @@ "os-locale": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { "execa": "^0.7.0", @@ -7334,7 +7315,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { "is-fullwidth-code-point": "^2.0.0", @@ -7465,7 +7446,7 @@ "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, "is-callable": { @@ -7512,7 +7493,7 @@ "is-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", @@ -7523,7 +7504,7 @@ "kind-of": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", "dev": true } } @@ -7687,7 +7668,7 @@ "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "requires": { "isobject": "^3.0.1" @@ -7785,7 +7766,7 @@ "is-url": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", - "integrity": "sha1-BKTfRtKMTP89c9Af8Gq+sxihqlI=", + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", "dev": true }, "is-utf8": { @@ -7797,7 +7778,7 @@ "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true }, "is-wsl": { @@ -7974,19 +7955,19 @@ "jest-docblock": { "version": "21.2.0", "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", - "integrity": "sha1-UVKcOzDV/RWdpgwnzu3Blfr41BQ=", + "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", "dev": true }, "jest-get-type": { "version": "21.2.0", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-21.2.0.tgz", - "integrity": "sha1-9jdqudtLYNgeOfMHScbEZvQNSiM=", + "integrity": "sha512-y2fFw3C+D0yjNSDp7ab1kcd6NUYfy3waPTlD8yWkAtiocJdBRQqNoRqVfMNxgj+IjT0V5cBIHJO0z9vuSSZ43Q==", "dev": true }, "jest-validate": { "version": "21.2.1", "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-21.2.1.tgz", - "integrity": "sha1-zAy8plPNVJN7pPKhEXlndFMN08c=", + "integrity": "sha512-k4HLI1rZQjlU+EC682RlQ6oZvLrE5SCh3brseQc24vbZTxzT/k/3urar5QMCVgjadmSO7lECeGdc6YxnM3yEGg==", "dev": true, "requires": { "chalk": "^2.0.1", @@ -8319,7 +8300,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", + "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", "dev": true, "requires": { "fs-access": "^1.0.0", @@ -8342,7 +8323,7 @@ "karma-firefox-launcher": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz", - "integrity": "sha1-LEcDBFLwRTHrfRPU/HZpYwu5Mzk=", + "integrity": "sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==", "dev": true }, "karma-ie-launcher": { @@ -8672,7 +8653,7 @@ "inquirer": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=", + "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", "dev": true, "requires": { "ansi-escapes": "^3.0.0", @@ -8721,7 +8702,7 @@ "os-locale": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { "execa": "^0.7.0", @@ -8850,7 +8831,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { "is-fullwidth-code-point": "^2.0.0", @@ -8968,7 +8949,7 @@ "lint-staged": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-4.3.0.tgz", - "integrity": "sha1-7Qd5rZpCwNxiuzJE5SKHC0ESWHk=", + "integrity": "sha512-C/Zxslg0VRbsxwmCu977iIs+QyrmW2cyRCPUV5NDFYOH/jtRFHH8ch7ua2fH0voI/nVC3Tpg7DykfgMZySliKw==", "dev": true, "requires": { "app-root-path": "^2.0.0", @@ -9485,7 +9466,7 @@ }, "map-stream": { "version": "0.1.0", - "resolved": "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", "dev": true }, @@ -9630,7 +9611,7 @@ "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true }, "mime-db": { @@ -9673,7 +9654,7 @@ "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { "brace-expansion": "^1.1.7" @@ -9767,7 +9748,7 @@ "mz": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", - "integrity": "sha1-lQCAV6Vsr63CvGPd5/n/aVWUjjI=", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", "dev": true, "requires": { "any-promise": "^1.0.0", @@ -10013,7 +9994,7 @@ "npmlog": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "requires": { "are-we-there-yet": "~1.1.2", @@ -10212,7 +10193,7 @@ "onchange": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/onchange/-/onchange-3.3.0.tgz", - "integrity": "sha1-2pJQsWI+AZ8PcdyK/VYnNAZHK2E=", + "integrity": "sha512-0ZQIdGkhG8Y+r8BIcjjDV93X59KkZ4Cc+ZxA9N+wA/3vm1cvd8/f2NXlCPCZpowSd78eCERk29dtuS8+X97MLg==", "dev": true, "requires": { "arrify": "~1.0.1", @@ -10381,7 +10362,7 @@ }, "opn": { "version": "5.3.0", - "resolved": "http://registry.npmjs.org/opn/-/opn-5.3.0.tgz", + "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz", "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", "dev": true, "requires": { @@ -10489,7 +10470,7 @@ "osenv": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "requires": { "os-homedir": "^1.0.0", @@ -10523,7 +10504,7 @@ "p-map": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", - "integrity": "sha1-5OlPMR6rvIYzoeeZCBZfyiYkG2s=", + "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", "dev": true }, "p-try": { @@ -10943,7 +10924,7 @@ "pretty-format": { "version": "21.2.1", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-21.2.1.tgz", - "integrity": "sha1-rlQH888hBmzQEaobpfzntqLt2zY=", + "integrity": "sha512-ZdWPGYAnYfcVP8yKA3zFjCn8s4/17TeYH28MXuC8vTp0o21eXjbFGcOAXZEaDaOFJjc3h2qa7HQNHNshhvoh2A==", "dev": true, "requires": { "ansi-regex": "^3.0.0", @@ -11010,7 +10991,7 @@ "promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", "dev": true, "requires": { "asap": "~2.0.3" @@ -11298,7 +11279,7 @@ "regex-cache": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=", + "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { "is-equal-shallow": "^0.1.3" @@ -11307,7 +11288,7 @@ "regex-not": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "dev": true, "requires": { "extend-shallow": "^3.0.2", @@ -11567,7 +11548,7 @@ "ret": { "version": "0.1.15", "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", "dev": true }, "rfdc": { @@ -11935,7 +11916,7 @@ "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sass-graph": { "version": "2.2.4", @@ -12011,7 +11992,7 @@ "selenium-webdriver": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz", - "integrity": "sha1-K6h6FmLAILiYjJga5iyyoBKY6vw=", + "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==", "dev": true, "requires": { "jszip": "^3.1.3", @@ -12336,7 +12317,7 @@ "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=", + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "dev": true, "requires": { "base": "^0.11.1", @@ -12381,7 +12362,7 @@ "snapdragon-node": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=", + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "dev": true, "requires": { "define-property": "^1.0.0", @@ -12401,7 +12382,7 @@ "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { "kind-of": "^6.0.0" @@ -12410,7 +12391,7 @@ "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { "kind-of": "^6.0.0" @@ -12419,7 +12400,7 @@ "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { "is-accessor-descriptor": "^1.0.0", @@ -12432,7 +12413,7 @@ "snapdragon-util": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, "requires": { "kind-of": "^3.2.0" @@ -12585,7 +12566,7 @@ "source-map-resolve": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", - "integrity": "sha1-cuLMNAlVQ+Q7LGKyxMENSpBU8lk=", + "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "dev": true, "requires": { "atob": "^2.1.1", @@ -12598,7 +12579,7 @@ "source-map-support": { "version": "0.4.18", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha1-Aoam3ovkJkEzhZTpfM6nXwosWF8=", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { "source-map": "^0.5.6" @@ -12672,7 +12653,7 @@ "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "dev": true, "requires": { "extend-shallow": "^3.0.0" @@ -12681,7 +12662,7 @@ "split2": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz", - "integrity": "sha1-GGsldbz4PoW30YRldWI47k7kJJM=", + "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==", "dev": true, "requires": { "through2": "^2.0.2" @@ -12776,7 +12757,7 @@ }, "stream-combiner": { "version": "0.0.4", - "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", + "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", "dev": true, "requires": { @@ -12998,7 +12979,7 @@ "symlink-dir": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/symlink-dir/-/symlink-dir-1.1.3.tgz", - "integrity": "sha1-sJr5WZr1MQwvt3rcDBYT3uOCzk4=", + "integrity": "sha512-klQgTYk7en8A69nAzZjJdaMXbGCmfh0DU+YLaZG/stHNp00VZSS3Pos238Ua7oCKVw57UszViod4D7RVRH6XHg==", "dev": true, "requires": { "@types/mz": "0.0.32", @@ -13328,7 +13309,7 @@ "to-regex": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "dev": true, "requires": { "define-property": "^2.0.2", @@ -13866,7 +13847,7 @@ "update-notifier": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", - "integrity": "sha1-0HRFk+E/Fh5AassdlAi3LK0Ir/Y=", + "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", "dev": true, "requires": { "boxen": "^1.2.1", @@ -13884,7 +13865,7 @@ "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { "color-convert": "^1.9.0" diff --git a/packages/arcgis-rest-portal/src/index.ts b/packages/arcgis-rest-portal/src/index.ts index a3a7072d62..cb1970bd53 100644 --- a/packages/arcgis-rest-portal/src/index.ts +++ b/packages/arcgis-rest-portal/src/index.ts @@ -27,6 +27,7 @@ export * from "./users/get-user-tags"; export * from "./users/get-user-url"; export * from "./users/invitation"; export * from "./users/notification"; +export * from "./users/search-users"; export * from "./users/update"; export * from "./sharing/access"; diff --git a/packages/arcgis-rest-portal/src/users/search-users.ts b/packages/arcgis-rest-portal/src/users/search-users.ts new file mode 100644 index 0000000000..d6437b34bd --- /dev/null +++ b/packages/arcgis-rest-portal/src/users/search-users.ts @@ -0,0 +1,37 @@ +/* Copyright (c) 2018-2019 Environmental Systems Research Institute, Inc. + * Apache-2.0 */ +import { IAuthenticatedRequestOptions } from "@esri/arcgis-rest-auth"; +import { IAuthenticationManager } from "@esri/arcgis-rest-request"; +import { IPagingParams, IUser } from "@esri/arcgis-rest-types"; +import { SearchQueryBuilder } from "../util/SearchQueryBuilder"; +import { ISearchOptions, ISearchResult } from "../util/search"; +import { genericSearch } from "../util/generic-search"; + +// export interface IUserSearchOptions extends IAuthenticatedRequestOptions, IPagingParams { +// q: string | SearchQueryBuilder; +// sortField?: string; +// sortOrder?: string; +// [key: string]: any; +// } + +export interface IUserSearchOptions extends ISearchOptions { + authentication: IAuthenticationManager; +} + +/** + * ```js + * import { searchItems } from "@esri/arcgis-rest-portal"; + * // + * searchUsers({ q: 'tommy', authentication }) + * .then(response) // response.total => 355 + * ``` + * Search a portal for users. + * + * @param search - A RequestOptions object to pass through to the endpoint. + * @returns A Promise that will resolve with the data from the response. + */ +export function searchUsers( + search: IUserSearchOptions | SearchQueryBuilder +): Promise> { + return genericSearch(search, "user"); +} diff --git a/packages/arcgis-rest-portal/src/util/generic-search.ts b/packages/arcgis-rest-portal/src/util/generic-search.ts index 599e80ebfd..befd3513fe 100644 --- a/packages/arcgis-rest-portal/src/util/generic-search.ts +++ b/packages/arcgis-rest-portal/src/util/generic-search.ts @@ -6,15 +6,15 @@ import { IRequestOptions, appendCustomParams } from "@esri/arcgis-rest-request"; -import { IItem, IGroup } from "@esri/arcgis-rest-types"; +import { IItem, IGroup, IUser } from "@esri/arcgis-rest-types"; import { SearchQueryBuilder } from "./SearchQueryBuilder"; import { getPortalUrl } from "../util/get-portal-url"; import { ISearchOptions, ISearchResult } from "../util/search"; -export function genericSearch( +export function genericSearch( search: string | ISearchOptions | SearchQueryBuilder, - searchType: "item" | "group" + searchType: "item" | "group" | "user" ): Promise> { let url: string; let options: IRequestOptions; @@ -35,9 +35,20 @@ export function genericSearch( ); } - url = - getPortalUrl(options) + - (searchType === "item" ? "/search" : "/community/groups"); + let path = searchType === "item" ? "/search" : "/community/groups"; + switch (searchType) { + case "item": + path = "/search"; + break; + case "group": + path = "/community/groups"; + break; + default: + // "users" + path = "/portals/self/users/search"; + break; + } + url = getPortalUrl(options) + path; // send the request return request(url, options).then(r => { diff --git a/packages/arcgis-rest-portal/src/util/search.ts b/packages/arcgis-rest-portal/src/util/search.ts index 74e13aec65..91ab87361b 100644 --- a/packages/arcgis-rest-portal/src/util/search.ts +++ b/packages/arcgis-rest-portal/src/util/search.ts @@ -2,7 +2,7 @@ * Apache-2.0 */ import { IRequestOptions } from "@esri/arcgis-rest-request"; -import { IPagingParams, IItem, IGroup } from "@esri/arcgis-rest-types"; +import { IPagingParams, IItem, IGroup, IUser } from "@esri/arcgis-rest-types"; import { SearchQueryBuilder } from "./SearchQueryBuilder"; export interface ISearchOptions extends IRequestOptions, IPagingParams { @@ -15,7 +15,7 @@ export interface ISearchOptions extends IRequestOptions, IPagingParams { /** * Results from an item or group search. */ -export interface ISearchResult { +export interface ISearchResult { query: string; // matches the api's form param total: number; start: number; diff --git a/packages/arcgis-rest-portal/test/mocks/users/user-search.ts b/packages/arcgis-rest-portal/test/mocks/users/user-search.ts new file mode 100644 index 0000000000..a3d888b4d9 --- /dev/null +++ b/packages/arcgis-rest-portal/test/mocks/users/user-search.ts @@ -0,0 +1,388 @@ +import { ISearchResult } from "../../../src/util/search"; +import { IUser } from "@esri/arcgis-rest-types"; + +export const UserSearchResponse: ISearchResult = { + query: "role:org_user OR role:org_publisher", + total: 12, + start: 1, + num: 100, + nextStart: -1, + results: [ + { + username: "mjordan_dcdev", + fullName: "Maria Jordan", + availableCredits: -1, + assignedCredits: -1, + firstName: "Maria", + lastName: "Jordan", + preferredView: null, + description: "Product marketer @Esri. ", + email: "mjordan@esri.com", + idpUsername: null, + favGroupId: null, + lastLogin: 1565206730000, + mfaEnabled: false, + access: "org", + storageUsage: 0, + storageQuota: 0, + orgId: "bkrWlSKcjUDFDtgw", + role: "org_publisher", + level: "2", + disabled: false, + tags: [], + culture: "en-US", + region: "WO", + units: "english", + thumbnail: "MariaJpic.jpg", + created: 1555510747000, + modified: 1555542356000, + provider: "arcgis", + groups: [] + }, + { + username: "athomas_dcdev", + fullName: "Amanda Thomas", + availableCredits: -1, + assignedCredits: -1, + firstName: "Amanda", + lastName: "Thomas", + preferredView: null, + description: "null", + email: "athomas@esri.com", + idpUsername: null, + favGroupId: null, + lastLogin: 1568753131000, + mfaEnabled: false, + access: "org", + storageUsage: 0, + storageQuota: 0, + orgId: "bkrWlSKcjUDFDtgw", + role: "org_publisher", + level: "2", + disabled: false, + tags: [ + "hubEventGroupId|bkrWlSKcjUDFDtgw|61aca75b6be045a9a3e8f252304658ab", + "hubInitiativeId|3b68d9e3a0844f09aa9d52cf89bc6b6c", + "hubEventGroupId|bkrWlSKcjUDFDtgw|ae910537937b47fca769712bef0d08f6" + ], + culture: "en-US", + region: "WO", + units: "english", + thumbnail: "hub-profile-1556742417730.png", + created: 1555017048000, + modified: 1568753183000, + provider: "arcgis", + groups: [] + }, + { + username: "service_account_ssl_dcdev", + fullName: "DC Dev Service Account SSL Provisioning", + availableCredits: -1, + assignedCredits: -1, + firstName: "DC Dev Service Account", + lastName: "SSL Provisioning", + preferredView: null, + description: null, + email: "hubjenkins@esri.com", + idpUsername: null, + favGroupId: null, + lastLogin: -1, + mfaEnabled: false, + access: "org", + storageUsage: 0, + storageQuota: 0, + orgId: "bkrWlSKcjUDFDtgw", + role: "org_user", + level: "2", + disabled: false, + tags: [], + culture: "en-US", + region: null, + units: "english", + thumbnail: null, + created: 1545240718000, + modified: 1545240719000, + provider: "arcgis", + groups: [] + }, + { + username: "abharadwaj_dcdev", + fullName: "Abhiram Bharadwaj", + availableCredits: -1, + assignedCredits: -1, + firstName: "Abhiram", + lastName: "Bharadwaj", + preferredView: null, + description: null, + email: "abharadwaj@esri.com", + idpUsername: null, + favGroupId: null, + lastLogin: 1562680534000, + mfaEnabled: false, + access: "org", + storageUsage: 0, + storageQuota: 0, + orgId: "bkrWlSKcjUDFDtgw", + role: "org_publisher", + level: "2", + disabled: true, + tags: [], + culture: "en-US", + region: null, + units: "english", + thumbnail: null, + created: 1559595628000, + modified: 1559595889000, + provider: "arcgis", + groups: [] + }, + { + username: "jcrozier_dcdev", + fullName: "Josh Crozier", + availableCredits: 21839.219, + assignedCredits: 21839.219, + firstName: "Josh", + lastName: "Crozier", + preferredView: null, + description: null, + email: "jcrozier@esri.com", + idpUsername: null, + favGroupId: null, + lastLogin: 1570567935000, + mfaEnabled: false, + access: "org", + storageUsage: 0, + storageQuota: 0, + orgId: "bkrWlSKcjUDFDtgw", + role: "org_publisher", + level: "2", + disabled: false, + tags: [], + culture: "en-US", + region: null, + units: "english", + thumbnail: null, + created: 1566828030000, + modified: 1566828272000, + provider: "arcgis", + groups: [] + }, + { + username: "falbin_dcdev", + fullName: "Frankie Albin", + availableCredits: -1, + assignedCredits: -1, + firstName: "Frankie", + lastName: "Albin", + preferredView: null, + description: null, + email: "falbin@esri.com", + idpUsername: null, + favGroupId: null, + lastLogin: 1533839707000, + mfaEnabled: false, + access: "org", + storageUsage: 0, + storageQuota: 0, + orgId: "bkrWlSKcjUDFDtgw", + role: "org_publisher", + level: "2", + disabled: true, + tags: [], + culture: null, + region: null, + units: "english", + thumbnail: null, + created: 1527889390000, + modified: 1528216176000, + provider: "arcgis", + groups: [] + }, + { + username: "RGwozdz_dcdev", + fullName: "Rich Gwozdz", + availableCredits: -1, + assignedCredits: -1, + firstName: "Rich", + lastName: "Gwozdz", + preferredView: null, + description: null, + email: "RGwozdz@esri.com", + idpUsername: null, + favGroupId: null, + lastLogin: 1571341152000, + mfaEnabled: false, + access: "org", + storageUsage: 0, + storageQuota: 0, + orgId: "bkrWlSKcjUDFDtgw", + role: "org_publisher", + level: "2", + disabled: false, + tags: [], + culture: null, + region: null, + units: "english", + thumbnail: null, + created: 1521133519000, + modified: 1536587193000, + provider: "arcgis", + groups: [] + }, + { + username: "ittybittygritty", + fullName: "Itty Bitty Gritty", + availableCredits: 48008.207, + assignedCredits: 48008.207, + firstName: "Itty Bitty", + lastName: "Gritty", + preferredView: null, + description: null, + email: "phammons@esri.com", + idpUsername: null, + favGroupId: null, + lastLogin: 1564598364000, + mfaEnabled: false, + access: "org", + storageUsage: 0, + storageQuota: 0, + orgId: "bkrWlSKcjUDFDtgw", + role: "org_publisher", + level: "2", + disabled: false, + tags: [], + culture: "en-US", + region: null, + units: "english", + thumbnail: null, + created: 1563394419000, + modified: 1563394592000, + provider: "arcgis", + groups: [] + }, + { + username: "acassidy_dcdev", + fullName: "Alan Cassidy", + availableCredits: -1, + assignedCredits: -1, + firstName: "Alan", + lastName: "Cassidy", + preferredView: null, + description: null, + email: "acassidy@esri.com", + idpUsername: null, + favGroupId: null, + lastLogin: 1565994248000, + mfaEnabled: false, + access: "org", + storageUsage: 0, + storageQuota: 0, + orgId: "bkrWlSKcjUDFDtgw", + role: "org_publisher", + level: "2", + disabled: false, + tags: ["hubInitiativeId|9a1cbaf5a5b34c54a335e29b47cf9619"], + culture: null, + region: null, + units: "english", + thumbnail: null, + created: 1540216205000, + modified: 1565994220000, + provider: "arcgis", + groups: [] + }, + { + username: "usertest19", + fullName: "User Test", + availableCredits: -1, + assignedCredits: -1, + firstName: "User", + lastName: "Test", + preferredView: null, + description: null, + email: "hub-research@esri.com", + idpUsername: null, + favGroupId: null, + lastLogin: 1561406301000, + mfaEnabled: false, + access: "org", + storageUsage: 0, + storageQuota: 0, + orgId: "bkrWlSKcjUDFDtgw", + role: "org_publisher", + level: "2", + disabled: true, + tags: [], + culture: "en-US", + region: null, + units: "english", + thumbnail: null, + created: 1561405831000, + modified: 1568657964000, + provider: "arcgis", + groups: [] + }, + { + username: "nparks_dcdev", + fullName: "Niya Parks", + availableCredits: -1, + assignedCredits: -1, + firstName: "Niya", + lastName: "Parks", + preferredView: null, + description: null, + email: "nparks@esri.com", + idpUsername: null, + favGroupId: null, + lastLogin: 1570537377000, + mfaEnabled: false, + access: "org", + storageUsage: 0, + storageQuota: 0, + orgId: "bkrWlSKcjUDFDtgw", + role: "org_publisher", + level: "2", + disabled: false, + tags: [], + culture: "en-US", + region: null, + units: "english", + thumbnail: null, + created: 1570023128000, + modified: 1570450996000, + provider: "arcgis", + groups: [] + }, + { + username: "wbc5_dcdev", + fullName: "Will Clark", + availableCredits: -1, + assignedCredits: -1, + firstName: "Will", + lastName: "Clark", + preferredView: null, + description: null, + email: "wbc5@mac.com", + idpUsername: null, + favGroupId: null, + lastLogin: 1538886106000, + mfaEnabled: false, + access: "private", + storageUsage: 0, + storageQuota: 0, + orgId: "bkrWlSKcjUDFDtgw", + role: "org_publisher", + level: "2", + disabled: false, + tags: [], + culture: "en", + region: "WO", + units: "english", + thumbnail: null, + created: 1485633572000, + modified: 1568862274000, + provider: "arcgis", + groups: [] + } + ] +}; diff --git a/packages/arcgis-rest-portal/test/users/search.test.ts b/packages/arcgis-rest-portal/test/users/search.test.ts new file mode 100644 index 0000000000..21f71760c3 --- /dev/null +++ b/packages/arcgis-rest-portal/test/users/search.test.ts @@ -0,0 +1,42 @@ +/* Copyright (c) 2018 Environmental Systems Research Institute, Inc. + * Apache-2.0 */ + +import { searchUsers } from "../../src/users/search-users"; +import { UserSearchResponse } from "../mocks/users/user-search"; + +import * as fetchMock from "fetch-mock"; + +describe("users", () => { + afterEach(fetchMock.restore); + + describe("searchUsers", () => { + const MOCK_AUTH = { + getToken() { + return Promise.resolve("fake-token"); + }, + portal: "https://myorg.maps.arcgis.com/sharing/rest" + }; + + it("should make a simple, authenticated user search request", done => { + fetchMock.once("*", UserSearchResponse); + + searchUsers({ + q: "role:org_user OR role:org_publisher", + num: 100, + authentication: MOCK_AUTH + }) + .then(response => { + expect(fetchMock.called()).toEqual(true); + const [url, options]: [string, RequestInit] = fetchMock.lastCall("*"); + expect(url).toEqual( + "https://myorg.maps.arcgis.com/sharing/rest/portals/self/users/search?f=json&q=role%3Aorg_user%20OR%20role%3Aorg_publisher&num=100&token=fake-token" + ); + expect(options.method).toBe("GET"); + done(); + }) + .catch(e => { + fail(e); + }); + }); + }); +}); From 971e715e81f87a5d1dd33d52afca6d2f71625d0b Mon Sep 17 00:00:00 2001 From: Sandro Martis Date: Tue, 22 Oct 2019 14:46:50 +0200 Subject: [PATCH 2/3] Export getService for arcgis-rest-feature-layer --- packages/arcgis-rest-feature-layer/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/arcgis-rest-feature-layer/src/index.ts b/packages/arcgis-rest-feature-layer/src/index.ts index c0652646f7..ad800de5f8 100644 --- a/packages/arcgis-rest-feature-layer/src/index.ts +++ b/packages/arcgis-rest-feature-layer/src/index.ts @@ -11,6 +11,7 @@ export * from "./updateAttachment"; export * from "./deleteAttachments"; export * from "./queryRelated"; export * from "./getLayer"; +export * from "./getService"; export * from "./decodeValues"; export * from "./helpers"; export { From 1079a5789a6eb4d2f897d35edf5a1028d9192957 Mon Sep 17 00:00:00 2001 From: mjuniper Date: Tue, 22 Oct 2019 07:31:34 -0600 Subject: [PATCH 3/3] v2.6.0 --- CHANGELOG.md | 16 +++++++++++----- demos/ago-node-cli/package.json | 8 ++++---- demos/attachments/package.json | 6 +++--- demos/batch-geocoder-node/package.json | 9 ++++----- demos/express/package.json | 6 +++--- demos/feature-service-browser/package.json | 6 +++--- demos/geocoder-browser/package.json | 8 ++++---- demos/jsapi-integration/package.json | 8 ++++---- demos/node-cli-item-management/package.json | 8 ++++---- demos/oauth2-browser/package.json | 6 +++--- demos/stream-response-to-file/package.json | 6 +++--- demos/tree-shaking-rollup/package.json | 6 +++--- demos/tree-shaking-webpack/package.json | 6 +++--- demos/vue/package.json | 6 +++--- demos/webmap-checker-sapper/package.json | 8 ++++---- docs/src/srihashes.json | 16 ++++++++-------- lerna.json | 2 +- notes/README.md | 8 ++++++-- package-lock.json | 2 +- package.json | 2 +- packages/arcgis-rest-auth/package.json | 6 +++--- packages/arcgis-rest-feature-layer/package.json | 8 ++++---- packages/arcgis-rest-geocoding/package.json | 8 ++++---- packages/arcgis-rest-portal/package.json | 8 ++++---- packages/arcgis-rest-request/package.json | 2 +- packages/arcgis-rest-routing/package.json | 8 ++++---- packages/arcgis-rest-service-admin/package.json | 10 +++++----- packages/arcgis-rest-types/package.json | 2 +- 28 files changed, 102 insertions(+), 93 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1aab30e19..4a1cf539c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### [Unreleased][HEAD] +## [2.6.0] - October 22nd 2019 + +### @esri/arcgis-rest-portal + +* New Features + * **arcgis-rest-portal**: add searchUsers function [`b91af15a`](https://github.com/Esri/arcgis-rest-js/commit/b91af15a0524ace69edfdaa5ccdea9da257746a9) + ## [2.5.0] - October 15th 2019 ### @esri/arcgis-rest-portal @@ -1423,8 +1430,7 @@ Initial Public Release [1.8.0]: https://github.com/Esri/arcgis-rest-js/compare/v1.7.1...v1.8.0 "v1.8.0" [1.9.0]: https://github.com/Esri/arcgis-rest-js/compare/v1.8.0...v1.9.0 "v1.9.0" [1.10.0]: https://github.com/Esri/arcgis-rest-js/compare/v1.9.0...v1.10.0 "v1.10.0" -[1.11.0]: https://github.com/Esri/arcgis-rest-js/compare/v1.10.0...v1.11.0 "v1.11.0" -[1.11.1]: https://github.com/Esri/arcgis-rest-js/compare/v1.11.0...v1.11.1 "v1.11.1" +[1.11.1]: https://github.com/Esri/arcgis-rest-js/compare/v1.10.0...v1.11.1 "v1.11.1" [1.12.0]: https://github.com/Esri/arcgis-rest-js/compare/v1.11.1...v1.12.0 "v1.12.0" [1.13.0]: https://github.com/Esri/arcgis-rest-js/compare/v1.12.0...v1.13.0 "v1.13.0" [1.13.1]: https://github.com/Esri/arcgis-rest-js/compare/v1.13.0...v1.13.1 "v1.13.1" @@ -1451,7 +1457,7 @@ Initial Public Release [2.1.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.0.4...v2.1.0 "v2.1.0" [2.1.1]: https://github.com/Esri/arcgis-rest-js/compare/v2.1.0...v2.1.1 "v2.1.1" [2.2.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.1.1...v2.2.0 "v2.2.0" -[2.2.1]: https://github.com/Esri/arcgis-rest-js/compare/v2.2.0...v2.2.1 "v2.2.1" -[2.3.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.2.1...v2.3.0 "v2.3.0" +[2.3.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.2.0...v2.3.0 "v2.3.0" [2.5.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.3.0...v2.5.0 "v2.5.0" -[HEAD]: https://github.com/Esri/arcgis-rest-js/compare/v2.5.0...HEAD "Unreleased Changes" +[2.6.0]: https://github.com/Esri/arcgis-rest-js/compare/v2.5.0...v2.6.0 "v2.6.0" +[HEAD]: https://github.com/Esri/arcgis-rest-js/compare/v2.6.0...HEAD "Unreleased Changes" diff --git a/demos/ago-node-cli/package.json b/demos/ago-node-cli/package.json index 987f11bfa2..ec1008b1aa 100644 --- a/demos/ago-node-cli/package.json +++ b/demos/ago-node-cli/package.json @@ -1,6 +1,6 @@ { "name": "node-cli", - "version": "2.5.0", + "version": "2.6.0", "description": "arcgis-rest-js node command-line item search example", "main": "ago.js", "scripts": { @@ -18,9 +18,9 @@ "author": "Dave Bouwman ", "license": "Apache-2.0", "dependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-portal": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0", + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-portal": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0", "chalk": "^2.3.0", "commander": "^2.12.2", "cross-fetch": "^3.0.0", diff --git a/demos/attachments/package.json b/demos/attachments/package.json index 2d5142be89..731fcc23ca 100644 --- a/demos/attachments/package.json +++ b/demos/attachments/package.json @@ -1,13 +1,13 @@ { "name": "attachments", - "version": "2.5.0", + "version": "2.6.0", "private": true, "description": "Vanilla JavaScript demo of attachment methods of @esri/arcgis-rest-feature-service", "author": "", "license": "Apache-2.0", "dependencies": { - "@esri/arcgis-rest-feature-layer": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0" + "@esri/arcgis-rest-feature-layer": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0" }, "devDependencies": { "http-server": "*" diff --git a/demos/batch-geocoder-node/package.json b/demos/batch-geocoder-node/package.json index 77cdae83c6..decfb7a1b6 100644 --- a/demos/batch-geocoder-node/package.json +++ b/demos/batch-geocoder-node/package.json @@ -1,6 +1,6 @@ { "name": "batch-geocoder", - "version": "2.5.0", + "version": "2.6.0", "description": "arcgis-rest-js batch geocode sample", "main": "batch-geocode.js", "scripts": { @@ -27,10 +27,9 @@ }, "homepage": "https://github.com/Esri/arcgis-rest-js#readme", "dependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-common": "^1.19.2", - "@esri/arcgis-rest-geocoding": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0", + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-geocoding": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0", "cross-fetch": "^3.0.0", "isomorphic-form-data": "^2.0.0", "papaparse": "^4.6.0" diff --git a/demos/express/package.json b/demos/express/package.json index d3c52d5a5d..e1e8768c89 100644 --- a/demos/express/package.json +++ b/demos/express/package.json @@ -1,13 +1,13 @@ { "name": "@esri/arcgis-rest-demo-express", - "version": "2.5.0", + "version": "2.6.0", "private": true, "description": "Demo of @esri/arcgis-rest-* packages in an Express server", "author": "", "license": "Apache-2.0", "dependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0", + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0", "cross-fetch": "^3.0.0", "express": "^4.16.3", "isomorphic-form-data": "^2.0.0" diff --git a/demos/feature-service-browser/package.json b/demos/feature-service-browser/package.json index f433c1cd97..afa41fb482 100644 --- a/demos/feature-service-browser/package.json +++ b/demos/feature-service-browser/package.json @@ -1,13 +1,13 @@ { "name": "feature-service-browser", - "version": "2.5.0", + "version": "2.6.0", "private": true, "description": "Vanilla JavaScript demo of @esri/arcgis-rest-feature-service", "author": "", "license": "Apache-2.0", "dependencies": { - "@esri/arcgis-rest-feature-layer": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0" + "@esri/arcgis-rest-feature-layer": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0" }, "devDependencies": { "http-server": "*" diff --git a/demos/geocoder-browser/package.json b/demos/geocoder-browser/package.json index b11d43bba8..72735174df 100644 --- a/demos/geocoder-browser/package.json +++ b/demos/geocoder-browser/package.json @@ -1,14 +1,14 @@ { "name": "@esri/arcgis-rest-geocoder-vanilla", - "version": "2.5.0", + "version": "2.6.0", "private": true, "description": "Vanilla JavaScript demo of @esri/arcgis-rest-geocoder", "author": "", "license": "Apache-2.0", "dependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-geocoding": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0" + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-geocoding": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0" }, "devDependencies": { "http-server": "0.11.1" diff --git a/demos/jsapi-integration/package.json b/demos/jsapi-integration/package.json index 39c5bb106b..37c6fa16ec 100644 --- a/demos/jsapi-integration/package.json +++ b/demos/jsapi-integration/package.json @@ -1,14 +1,14 @@ { "name": "@esri/jsapi-integration", - "version": "2.5.0", + "version": "2.6.0", "private": true, "description": "to do", "author": "", "license": "Apache-2.0", "dependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-portal": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0" + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-portal": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0" }, "devDependencies": { "http-server": "*" diff --git a/demos/node-cli-item-management/package.json b/demos/node-cli-item-management/package.json index 4a66149141..9df95db47c 100644 --- a/demos/node-cli-item-management/package.json +++ b/demos/node-cli-item-management/package.json @@ -1,6 +1,6 @@ { "name": "cli-item-management", - "version": "2.5.0", + "version": "2.6.0", "description": "Manage items in ArcGIS Online with a Node JS CLI and ArcGIS Rest JS", "main": "index.js", "scripts": { @@ -16,9 +16,9 @@ "arcgis-rest-js" ], "dependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-portal": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0", + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-portal": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0", "chalk": "^2.3.0", "cross-fetch": "^3.0.0", "isomorphic-form-data": "^1.0.0", diff --git a/demos/oauth2-browser/package.json b/demos/oauth2-browser/package.json index 44276a3233..09cc859c4a 100644 --- a/demos/oauth2-browser/package.json +++ b/demos/oauth2-browser/package.json @@ -1,13 +1,13 @@ { "name": "@esri/arcgis-rest-demo-vanilla", - "version": "2.5.0", + "version": "2.6.0", "private": true, "description": "Vanilla JavaScript demo of @esri/arcgis-rest-* packages", "author": "", "license": "Apache-2.0", "dependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0" + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0" }, "devDependencies": { "http-server": "*" diff --git a/demos/stream-response-to-file/package.json b/demos/stream-response-to-file/package.json index fdda94d761..5336a64193 100644 --- a/demos/stream-response-to-file/package.json +++ b/demos/stream-response-to-file/package.json @@ -1,6 +1,6 @@ { "name": "stream-response-to-file", - "version": "2.5.0", + "version": "2.6.0", "private": true, "description": "stream response to file with arcgis-rest-request", "main": "index.js", @@ -25,8 +25,8 @@ }, "homepage": "https://github.com/Esri/arcgis-rest-js#readme", "dependencies": { - "@esri/arcgis-rest-feature-layer": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0", + "@esri/arcgis-rest-feature-layer": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0", "isomorphic-form-data": "^2.0.0", "node-fetch": "^2.3.0" } diff --git a/demos/tree-shaking-rollup/package.json b/demos/tree-shaking-rollup/package.json index 8a0a1d671c..dae100115c 100644 --- a/demos/tree-shaking-rollup/package.json +++ b/demos/tree-shaking-rollup/package.json @@ -1,6 +1,6 @@ { "name": "@esri/arcgis-rest-tree-shaking-rollup", - "version": "2.5.0", + "version": "2.6.0", "private": true, "description": "", "scripts": { @@ -19,7 +19,7 @@ "rollup-plugin-node-resolve": "^4.0.1" }, "dependencies": { - "@esri/arcgis-rest-portal": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0" + "@esri/arcgis-rest-portal": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0" } } diff --git a/demos/tree-shaking-webpack/package.json b/demos/tree-shaking-webpack/package.json index 48d3fe9bbb..0196b4eb67 100644 --- a/demos/tree-shaking-webpack/package.json +++ b/demos/tree-shaking-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@esri/arcgis-rest-tree-shaking-webpack", - "version": "2.5.0", + "version": "2.6.0", "private": true, "description": "", "scripts": { @@ -18,7 +18,7 @@ "webpack-cli": "^3.3.0" }, "dependencies": { - "@esri/arcgis-rest-portal": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0" + "@esri/arcgis-rest-portal": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0" } } diff --git a/demos/vue/package.json b/demos/vue/package.json index f4502ffc8c..19412e75b2 100644 --- a/demos/vue/package.json +++ b/demos/vue/package.json @@ -1,7 +1,7 @@ { "name": "@esri/arcgis-rest-demo-vue-with-popup", "description": "VueJS demo of @esri/arcgis-rest-* packages.", - "version": "2.5.0", + "version": "2.6.0", "author": "", "license": "Apache-2.0", "private": true, @@ -12,8 +12,8 @@ "start": "npm run serve" }, "dependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0", + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0", "vue": "^2.5.17", "vue-router": "^3.0.1", "vuex": "^3.0.1" diff --git a/demos/webmap-checker-sapper/package.json b/demos/webmap-checker-sapper/package.json index 76686c81e7..dad9ce52d8 100644 --- a/demos/webmap-checker-sapper/package.json +++ b/demos/webmap-checker-sapper/package.json @@ -2,7 +2,7 @@ "name": "sapper-webmap-checker", "description": "this thing is cray cray", "private": true, - "version": "2.5.0", + "version": "2.6.0", "scripts": { "dev": "sapper dev", "build:legacy": "sapper build --legacy", @@ -13,9 +13,9 @@ "test": "run-p --race dev cy:run" }, "dependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-portal": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0", + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-portal": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0", "compression": "^1.7.1", "cookies": "^0.7.3", "cross-fetch": "^3.0.0", diff --git a/docs/src/srihashes.json b/docs/src/srihashes.json index 0e2e6f16fc..c071ea8170 100644 --- a/docs/src/srihashes.json +++ b/docs/src/srihashes.json @@ -1,12 +1,12 @@ { - "version": "2.5.0", + "version": "2.6.0", "packages": { - "@esri/arcgis-rest-auth": "sha384-XMjPWs96DvTiMyofkTC5Z8EM1BrfvV6/ouYmUI74Hosocq1mzLON2KmWbQ5lQCm/", - "@esri/arcgis-rest-feature-layer": "sha384-bE0D8cK8V++EYiFwhJ+f7pKf9vy28mxZGIPIcZTPNcVzQbNx//UCsc5nPNaDneLx", - "@esri/arcgis-rest-geocoding": "sha384-WFpWwSKtF2smlOO/ot/fqdZo2MqiLbXpZ5TTty9DJkS4UTfEnRtynH7MQULCQZ+6", - "@esri/arcgis-rest-portal": "sha384-L42mmM4RU1DGbR16gRQuYQU0a36njQYwIpsR3PCp0Nbvodhe3hWUDlRYf4d97Ybr", - "@esri/arcgis-rest-request": "sha384-eE/fvikDoBjM6YBEekAOLfm6hJAiuzaYcovbeAOZzTH0PM8isl2DXWHX+ihpBDsD", - "@esri/arcgis-rest-routing": "sha384-oBeCuXRbatE7ygLTRhwnKNbXi6r9BSBWx+ddrKcR2O2zSV6NmAhuzC8JNt2x+ceo", - "@esri/arcgis-rest-service-admin": "sha384-GcB+Wrnog6F03Ks5Bc2D3EgRgfS/WLggutMAaf4xQWvS8K2/ciWc9t1c++3bhkdK" + "@esri/arcgis-rest-auth": "sha384-baCmhGPjywJvoVr8xpsdTUEMF1L6r/LRQoDhBUuI/Oh65vgPNr66uhmN8eN71h1U", + "@esri/arcgis-rest-feature-layer": "sha384-ynVh76V2CkyHS4H1NJ9/vh4rkCY0AAG9Q2t8CQ3m9tRtk/7bLLCPeaCBKqBSAGYt", + "@esri/arcgis-rest-geocoding": "sha384-W5Zn/mbqqgTR1Jpir6L2NrHXa6SIQKAv6c6PCl78qwTUz6lSFTx5Tu06Coq9ghjA", + "@esri/arcgis-rest-portal": "sha384-V7lYi9vd7IVpBVq6clajDRyJevMC5KGyZgFaF7e0pdiQWTXgMq593ra2ojbSb06o", + "@esri/arcgis-rest-request": "sha384-RKizAQ1zCobnrDnc6HXceaBz+H0cEwXqqQ5kAJygw80C7VYW6DxovAnbziI/ojMi", + "@esri/arcgis-rest-routing": "sha384-wH4i2p8SPj3bU0MmLNkV4z7jsGl7zdGwYF7wIR4v+MMrTZqQf7AO3YVBcvaplz6h", + "@esri/arcgis-rest-service-admin": "sha384-hAaeuF3NcS9XUM4YLPEOllID1ZIlRe0QxRWGnClpghBjaxcssFxuRdcmqeGoqKy+" } } \ No newline at end of file diff --git a/lerna.json b/lerna.json index c4389d2a47..937afb8ec6 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "packages/*", "demos/*" ], - "version": "2.5.0" + "version": "2.6.0" } diff --git a/notes/README.md b/notes/README.md index 7f50ae53d7..38c2295f64 100644 --- a/notes/README.md +++ b/notes/README.md @@ -61,6 +61,12 @@ the command below bumps the version in each individual package.json file and par npm run release:prepare ``` +I don't know why, but sometimes lerna fails to increment a new version number for individual packages (like @esri/arcgis-rest-auth). When this happens, it is necessary to increment the version number in the package (and anything that depends on it) manually. + +You should not increment peerDependency version numbers manually. they should remain as loose as possible. Unless you know that your new version of the package needs to use the updated peer dependency. + +For some reason, in CHANGELOG.md, the unreleased section appears below this release. So please move it to the top. + afterwards, you can display a diff to give you a sense of what will be committed to master when you actually publish. ```bash @@ -84,5 +90,3 @@ npm run release:publish Basic utility libraries are going to be a problem. Most recommendation are to use something like `import defaults = require('lodash/defaults')` because you are importing a common JS module. However if you use this syntax you cannot have Typescript compile ES2015 modules which is goal for us. Not every library publishes itself as ES2015 modules. We need to make a call on what we bundle into the library (`Promise`, `fetch`) ect... Do we ask people to bring their own polyfills or do we bundle them ourselves for simplicity. If we want to do both it will likely complicate the builds a great deal. - - diff --git a/package-lock.json b/package-lock.json index 3839abd9da..2b46647310 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@esri/arcgis-rest-js", - "version": "2.5.0", + "version": "2.6.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2e98a29d1d..2db8a66616 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@esri/arcgis-rest-js", - "version": "2.5.0", + "version": "2.6.0", "description": "Compact, modular JavaScript wrappers for the ArcGIS REST API that run in Node.js and modern browsers.", "devDependencies": { "@types/fetch-mock": "^6.0.4", diff --git a/packages/arcgis-rest-auth/package.json b/packages/arcgis-rest-auth/package.json index 8045163295..28a3866696 100644 --- a/packages/arcgis-rest-auth/package.json +++ b/packages/arcgis-rest-auth/package.json @@ -1,6 +1,6 @@ { "name": "@esri/arcgis-rest-auth", - "version": "2.5.0", + "version": "2.6.0", "description": "Authentication helpers for @esri/arcgis-rest-js.", "main": "dist/node/index.js", "unpkg": "dist/umd/auth.umd.js", @@ -13,11 +13,11 @@ "dist/**" ], "dependencies": { - "@esri/arcgis-rest-types": "^2.5.0", + "@esri/arcgis-rest-types": "^2.6.0", "tslib": "^1.9.3" }, "devDependencies": { - "@esri/arcgis-rest-request": "^2.5.0" + "@esri/arcgis-rest-request": "^2.6.0" }, "peerDependencies": { "@esri/arcgis-rest-request": "^2.0.0" diff --git a/packages/arcgis-rest-feature-layer/package.json b/packages/arcgis-rest-feature-layer/package.json index 746efbb8ca..a7bf22c35d 100644 --- a/packages/arcgis-rest-feature-layer/package.json +++ b/packages/arcgis-rest-feature-layer/package.json @@ -1,6 +1,6 @@ { "name": "@esri/arcgis-rest-feature-layer", - "version": "2.5.0", + "version": "2.6.0", "description": "Feature layer query and edit helpers for @esri/arcgis-rest-js", "main": "dist/node/index.js", "unpkg": "dist/umd/feature-layer.umd.js", @@ -13,12 +13,12 @@ "dist/**" ], "dependencies": { - "@esri/arcgis-rest-types": "^2.5.0", + "@esri/arcgis-rest-types": "^2.6.0", "tslib": "^1.9.3" }, "devDependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0" + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0" }, "peerDependencies": { "@esri/arcgis-rest-auth": "^2.0.0", diff --git a/packages/arcgis-rest-geocoding/package.json b/packages/arcgis-rest-geocoding/package.json index 3368ffb9a2..2a755e3155 100644 --- a/packages/arcgis-rest-geocoding/package.json +++ b/packages/arcgis-rest-geocoding/package.json @@ -1,6 +1,6 @@ { "name": "@esri/arcgis-rest-geocoding", - "version": "2.5.0", + "version": "2.6.0", "description": "Geocoding helpers for @esri/arcgis-rest-js", "main": "dist/node/index.js", "unpkg": "dist/umd/geocoding.umd.js", @@ -13,12 +13,12 @@ "dist/**" ], "dependencies": { - "@esri/arcgis-rest-types": "^2.5.0", + "@esri/arcgis-rest-types": "^2.6.0", "tslib": "^1.9.3" }, "devDependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0" + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0" }, "peerDependencies": { "@esri/arcgis-rest-auth": "^2.0.0", diff --git a/packages/arcgis-rest-portal/package.json b/packages/arcgis-rest-portal/package.json index a7d9eef7d6..2c5657b8e2 100644 --- a/packages/arcgis-rest-portal/package.json +++ b/packages/arcgis-rest-portal/package.json @@ -1,6 +1,6 @@ { "name": "@esri/arcgis-rest-portal", - "version": "2.5.0", + "version": "2.6.0", "description": "ArcGIS Online and Enterprise content and user helpers for @esri/arcgis-rest-request", "main": "dist/node/index.js", "unpkg": "dist/umd/portal.umd.js", @@ -13,12 +13,12 @@ "dist/**" ], "dependencies": { - "@esri/arcgis-rest-types": "^2.5.0", + "@esri/arcgis-rest-types": "^2.6.0", "tslib": "^1.9.3" }, "devDependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0" + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0" }, "peerDependencies": { "@esri/arcgis-rest-auth": "^2.0.0", diff --git a/packages/arcgis-rest-request/package.json b/packages/arcgis-rest-request/package.json index 22326f46cf..dcd8d546cb 100644 --- a/packages/arcgis-rest-request/package.json +++ b/packages/arcgis-rest-request/package.json @@ -1,6 +1,6 @@ { "name": "@esri/arcgis-rest-request", - "version": "2.5.0", + "version": "2.6.0", "description": "Common methods and utilities for @esri/arcgis-rest-js packages.", "main": "dist/node/index.js", "unpkg": "dist/umd/request.umd.js", diff --git a/packages/arcgis-rest-routing/package.json b/packages/arcgis-rest-routing/package.json index ffb0025dcf..5f366307b5 100644 --- a/packages/arcgis-rest-routing/package.json +++ b/packages/arcgis-rest-routing/package.json @@ -1,6 +1,6 @@ { "name": "@esri/arcgis-rest-routing", - "version": "2.5.0", + "version": "2.6.0", "description": "Routing helpers for @esri/arcgis-rest-js", "main": "dist/node/index.js", "unpkg": "dist/umd/routing.umd.js", @@ -13,12 +13,12 @@ "dist/**" ], "dependencies": { - "@esri/arcgis-rest-types": "^2.5.0", + "@esri/arcgis-rest-types": "^2.6.0", "tslib": "^1.9.3" }, "devDependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0" + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0" }, "peerDependencies": { "@esri/arcgis-rest-auth": "^2.0.0", diff --git a/packages/arcgis-rest-service-admin/package.json b/packages/arcgis-rest-service-admin/package.json index 70e831df39..cb46ee9775 100644 --- a/packages/arcgis-rest-service-admin/package.json +++ b/packages/arcgis-rest-service-admin/package.json @@ -1,6 +1,6 @@ { "name": "@esri/arcgis-rest-service-admin", - "version": "2.5.0", + "version": "2.6.0", "description": "Service administration helpers for @esri/arcgis-rest-js", "main": "dist/node/index.js", "unpkg": "dist/umd/service-admin.umd.js", @@ -13,13 +13,13 @@ "dist/**" ], "dependencies": { - "@esri/arcgis-rest-types": "^2.5.0", + "@esri/arcgis-rest-types": "^2.6.0", "tslib": "^1.9.3" }, "devDependencies": { - "@esri/arcgis-rest-auth": "^2.5.0", - "@esri/arcgis-rest-portal": "^2.5.0", - "@esri/arcgis-rest-request": "^2.5.0" + "@esri/arcgis-rest-auth": "^2.6.0", + "@esri/arcgis-rest-portal": "^2.6.0", + "@esri/arcgis-rest-request": "^2.6.0" }, "peerDependencies": { "@esri/arcgis-rest-auth": "^2.0.0", diff --git a/packages/arcgis-rest-types/package.json b/packages/arcgis-rest-types/package.json index cd7766e0c2..19e0f5f872 100755 --- a/packages/arcgis-rest-types/package.json +++ b/packages/arcgis-rest-types/package.json @@ -1,6 +1,6 @@ { "name": "@esri/arcgis-rest-types", - "version": "2.5.0", + "version": "2.6.0", "description": "Shared TypeScript types for @esri/arcgis-rest-js", "types": "dist/types/index.d.ts", "author": "",