etincidunt 1.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.prettierignore +2 -0
- package/.travis.yml +29 -0
- package/.vscode/launch.json +24 -0
- package/.vscode/settings.json +3 -0
- package/demos/ago-node-cli/README.md +29 -0
- package/demos/ago-node-cli/ago.js +32 -0
- package/demos/ago-node-cli/index.js +11 -0
- package/demos/ago-node-cli/lib/item-export-command.js +48 -0
- package/demos/ago-node-cli/lib/item-search-command.js +35 -0
- package/demos/ago-node-cli/package-lock.json +172 -0
- package/demos/ago-node-cli/package.json +30 -0
- package/demos/attachments/README.md +5 -0
- package/demos/attachments/index.html +164 -0
- package/demos/attachments/package-lock.json +182 -0
- package/demos/attachments/package.json +18 -0
- package/demos/batch-geocoder-node/NYC_Restaurant_Inspection_Results.csv +100 -0
- package/demos/batch-geocoder-node/README.md +14 -0
- package/demos/batch-geocoder-node/batch-geocode.js +112 -0
- package/demos/batch-geocoder-node/config-template.js +18 -0
- package/demos/batch-geocoder-node/package-lock.json +109 -0
- package/demos/batch-geocoder-node/package.json +37 -0
- package/demos/express/README.md +10 -0
- package/demos/express/config.json.template +3 -0
- package/demos/express/package-lock.json +388 -0
- package/demos/express/package.json +18 -0
- package/demos/express/server.js +28 -0
- package/demos/feature-service-browser/README.md +6 -0
- package/demos/feature-service-browser/index.html +122 -0
- package/demos/feature-service-browser/package-lock.json +182 -0
- package/demos/feature-service-browser/package.json +18 -0
- package/demos/geocoder-browser/README.md +10 -0
- package/demos/geocoder-browser/config.js.template +1 -0
- package/demos/geocoder-browser/index.html +131 -0
- package/demos/geocoder-browser/package-lock.json +163 -0
- package/demos/geocoder-browser/package.json +19 -0
- package/demos/geocoder-browser/post-sign-in.html +25 -0
- package/demos/jsapi-integration/README.md +8 -0
- package/demos/jsapi-integration/config.js +6 -0
- package/demos/jsapi-integration/index.html +79 -0
- package/demos/jsapi-integration/package-lock.json +184 -0
- package/demos/jsapi-integration/package.json +19 -0
- package/demos/oauth2-browser/README.md +12 -0
- package/demos/oauth2-browser/authenticate.html +32 -0
- package/demos/oauth2-browser/config.js.template +6 -0
- package/demos/oauth2-browser/index.html +202 -0
- package/demos/oauth2-browser/logo.svg +4 -0
- package/demos/oauth2-browser/package-lock.json +163 -0
- package/demos/oauth2-browser/package.json +18 -0
- package/demos/oauth2-browser/style.css +36 -0
- package/demos/vue/.babelrc +6 -0
- package/demos/vue/.env.example +8 -0
- package/demos/vue/README.md +17 -0
- package/demos/vue/index.html +21 -0
- package/demos/vue/package-lock.json +7236 -0
- package/demos/vue/package.json +39 -0
- package/demos/vue/src/assets/logo.svg +29 -0
- package/demos/vue/src/components/App.vue +302 -0
- package/demos/vue/src/components/Authenticate.vue +68 -0
- package/demos/vue/src/components/Loader.vue +216 -0
- package/demos/vue/src/main.js +75 -0
- package/demos/vue/webpack.config.js +84 -0
- package/docs/FAQ.md +28 -0
- package/docs/HISTORY.md +62 -0
- package/docs/acetate.config.js +214 -0
- package/docs/build-typedoc.js +301 -0
- package/docs/src/_layout.html +82 -0
- package/docs/src/api/_declaration.html +496 -0
- package/docs/src/api/_layout.html +127 -0
- package/docs/src/api/_package.html +13 -0
- package/docs/src/api/index.html +23 -0
- package/docs/src/guides/_layout.html +24 -0
- package/docs/src/guides/amd-requirejs-dojo.md +40 -0
- package/docs/src/guides/babel-and-rollup.md +30 -0
- package/docs/src/guides/babel-and-webpack.md +30 -0
- package/docs/src/guides/browser-authentication.md +9 -0
- package/docs/src/guides/browserify.md +9 -0
- package/docs/src/guides/cli-authentication.md +9 -0
- package/docs/src/guides/client-server-authentication.md +9 -0
- package/docs/src/guides/from-a-cdn.md +36 -0
- package/docs/src/guides/index.md +52 -0
- package/docs/src/guides/node.md +30 -0
- package/docs/src/guides/package-overview.md +8 -0
- package/docs/src/guides/server-authentication.md +9 -0
- package/docs/src/guides/typescript-and-webpack.md +9 -0
- package/docs/src/img/icons.png +0 -0
- package/docs/src/img/icons@2x.png +0 -0
- package/docs/src/index.html +12 -0
- package/docs/src/js/api-search.js +113 -0
- package/docs/src/js/index.js +1 -0
- package/docs/src/js/nav-toggle.js +41 -0
- package/docs/src/sass/_highlight.scss +96 -0
- package/docs/src/sass/_icons.scss +157 -0
- package/docs/src/sass/style.scss +169 -0
- package/jasmine.json +7 -0
- package/karma.conf.js +100 -0
- package/lerna.json +8 -0
- package/notes/README.md +88 -0
- package/package.json +91 -0
- package/packages/arcgis-rest-auth/README.md +64 -0
- package/packages/arcgis-rest-auth/package-lock.json +11 -0
- package/packages/arcgis-rest-auth/package.json +51 -0
- package/packages/arcgis-rest-auth/src/ApplicationSession.ts +91 -0
- package/packages/arcgis-rest-auth/src/UserSession.ts +829 -0
- package/packages/arcgis-rest-auth/src/authenticated-request-options.ts +21 -0
- package/packages/arcgis-rest-auth/src/fetch-token.ts +55 -0
- package/packages/arcgis-rest-auth/src/generate-token.ts +36 -0
- package/packages/arcgis-rest-auth/src/index.ts +5 -0
- package/packages/arcgis-rest-auth/test/ApplicationSession.test.ts +121 -0
- package/packages/arcgis-rest-auth/test/UserSession.test.ts +883 -0
- package/packages/arcgis-rest-auth/test/fetchToken.test.ts +76 -0
- package/packages/arcgis-rest-auth/test/generateToken.test.ts +36 -0
- package/packages/arcgis-rest-auth/test/utils.ts +11 -0
- package/packages/arcgis-rest-auth/tsconfig.json +6 -0
- package/packages/arcgis-rest-common-types/README.md +61 -0
- package/packages/arcgis-rest-common-types/package.json +38 -0
- package/packages/arcgis-rest-common-types/src/group.ts +51 -0
- package/packages/arcgis-rest-common-types/src/index.ts +467 -0
- package/packages/arcgis-rest-common-types/src/item.ts +45 -0
- package/packages/arcgis-rest-common-types/src/webmap.ts +1225 -0
- package/packages/arcgis-rest-common-types/tsconfig.json +11 -0
- package/packages/arcgis-rest-feature-service/README.md +70 -0
- package/packages/arcgis-rest-feature-service/package-lock.json +11 -0
- package/packages/arcgis-rest-feature-service/package.json +50 -0
- package/packages/arcgis-rest-feature-service/src/add.ts +82 -0
- package/packages/arcgis-rest-feature-service/src/addAttachment.ts +65 -0
- package/packages/arcgis-rest-feature-service/src/delete.ts +85 -0
- package/packages/arcgis-rest-feature-service/src/deleteAttachments.ts +68 -0
- package/packages/arcgis-rest-feature-service/src/getAttachments.ts +64 -0
- package/packages/arcgis-rest-feature-service/src/helpers.ts +77 -0
- package/packages/arcgis-rest-feature-service/src/index.ts +8 -0
- package/packages/arcgis-rest-feature-service/src/query.ts +174 -0
- package/packages/arcgis-rest-feature-service/src/update.ts +81 -0
- package/packages/arcgis-rest-feature-service/src/updateAttachment.ts +74 -0
- package/packages/arcgis-rest-feature-service/test/attachments.test.ts +179 -0
- package/packages/arcgis-rest-feature-service/test/features.test.ts +172 -0
- package/packages/arcgis-rest-feature-service/test/mocks/feature.ts +220 -0
- package/packages/arcgis-rest-feature-service/test/mocks/foo.txt +1 -0
- package/packages/arcgis-rest-feature-service/tsconfig.json +6 -0
- package/packages/arcgis-rest-geocoder/README.md +73 -0
- package/packages/arcgis-rest-geocoder/package-lock.json +11 -0
- package/packages/arcgis-rest-geocoder/package.json +52 -0
- package/packages/arcgis-rest-geocoder/src/bulk.ts +102 -0
- package/packages/arcgis-rest-geocoder/src/geocode.ts +117 -0
- package/packages/arcgis-rest-geocoder/src/helpers.ts +81 -0
- package/packages/arcgis-rest-geocoder/src/index.ts +4 -0
- package/packages/arcgis-rest-geocoder/src/reverse.ts +84 -0
- package/packages/arcgis-rest-geocoder/src/suggest.ts +72 -0
- package/packages/arcgis-rest-geocoder/test/geocoder.test.ts +510 -0
- package/packages/arcgis-rest-geocoder/test/mocks/responses.ts +588 -0
- package/packages/arcgis-rest-geocoder/tsconfig.json +6 -0
- package/packages/arcgis-rest-groups/README.md +64 -0
- package/packages/arcgis-rest-groups/package-lock.json +11 -0
- package/packages/arcgis-rest-groups/package.json +52 -0
- package/packages/arcgis-rest-groups/src/groups.ts +272 -0
- package/packages/arcgis-rest-groups/src/index.ts +1 -0
- package/packages/arcgis-rest-groups/test/groups.test.ts +280 -0
- package/packages/arcgis-rest-groups/test/mocks/responses.ts +137 -0
- package/packages/arcgis-rest-groups/tsconfig.json +6 -0
- package/packages/arcgis-rest-items/README.md +66 -0
- package/packages/arcgis-rest-items/package-lock.json +11 -0
- package/packages/arcgis-rest-items/package.json +52 -0
- package/packages/arcgis-rest-items/src/index.ts +1 -0
- package/packages/arcgis-rest-items/src/items.ts +498 -0
- package/packages/arcgis-rest-items/test/items.test.ts +1153 -0
- package/packages/arcgis-rest-items/test/mocks/foo.zip +0 -0
- package/packages/arcgis-rest-items/test/mocks/item.ts +30 -0
- package/packages/arcgis-rest-items/test/mocks/resources.ts +28 -0
- package/packages/arcgis-rest-items/test/mocks/search.ts +60 -0
- package/packages/arcgis-rest-items/tsconfig.json +6 -0
- package/packages/arcgis-rest-request/README.md +65 -0
- package/packages/arcgis-rest-request/package-lock.json +11 -0
- package/packages/arcgis-rest-request/package.json +42 -0
- package/packages/arcgis-rest-request/src/index.ts +10 -0
- package/packages/arcgis-rest-request/src/request.ts +259 -0
- package/packages/arcgis-rest-request/src/utils/ArcGISAuthError.ts +67 -0
- package/packages/arcgis-rest-request/src/utils/ArcGISRequestError.ts +73 -0
- package/packages/arcgis-rest-request/src/utils/ErrorTypes.ts +29 -0
- package/packages/arcgis-rest-request/src/utils/check-for-errors.ts +65 -0
- package/packages/arcgis-rest-request/src/utils/encode-form-data.ts +29 -0
- package/packages/arcgis-rest-request/src/utils/encode-query-string.ts +23 -0
- package/packages/arcgis-rest-request/src/utils/get-portal-url.ts +25 -0
- package/packages/arcgis-rest-request/src/utils/get-portal.ts +45 -0
- package/packages/arcgis-rest-request/src/utils/process-params.ts +99 -0
- package/packages/arcgis-rest-request/test/mocks/errors.ts +59 -0
- package/packages/arcgis-rest-request/test/mocks/geojson-feature-collection.ts +10 -0
- package/packages/arcgis-rest-request/test/mocks/portal.ts +109 -0
- package/packages/arcgis-rest-request/test/mocks/sharing-rest-info.ts +38 -0
- package/packages/arcgis-rest-request/test/mocks/webmap.ts +38 -0
- package/packages/arcgis-rest-request/test/request.test.ts +296 -0
- package/packages/arcgis-rest-request/test/utils/ArcGISAuthError.test.ts +167 -0
- package/packages/arcgis-rest-request/test/utils/ArcGISRequestError.test.ts +40 -0
- package/packages/arcgis-rest-request/test/utils/check-for-errors.test.ts +101 -0
- package/packages/arcgis-rest-request/test/utils/encode-form-data.test.ts +112 -0
- package/packages/arcgis-rest-request/test/utils/get-portal-url.test.ts +34 -0
- package/packages/arcgis-rest-request/test/utils/portal.test.ts +94 -0
- package/packages/arcgis-rest-request/test/utils/process-params.test.ts +190 -0
- package/packages/arcgis-rest-request/tsconfig.json +6 -0
- package/packages/arcgis-rest-sharing/README.md +67 -0
- package/packages/arcgis-rest-sharing/package-lock.json +11 -0
- package/packages/arcgis-rest-sharing/package.json +55 -0
- package/packages/arcgis-rest-sharing/src/access.ts +91 -0
- package/packages/arcgis-rest-sharing/src/group-sharing.ts +212 -0
- package/packages/arcgis-rest-sharing/src/helpers.ts +92 -0
- package/packages/arcgis-rest-sharing/src/index.ts +2 -0
- package/packages/arcgis-rest-sharing/test/access.test.ts +153 -0
- package/packages/arcgis-rest-sharing/test/group-sharing.test.ts +436 -0
- package/packages/arcgis-rest-sharing/test/mocks/sharing.ts +15 -0
- package/packages/arcgis-rest-sharing/tsconfig.json +6 -0
- package/packages/arcgis-rest-users/README.md +71 -0
- package/packages/arcgis-rest-users/package-lock.json +11 -0
- package/packages/arcgis-rest-users/package.json +51 -0
- package/packages/arcgis-rest-users/src/index.ts +1 -0
- package/packages/arcgis-rest-users/src/users.ts +70 -0
- package/packages/arcgis-rest-users/test/mocks/responses.ts +170 -0
- package/packages/arcgis-rest-users/test/users.test.ts +97 -0
- package/packages/arcgis-rest-users/tsconfig.json +6 -0
- package/support/FormData.d.ts +1 -0
- package/support/changelog.js +388 -0
- package/support/commit-template.txt +19 -0
- package/support/deploy-doc-site.js +16 -0
- package/support/publish.sh +40 -0
- package/support/test-helpers.js +8 -0
- package/tsconfig.json +69 -0
- package/tslint.json +14 -0
- package/umd-base-profile.js +82 -0
- package/umd-production-profile.js +13 -0
|
@@ -0,0 +1,436 @@
|
|
|
1
|
+
import * as fetchMock from "fetch-mock";
|
|
2
|
+
import { shareItemWithGroup, unshareItemWithGroup } from "../src/index";
|
|
3
|
+
import { MOCK_USER_SESSION } from "./mocks/sharing";
|
|
4
|
+
|
|
5
|
+
import {
|
|
6
|
+
AnonUserResponse,
|
|
7
|
+
GroupNonMemberUserResponse,
|
|
8
|
+
GroupMemberUserResponse,
|
|
9
|
+
GroupAdminUserResponse,
|
|
10
|
+
OrgAdminUserResponse
|
|
11
|
+
} from "../../arcgis-rest-users/test/mocks/responses";
|
|
12
|
+
|
|
13
|
+
import { SearchResponse } from "../../arcgis-rest-items/test/mocks/search";
|
|
14
|
+
|
|
15
|
+
const SharingResponse = {
|
|
16
|
+
notSharedWith: [] as any,
|
|
17
|
+
itemId: "n3v"
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
const FailedSharingResponse = {
|
|
21
|
+
notSharedWith: ["t6b"],
|
|
22
|
+
itemId: "n3v"
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
const UnsharingResponse = {
|
|
26
|
+
notUnsharedFrom: [] as any,
|
|
27
|
+
itemId: "a5b"
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
const CachedSharingResponse = {
|
|
31
|
+
notSharedWith: [] as any,
|
|
32
|
+
itemId: "a5b",
|
|
33
|
+
shortcut: true
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
const CachedUnsharingResponse = {
|
|
37
|
+
notUnsharedFrom: [] as any,
|
|
38
|
+
itemId: "n3v",
|
|
39
|
+
shortcut: true
|
|
40
|
+
};
|
|
41
|
+
|
|
42
|
+
const NoResultsSearchResponse = {
|
|
43
|
+
query: "",
|
|
44
|
+
total: 0,
|
|
45
|
+
start: 0,
|
|
46
|
+
num: 0,
|
|
47
|
+
nextStart: 0,
|
|
48
|
+
results: [] as any
|
|
49
|
+
};
|
|
50
|
+
|
|
51
|
+
describe("shareItemWithGroup()", () => {
|
|
52
|
+
// make sure session doesnt cache metadata
|
|
53
|
+
beforeEach(function() {
|
|
54
|
+
MOCK_USER_SESSION._user = null;
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
afterEach(fetchMock.restore);
|
|
58
|
+
|
|
59
|
+
it("should share an item with a group by owner", done => {
|
|
60
|
+
fetchMock.once(
|
|
61
|
+
"https://myorg.maps.arcgis.com/sharing/rest/community/users/jsmith?f=json&token=fake-token",
|
|
62
|
+
GroupMemberUserResponse
|
|
63
|
+
);
|
|
64
|
+
|
|
65
|
+
fetchMock.once(
|
|
66
|
+
"https://myorg.maps.arcgis.com/sharing/rest/search",
|
|
67
|
+
SearchResponse
|
|
68
|
+
);
|
|
69
|
+
|
|
70
|
+
fetchMock.once(
|
|
71
|
+
"https://myorg.maps.arcgis.com/sharing/rest/content/users/jsmith/items/n3v/share",
|
|
72
|
+
SharingResponse
|
|
73
|
+
);
|
|
74
|
+
|
|
75
|
+
shareItemWithGroup({
|
|
76
|
+
authentication: MOCK_USER_SESSION,
|
|
77
|
+
id: "n3v",
|
|
78
|
+
groupId: "t6b"
|
|
79
|
+
})
|
|
80
|
+
.then(response => {
|
|
81
|
+
const [url, options]: [string, RequestInit] = fetchMock.lastCall(
|
|
82
|
+
"https://myorg.maps.arcgis.com/sharing/rest/content/users/jsmith/items/n3v/share"
|
|
83
|
+
);
|
|
84
|
+
expect(options.method).toBe("POST");
|
|
85
|
+
expect(response).toEqual(SharingResponse);
|
|
86
|
+
expect(options.body).toContain("f=json");
|
|
87
|
+
expect(options.body).toContain("groups=t6b");
|
|
88
|
+
done();
|
|
89
|
+
})
|
|
90
|
+
.catch(e => {
|
|
91
|
+
fail(e);
|
|
92
|
+
});
|
|
93
|
+
});
|
|
94
|
+
|
|
95
|
+
it("should fail to share an item with a group if the request is made by a non-org admin and non-group member", done => {
|
|
96
|
+
fetchMock.once(
|
|
97
|
+
"https://myorg.maps.arcgis.com/sharing/rest/community/users/jsmith?f=json&token=fake-token",
|
|
98
|
+
GroupNonMemberUserResponse
|
|
99
|
+
);
|
|
100
|
+
|
|
101
|
+
fetchMock.once(
|
|
102
|
+
"https://myorg.maps.arcgis.com/sharing/rest/search",
|
|
103
|
+
SearchResponse
|
|
104
|
+
);
|
|
105
|
+
|
|
106
|
+
shareItemWithGroup({
|
|
107
|
+
authentication: MOCK_USER_SESSION,
|
|
108
|
+
id: "n3v",
|
|
109
|
+
groupId: "t6b"
|
|
110
|
+
}).catch(e => {
|
|
111
|
+
expect(e.message).toBe(
|
|
112
|
+
"This item can not be shared by jsmith as they are not a member of the specified group t6b."
|
|
113
|
+
);
|
|
114
|
+
done();
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
|
|
118
|
+
it("should share an item with a group by org administrator", done => {
|
|
119
|
+
fetchMock.once(
|
|
120
|
+
"https://myorg.maps.arcgis.com/sharing/rest/community/users/jsmith?f=json&token=fake-token",
|
|
121
|
+
OrgAdminUserResponse
|
|
122
|
+
);
|
|
123
|
+
|
|
124
|
+
fetchMock.once(
|
|
125
|
+
"https://myorg.maps.arcgis.com/sharing/rest/search",
|
|
126
|
+
NoResultsSearchResponse
|
|
127
|
+
);
|
|
128
|
+
|
|
129
|
+
fetchMock.once(
|
|
130
|
+
"https://myorg.maps.arcgis.com/sharing/rest/content/users/casey/items/n3v/share",
|
|
131
|
+
SharingResponse
|
|
132
|
+
);
|
|
133
|
+
|
|
134
|
+
shareItemWithGroup({
|
|
135
|
+
authentication: MOCK_USER_SESSION,
|
|
136
|
+
id: "n3v",
|
|
137
|
+
groupId: "t6b",
|
|
138
|
+
owner: "casey"
|
|
139
|
+
})
|
|
140
|
+
.then(response => {
|
|
141
|
+
const [url, options]: [string, RequestInit] = fetchMock.lastCall(
|
|
142
|
+
"https://myorg.maps.arcgis.com/sharing/rest/content/users/casey/items/n3v/share"
|
|
143
|
+
);
|
|
144
|
+
expect(options.method).toBe("POST");
|
|
145
|
+
expect(response).toEqual(SharingResponse);
|
|
146
|
+
expect(options.body).toContain("f=json");
|
|
147
|
+
expect(options.body).toContain("groups=t6b");
|
|
148
|
+
done();
|
|
149
|
+
})
|
|
150
|
+
.catch(e => {
|
|
151
|
+
fail(e);
|
|
152
|
+
});
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
it("should share an item with a group by group owner/admin", done => {
|
|
156
|
+
fetchMock.once(
|
|
157
|
+
"https://myorg.maps.arcgis.com/sharing/rest/community/users/jsmith?f=json&token=fake-token",
|
|
158
|
+
GroupAdminUserResponse
|
|
159
|
+
);
|
|
160
|
+
|
|
161
|
+
fetchMock.once(
|
|
162
|
+
"https://myorg.maps.arcgis.com/sharing/rest/search",
|
|
163
|
+
SearchResponse
|
|
164
|
+
);
|
|
165
|
+
|
|
166
|
+
fetchMock.once(
|
|
167
|
+
"https://myorg.maps.arcgis.com/sharing/rest/content/items/n3v/share",
|
|
168
|
+
SharingResponse
|
|
169
|
+
);
|
|
170
|
+
|
|
171
|
+
shareItemWithGroup({
|
|
172
|
+
authentication: MOCK_USER_SESSION,
|
|
173
|
+
id: "n3v",
|
|
174
|
+
groupId: "t6b",
|
|
175
|
+
owner: "otherguy"
|
|
176
|
+
})
|
|
177
|
+
.then(response => {
|
|
178
|
+
const [url, options]: [string, RequestInit] = fetchMock.lastCall(
|
|
179
|
+
"https://myorg.maps.arcgis.com/sharing/rest/content/items/n3v/share"
|
|
180
|
+
);
|
|
181
|
+
expect(options.method).toBe("POST");
|
|
182
|
+
expect(response).toEqual(SharingResponse);
|
|
183
|
+
expect(options.body).toContain("f=json");
|
|
184
|
+
expect(options.body).toContain("groups=t6b");
|
|
185
|
+
done();
|
|
186
|
+
})
|
|
187
|
+
.catch(e => {
|
|
188
|
+
fail(e);
|
|
189
|
+
});
|
|
190
|
+
});
|
|
191
|
+
|
|
192
|
+
it("should mock the response if an item was previously shared with a group", done => {
|
|
193
|
+
fetchMock.once(
|
|
194
|
+
"https://myorg.maps.arcgis.com/sharing/rest/community/users/jsmith?f=json&token=fake-token",
|
|
195
|
+
GroupAdminUserResponse
|
|
196
|
+
);
|
|
197
|
+
|
|
198
|
+
fetchMock.once(
|
|
199
|
+
"https://myorg.maps.arcgis.com/sharing/rest/search",
|
|
200
|
+
SearchResponse
|
|
201
|
+
);
|
|
202
|
+
|
|
203
|
+
shareItemWithGroup({
|
|
204
|
+
authentication: MOCK_USER_SESSION,
|
|
205
|
+
id: "a5b",
|
|
206
|
+
groupId: "t6b"
|
|
207
|
+
})
|
|
208
|
+
.then(response => {
|
|
209
|
+
// no web request to share at all
|
|
210
|
+
expect(response).toEqual(CachedSharingResponse);
|
|
211
|
+
done();
|
|
212
|
+
})
|
|
213
|
+
.catch(e => {
|
|
214
|
+
fail(e);
|
|
215
|
+
});
|
|
216
|
+
});
|
|
217
|
+
|
|
218
|
+
it("should throw if the person trying to share doesnt own the item, is not an admin or member of said group", done => {
|
|
219
|
+
fetchMock.once(
|
|
220
|
+
"https://myorg.maps.arcgis.com/sharing/rest/community/users/jsmith?f=json&token=fake-token",
|
|
221
|
+
GroupMemberUserResponse
|
|
222
|
+
);
|
|
223
|
+
|
|
224
|
+
fetchMock.once(
|
|
225
|
+
"https://myorg.maps.arcgis.com/sharing/rest/search",
|
|
226
|
+
SearchResponse
|
|
227
|
+
);
|
|
228
|
+
|
|
229
|
+
shareItemWithGroup({
|
|
230
|
+
authentication: MOCK_USER_SESSION,
|
|
231
|
+
id: "n3v",
|
|
232
|
+
groupId: "t6b",
|
|
233
|
+
owner: "casey"
|
|
234
|
+
}).catch(e => {
|
|
235
|
+
expect(e.message).toContain(
|
|
236
|
+
"This item can not be shared by jsmith as they are neither the owner, a groupAdmin of t6b, nor an org_admin."
|
|
237
|
+
);
|
|
238
|
+
done();
|
|
239
|
+
});
|
|
240
|
+
});
|
|
241
|
+
|
|
242
|
+
it("should throw if the response from the server is fishy", done => {
|
|
243
|
+
fetchMock.once(
|
|
244
|
+
"https://myorg.maps.arcgis.com/sharing/rest/community/users/jsmith?f=json&token=fake-token",
|
|
245
|
+
GroupMemberUserResponse
|
|
246
|
+
);
|
|
247
|
+
|
|
248
|
+
fetchMock.once(
|
|
249
|
+
"https://myorg.maps.arcgis.com/sharing/rest/search",
|
|
250
|
+
SearchResponse
|
|
251
|
+
);
|
|
252
|
+
|
|
253
|
+
fetchMock.once(
|
|
254
|
+
"https://myorg.maps.arcgis.com/sharing/rest/content/users/jsmith/items/n3v/share",
|
|
255
|
+
FailedSharingResponse
|
|
256
|
+
);
|
|
257
|
+
|
|
258
|
+
shareItemWithGroup({
|
|
259
|
+
authentication: MOCK_USER_SESSION,
|
|
260
|
+
id: "n3v",
|
|
261
|
+
groupId: "t6b"
|
|
262
|
+
}).catch(e => {
|
|
263
|
+
expect(e.message).toBe("Item n3v could not be shared to group t6b.");
|
|
264
|
+
done();
|
|
265
|
+
});
|
|
266
|
+
});
|
|
267
|
+
});
|
|
268
|
+
|
|
269
|
+
describe("unshareItemWithGroup()", () => {
|
|
270
|
+
// make sure session doesnt cache metadata
|
|
271
|
+
beforeEach(function() {
|
|
272
|
+
MOCK_USER_SESSION._user = null;
|
|
273
|
+
});
|
|
274
|
+
|
|
275
|
+
afterEach(fetchMock.restore);
|
|
276
|
+
|
|
277
|
+
it("should unshare an item with a group by owner", done => {
|
|
278
|
+
fetchMock.once(
|
|
279
|
+
"https://myorg.maps.arcgis.com/sharing/rest/community/users/jsmith?f=json&token=fake-token",
|
|
280
|
+
GroupMemberUserResponse
|
|
281
|
+
);
|
|
282
|
+
|
|
283
|
+
fetchMock.once(
|
|
284
|
+
"https://myorg.maps.arcgis.com/sharing/rest/search",
|
|
285
|
+
SearchResponse
|
|
286
|
+
);
|
|
287
|
+
|
|
288
|
+
fetchMock.once(
|
|
289
|
+
"https://myorg.maps.arcgis.com/sharing/rest/content/users/jsmith/items/a5b/unshare",
|
|
290
|
+
UnsharingResponse
|
|
291
|
+
);
|
|
292
|
+
|
|
293
|
+
unshareItemWithGroup({
|
|
294
|
+
authentication: MOCK_USER_SESSION,
|
|
295
|
+
id: "a5b",
|
|
296
|
+
groupId: "t6b"
|
|
297
|
+
})
|
|
298
|
+
.then(response => {
|
|
299
|
+
const [url, options]: [string, RequestInit] = fetchMock.lastCall(
|
|
300
|
+
"https://myorg.maps.arcgis.com/sharing/rest/content/users/jsmith/items/a5b/unshare"
|
|
301
|
+
);
|
|
302
|
+
expect(options.method).toBe("POST");
|
|
303
|
+
expect(response).toEqual(UnsharingResponse);
|
|
304
|
+
expect(options.body).toContain("f=json");
|
|
305
|
+
expect(options.body).toContain("groups=t6b");
|
|
306
|
+
done();
|
|
307
|
+
})
|
|
308
|
+
.catch(e => {
|
|
309
|
+
fail(e);
|
|
310
|
+
});
|
|
311
|
+
});
|
|
312
|
+
|
|
313
|
+
it("should unshare an item with a group by org administrator", done => {
|
|
314
|
+
fetchMock.once(
|
|
315
|
+
"https://myorg.maps.arcgis.com/sharing/rest/community/users/jsmith?f=json&token=fake-token",
|
|
316
|
+
OrgAdminUserResponse
|
|
317
|
+
);
|
|
318
|
+
|
|
319
|
+
fetchMock.once(
|
|
320
|
+
"https://myorg.maps.arcgis.com/sharing/rest/search",
|
|
321
|
+
SearchResponse
|
|
322
|
+
);
|
|
323
|
+
|
|
324
|
+
fetchMock.once(
|
|
325
|
+
"https://myorg.maps.arcgis.com/sharing/rest/content/users/casey/items/a5b/unshare",
|
|
326
|
+
UnsharingResponse
|
|
327
|
+
);
|
|
328
|
+
|
|
329
|
+
unshareItemWithGroup({
|
|
330
|
+
authentication: MOCK_USER_SESSION,
|
|
331
|
+
id: "a5b",
|
|
332
|
+
groupId: "t6b",
|
|
333
|
+
owner: "casey"
|
|
334
|
+
})
|
|
335
|
+
.then(response => {
|
|
336
|
+
const [url, options]: [string, RequestInit] = fetchMock.lastCall(
|
|
337
|
+
"https://myorg.maps.arcgis.com/sharing/rest/content/users/casey/items/a5b/unshare"
|
|
338
|
+
);
|
|
339
|
+
expect(options.method).toBe("POST");
|
|
340
|
+
expect(response).toEqual(UnsharingResponse);
|
|
341
|
+
expect(options.body).toContain("f=json");
|
|
342
|
+
expect(options.body).toContain("groups=t6b");
|
|
343
|
+
done();
|
|
344
|
+
})
|
|
345
|
+
.catch(e => {
|
|
346
|
+
fail(e);
|
|
347
|
+
});
|
|
348
|
+
});
|
|
349
|
+
|
|
350
|
+
it("should unshare an item with a group by group admin", done => {
|
|
351
|
+
fetchMock.once(
|
|
352
|
+
"https://myorg.maps.arcgis.com/sharing/rest/community/users/jsmith?f=json&token=fake-token",
|
|
353
|
+
GroupAdminUserResponse
|
|
354
|
+
);
|
|
355
|
+
|
|
356
|
+
fetchMock.once(
|
|
357
|
+
"https://myorg.maps.arcgis.com/sharing/rest/search",
|
|
358
|
+
SearchResponse
|
|
359
|
+
);
|
|
360
|
+
|
|
361
|
+
fetchMock.once(
|
|
362
|
+
"https://myorg.maps.arcgis.com/sharing/rest/content/items/a5b/unshare",
|
|
363
|
+
UnsharingResponse
|
|
364
|
+
);
|
|
365
|
+
|
|
366
|
+
unshareItemWithGroup({
|
|
367
|
+
authentication: MOCK_USER_SESSION,
|
|
368
|
+
id: "a5b",
|
|
369
|
+
groupId: "t6b",
|
|
370
|
+
owner: "otherguy"
|
|
371
|
+
})
|
|
372
|
+
.then(response => {
|
|
373
|
+
const [url, options]: [string, RequestInit] = fetchMock.lastCall(
|
|
374
|
+
"https://myorg.maps.arcgis.com/sharing/rest/content/items/a5b/unshare"
|
|
375
|
+
);
|
|
376
|
+
expect(options.method).toBe("POST");
|
|
377
|
+
expect(response).toEqual(UnsharingResponse);
|
|
378
|
+
expect(options.body).toContain("f=json");
|
|
379
|
+
expect(options.body).toContain("groups=t6b");
|
|
380
|
+
done();
|
|
381
|
+
})
|
|
382
|
+
.catch(e => {
|
|
383
|
+
fail(e);
|
|
384
|
+
});
|
|
385
|
+
});
|
|
386
|
+
|
|
387
|
+
it("should shortcircuit share if an item was previously unshared with a group", done => {
|
|
388
|
+
fetchMock.once(
|
|
389
|
+
"https://myorg.maps.arcgis.com/sharing/rest/community/users/jsmith?f=json&token=fake-token",
|
|
390
|
+
GroupMemberUserResponse
|
|
391
|
+
);
|
|
392
|
+
|
|
393
|
+
fetchMock.once(
|
|
394
|
+
"https://myorg.maps.arcgis.com/sharing/rest/search",
|
|
395
|
+
SearchResponse
|
|
396
|
+
);
|
|
397
|
+
|
|
398
|
+
unshareItemWithGroup({
|
|
399
|
+
authentication: MOCK_USER_SESSION,
|
|
400
|
+
id: "n3v",
|
|
401
|
+
groupId: "t6b"
|
|
402
|
+
})
|
|
403
|
+
.then(response => {
|
|
404
|
+
// no web request to unshare at all
|
|
405
|
+
expect(response).toEqual(CachedUnsharingResponse);
|
|
406
|
+
done();
|
|
407
|
+
})
|
|
408
|
+
.catch(e => {
|
|
409
|
+
fail(e);
|
|
410
|
+
});
|
|
411
|
+
});
|
|
412
|
+
|
|
413
|
+
it("should throw if the person trying to unshare doesnt own the item, is not an admin or member of said group", done => {
|
|
414
|
+
fetchMock.once(
|
|
415
|
+
"https://myorg.maps.arcgis.com/sharing/rest/community/users/jsmith?f=json&token=fake-token",
|
|
416
|
+
AnonUserResponse
|
|
417
|
+
);
|
|
418
|
+
|
|
419
|
+
fetchMock.once(
|
|
420
|
+
"https://myorg.maps.arcgis.com/sharing/rest/search",
|
|
421
|
+
SearchResponse
|
|
422
|
+
);
|
|
423
|
+
|
|
424
|
+
unshareItemWithGroup({
|
|
425
|
+
authentication: MOCK_USER_SESSION,
|
|
426
|
+
id: "a5b",
|
|
427
|
+
groupId: "t6b",
|
|
428
|
+
owner: "jones"
|
|
429
|
+
}).catch(e => {
|
|
430
|
+
expect(e.message).toContain(
|
|
431
|
+
"This item can not be unshared by jsmith as they are not a member of the specified group t6b."
|
|
432
|
+
);
|
|
433
|
+
done();
|
|
434
|
+
});
|
|
435
|
+
});
|
|
436
|
+
});
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { UserSession } from "@esri/arcgis-rest-auth";
|
|
2
|
+
import { TOMORROW } from "@esri/arcgis-rest-auth/test/utils";
|
|
3
|
+
|
|
4
|
+
export const MOCK_USER_SESSION = new UserSession({
|
|
5
|
+
clientId: "clientId",
|
|
6
|
+
redirectUri: "https://example-app.com/redirect-uri",
|
|
7
|
+
token: "fake-token",
|
|
8
|
+
tokenExpires: TOMORROW,
|
|
9
|
+
refreshToken: "refreshToken",
|
|
10
|
+
refreshTokenExpires: TOMORROW,
|
|
11
|
+
refreshTokenTTL: 1440,
|
|
12
|
+
username: "jsmith",
|
|
13
|
+
password: "123456",
|
|
14
|
+
portal: "https://myorg.maps.arcgis.com/sharing/rest"
|
|
15
|
+
});
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
[![npm version][npm-img]][npm-url]
|
|
2
|
+
[![build status][travis-img]][travis-url]
|
|
3
|
+
[](https://raw.githubusercontent.com/Esri/arcgis-rest-js/master/LICENSE)
|
|
4
|
+
|
|
5
|
+
[npm-img]: https://img.shields.io/npm/v/@esri/arcgis-rest-users.svg?style=flat-square
|
|
6
|
+
[npm-url]: https://www.npmjs.com/package/@esri/arcgis-rest-users
|
|
7
|
+
[travis-img]: https://img.shields.io/travis/Esri/arcgis-rest-js/master.svg?style=flat-square
|
|
8
|
+
[travis-url]: https://travis-ci.org/Esri/arcgis-rest-js
|
|
9
|
+
|
|
10
|
+
# @esri/arcgis-rest-users
|
|
11
|
+
|
|
12
|
+
> A module for working with users in the ArcGIS REST API that runs in Node.js and modern browsers.
|
|
13
|
+
|
|
14
|
+
### Example
|
|
15
|
+
|
|
16
|
+
```bash
|
|
17
|
+
npm install @esri/arcgis-rest-users
|
|
18
|
+
```
|
|
19
|
+
|
|
20
|
+
```js
|
|
21
|
+
import { getUser } from '@esri/arcgis-rest-groups';
|
|
22
|
+
|
|
23
|
+
getUser("jsmith")
|
|
24
|
+
.then(response => {
|
|
25
|
+
/*
|
|
26
|
+
{
|
|
27
|
+
firstName: "John",
|
|
28
|
+
lastName: "Smith",
|
|
29
|
+
tags: ["GIS Analyst", "City of Redlands"],
|
|
30
|
+
thumbnail: "myProfile.jpg",
|
|
31
|
+
created: 1258501046000,
|
|
32
|
+
modified: 1290625562000,
|
|
33
|
+
d eetc.
|
|
34
|
+
};
|
|
35
|
+
*/
|
|
36
|
+
});
|
|
37
|
+
```
|
|
38
|
+
|
|
39
|
+
### Issues
|
|
40
|
+
|
|
41
|
+
If something isn't working the way you expected, please take a look at [previously logged issues](https://github.com/Esri/arcgis-rest-js/issues) first. Have you found a new bug? Want to request a new feature? We'd [**love**](https://github.com/Esri/arcgis-rest-js/issues/new) to hear from you.
|
|
42
|
+
|
|
43
|
+
If you're looking for help you can also post issues on [GIS Stackexchange](http://gis.stackexchange.com/questions/ask?tags=esri-oss).
|
|
44
|
+
|
|
45
|
+
### Versioning
|
|
46
|
+
|
|
47
|
+
For transparency into the release cycle and in striving to maintain backward compatibility, @esri/arcgis-rest-js is maintained under Semantic Versioning guidelines and will adhere to these rules whenever possible.
|
|
48
|
+
|
|
49
|
+
For more information on SemVer, please visit <http://semver.org/>.
|
|
50
|
+
|
|
51
|
+
### Contributing
|
|
52
|
+
|
|
53
|
+
Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](CONTRIBUTING.md).
|
|
54
|
+
|
|
55
|
+
### License
|
|
56
|
+
|
|
57
|
+
Copyright 2018 Esri
|
|
58
|
+
|
|
59
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
60
|
+
you may not use this file except in compliance with the License.
|
|
61
|
+
You may obtain a copy of the License at
|
|
62
|
+
|
|
63
|
+
> http://www.apache.org/licenses/LICENSE-2.0
|
|
64
|
+
|
|
65
|
+
Unless required by applicable law or agreed to in writing, software
|
|
66
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
67
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
68
|
+
See the License for the specific language governing permissions and
|
|
69
|
+
limitations under the License.
|
|
70
|
+
|
|
71
|
+
A copy of the license is available in the repository's [LICENSE](../../LICENSE) file.
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
{
|
|
2
|
+
"requires": true,
|
|
3
|
+
"lockfileVersion": 1,
|
|
4
|
+
"dependencies": {
|
|
5
|
+
"tslib": {
|
|
6
|
+
"version": "1.9.0",
|
|
7
|
+
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz",
|
|
8
|
+
"integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ=="
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@esri/arcgis-rest-users",
|
|
3
|
+
"version": "1.6.0",
|
|
4
|
+
"description": "Portal user helpers for @esri/arcgis-rest-request",
|
|
5
|
+
"main": "dist/node/index.js",
|
|
6
|
+
"browser": "dist/umd/users.umd.js",
|
|
7
|
+
"module": "dist/esm/index.js",
|
|
8
|
+
"js:next": "dist/esm/index.js",
|
|
9
|
+
"types": "dist/esm/index.d.ts",
|
|
10
|
+
"license": "Apache-2.0",
|
|
11
|
+
"files": [
|
|
12
|
+
"dist/**"
|
|
13
|
+
],
|
|
14
|
+
"dependencies": {
|
|
15
|
+
"tslib": "^1.7.1"
|
|
16
|
+
},
|
|
17
|
+
"peerDependencies": {
|
|
18
|
+
"@esri/arcgis-rest-auth": "^1.5.1",
|
|
19
|
+
"@esri/arcgis-rest-common-types": "^1.5.1",
|
|
20
|
+
"@esri/arcgis-rest-request": "^1.5.1"
|
|
21
|
+
},
|
|
22
|
+
"devDependencies": {
|
|
23
|
+
"@esri/arcgis-rest-auth": "^1.6.0",
|
|
24
|
+
"@esri/arcgis-rest-common-types": "^1.6.0",
|
|
25
|
+
"@esri/arcgis-rest-request": "^1.6.0"
|
|
26
|
+
},
|
|
27
|
+
"scripts": {
|
|
28
|
+
"prepare": "npm run build",
|
|
29
|
+
"build": "npm run build:node && npm run build:umd && npm run build:esm",
|
|
30
|
+
"build:esm": "tsc -p ./tsconfig.json --module es2015 --outDir ./dist/esm --declaration",
|
|
31
|
+
"build:umd": "rollup -c ../../umd-base-profile.js && rollup -c ../../umd-production-profile.js",
|
|
32
|
+
"build:node": "tsc -p ./tsconfig.json --module commonjs --outDir ./dist/node"
|
|
33
|
+
},
|
|
34
|
+
"publishConfig": {
|
|
35
|
+
"access": "public"
|
|
36
|
+
},
|
|
37
|
+
"repository": {
|
|
38
|
+
"type": "git",
|
|
39
|
+
"url": "git+https://github.com/Esri/arcgis-rest-js.git"
|
|
40
|
+
},
|
|
41
|
+
"contributors": [
|
|
42
|
+
{
|
|
43
|
+
"name": "John Gravois",
|
|
44
|
+
"email": "john@esri.com"
|
|
45
|
+
}
|
|
46
|
+
],
|
|
47
|
+
"bugs": {
|
|
48
|
+
"url": "https://github.com/Esri/arcgis-rest-js/issues"
|
|
49
|
+
},
|
|
50
|
+
"homepage": "https://github.com/Esri/arcgis-rest-js#readme"
|
|
51
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from "./users";
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
/* Copyright (c) 2018 Environmental Systems Research Institute, Inc.
|
|
2
|
+
* Apache-2.0 */
|
|
3
|
+
|
|
4
|
+
import {
|
|
5
|
+
request,
|
|
6
|
+
IRequestOptions,
|
|
7
|
+
getPortalUrl
|
|
8
|
+
} from "@esri/arcgis-rest-request";
|
|
9
|
+
|
|
10
|
+
import { IUser } from "@esri/arcgis-rest-common-types";
|
|
11
|
+
import { UserSession, IUserRequestOptions } from "@esri/arcgis-rest-auth";
|
|
12
|
+
|
|
13
|
+
export interface IGetUserRequestOptions extends IRequestOptions {
|
|
14
|
+
/**
|
|
15
|
+
* A session representing a logged in user.
|
|
16
|
+
*/
|
|
17
|
+
authentication?: UserSession;
|
|
18
|
+
/**
|
|
19
|
+
* Supply a username if you'd like to fetch information about a different user than is being used to authenticate the request.
|
|
20
|
+
*/
|
|
21
|
+
username?: string;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Get information about a user. This method has proven so generically useful that you can also call [`UserSession.getUser()`](../../auth/UserSession#getUser-summary).
|
|
26
|
+
*
|
|
27
|
+
* ```js
|
|
28
|
+
* import { getUser } from '@esri/arcgis-rest-users';
|
|
29
|
+
*
|
|
30
|
+
* getUser("jsmith")
|
|
31
|
+
* .then(
|
|
32
|
+
* results => {
|
|
33
|
+
* // {
|
|
34
|
+
* // firstName: "John",
|
|
35
|
+
* // lastName: "Smith",
|
|
36
|
+
* // tags: ["GIS Analyst", "City of Redlands"],
|
|
37
|
+
* // created: 1258501046000
|
|
38
|
+
* // etc.
|
|
39
|
+
* // };
|
|
40
|
+
* })
|
|
41
|
+
* ```
|
|
42
|
+
*
|
|
43
|
+
* @param requestOptions - options to pass through in the request
|
|
44
|
+
* @returns A Promise that will resolve with metadata about the user
|
|
45
|
+
*/
|
|
46
|
+
export function getUser(
|
|
47
|
+
requestOptions?: string | IGetUserRequestOptions
|
|
48
|
+
): Promise<IUser> {
|
|
49
|
+
let url;
|
|
50
|
+
let options = { httpMethod: "GET" } as IGetUserRequestOptions;
|
|
51
|
+
|
|
52
|
+
// if a username is passed, assume ArcGIS Online
|
|
53
|
+
if (typeof requestOptions === "string") {
|
|
54
|
+
url = `https://www.arcgis.com/sharing/rest/community/users/${requestOptions}`;
|
|
55
|
+
} else {
|
|
56
|
+
// if an authenticated session is passed, default to that user/portal unless another username is provided manually
|
|
57
|
+
const username =
|
|
58
|
+
requestOptions.username || requestOptions.authentication.username;
|
|
59
|
+
url = `${getPortalUrl(requestOptions)}/community/users/${encodeURIComponent(
|
|
60
|
+
username
|
|
61
|
+
)}`;
|
|
62
|
+
options = {
|
|
63
|
+
...requestOptions,
|
|
64
|
+
...options
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
// send the request
|
|
69
|
+
return request(url, options);
|
|
70
|
+
}
|