diff --git a/e2e/suites/list-views/file-libraries.test.ts b/e2e/suites/list-views/file-libraries.test.ts
index 5fb17bb30..96b9cc9be 100755
--- a/e2e/suites/list-views/file-libraries.test.ts
+++ b/e2e/suites/list-views/file-libraries.test.ts
@@ -57,11 +57,11 @@ describe('File Libraries', () => {
.all([
apis.admin.people.createUser(username),
apis.admin.sites.createSite(sitePublic, SITE_VISIBILITY.PUBLIC),
- apis.admin.sites.createSite(siteModerated, SITE_VISIBILITY.MODERATED, { description: siteDescription }),
- apis.admin.sites.createSite(sitePrivate, SITE_VISIBILITY.PRIVATE, { description: '' }),
+ apis.admin.sites.createSite(siteModerated, SITE_VISIBILITY.MODERATED, siteDescription),
+ apis.admin.sites.createSite(sitePrivate, SITE_VISIBILITY.PRIVATE, null),
apis.admin.sites.createSite(adminSite, SITE_VISIBILITY.PUBLIC),
- apis.admin.sites.createSite(siteName, SITE_VISIBILITY.PUBLIC, { id: siteId1 }),
- apis.admin.sites.createSite(siteName, SITE_VISIBILITY.PUBLIC, { id: siteId2 })
+ apis.admin.sites.createSite(siteName, SITE_VISIBILITY.PUBLIC, null, siteId1),
+ apis.admin.sites.createSite(siteName, SITE_VISIBILITY.PUBLIC, null, siteId2)
])
.then(() => apis.admin.sites.addSiteMember(sitePublic, username, SITE_ROLES.SITE_CONSUMER))
.then(() => apis.admin.sites.addSiteMember(siteModerated, username, SITE_ROLES.SITE_MANAGER))
diff --git a/e2e/utilities/repo-client/apis/sites/sites-api-models.ts b/e2e/utilities/repo-client/apis/sites/sites-api-models.ts
deleted file mode 100755
index 598aad900..000000000
--- a/e2e/utilities/repo-client/apis/sites/sites-api-models.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*!
- * @license
- * Alfresco Example Content Application
- *
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- */
-
-import { SITE_VISIBILITY } from '../../../../configs';
-
-export class Site {
- title?: string;
- visibility?: string = SITE_VISIBILITY.PUBLIC;
- id?: string;
- description?: string;
-
- constructor(title: string, visibility: string, details: Site) {
- this.title = title;
- this.visibility = visibility;
- this.id = title;
- this.description = `${title} description`;
-
- Object.assign(this, details);
- }
-}
diff --git a/e2e/utilities/repo-client/apis/sites/sites-api.ts b/e2e/utilities/repo-client/apis/sites/sites-api.ts
index a824893ba..a73596cc2 100755
--- a/e2e/utilities/repo-client/apis/sites/sites-api.ts
+++ b/e2e/utilities/repo-client/apis/sites/sites-api.ts
@@ -23,102 +23,78 @@
* along with Alfresco. If not, see .
*/
-import { RepoApi } from '../repo-api';
-import { Site } from './sites-api-models';
+import { RepoApiNew } from '../repo-api-new';
+import { SiteBody, SiteMemberRoleBody, SiteMemberBody } from 'alfresco-js-api-node';
+import { SITE_VISIBILITY } from '../../../../configs';
-export class SitesApi extends RepoApi {
- getSite(id: string): Promise {
- return this
- .get(`/sites/${id}`)
- .catch(this.handleError);
+export class SitesApi extends RepoApiNew {
+
+ constructor(username?, password?) {
+ super(username, password);
}
- getSiteContainers(siteId: string): Promise {
- return this
- .get(`/sites/${siteId}/containers`)
- .then(resp => resp.data.list.entries)
- .catch(this.handleError);
+ async getSite(siteId: string) {
+ await this.apiAuth();
+ return await this.alfrescoJsApi.core.sitesApi.getSite(siteId);
}
- getDocLibId(siteId: string) {
- return this.getSiteContainers(siteId)
- .then(resp => resp[0].entry.id)
- .catch(this.handleError);
+ async getDocLibId(siteId: string) {
+ await this.apiAuth();
+ return (await this.alfrescoJsApi.core.sitesApi.getSiteContainers(siteId)).list.entries[0].entry.id;
}
- updateSite(id: string, details?: Site): Promise {
- if (details.id) {
- delete details.id;
- }
-
- return this
- .put(`/sites/${id}`, { data: details })
- .catch(this.handleError);
- }
-
- createOrUpdateSite(title: string, visibility: string, details?: Site): Promise {
- const site: Site = new Site(title, visibility, details);
- const onSuccess = (response) => response;
- const onError = (response) => {
- return (response.statusCode === 409)
- ? Promise.resolve(this.updateSite(site.id, site))
- : Promise.reject(response);
+ async createSite(title: string, visibility?: string, description?: string, siteId?: string) {
+ const site = {
+ title,
+ visibility: visibility || SITE_VISIBILITY.PUBLIC,
+ description: description,
+ id: siteId || title
};
- return this
- .post(`/sites`, { data: site })
- .then(onSuccess, onError)
- .catch(this.handleError);
+ await this.apiAuth();
+ return await this.alfrescoJsApi.core.sitesApi.createSite(site);
}
- createSite(title: string, visibility: string, details?: Site): Promise {
- const site: Site = new Site(title, visibility, details);
- return this
- .post(`/sites`, { data: site })
- .catch(this.handleError);
+ async createSites(titles: string[], visibility: string) {
+ return await titles.reduce(async (previous: any, current: any) => {
+ await previous;
+ return await this.createSite(current, visibility);
+ }, Promise.resolve());
}
- createSites(titles: string[], visibility: string): Promise {
- return titles.reduce((previous, current) => (
- previous.then(() => this.createSite(current, visibility))
- ), Promise.resolve());
+ async deleteSite(siteId: string, permanent: boolean = true) {
+ await this.apiAuth();
+ return this.alfrescoJsApi.core.sitesApi.deleteSite(siteId, { permanent });
}
- deleteSite(id: string, permanent: boolean = true): Promise {
- return this
- .delete(`/sites/${id}?permanent=${permanent}`)
- .catch(this.handleError);
+ async deleteSites(siteIds: string[], permanent: boolean = true) {
+ return await siteIds.reduce(async (previous, current) => {
+ await previous;
+ return await this.deleteSite(current);
+ }, Promise.resolve());
}
- deleteSites(ids: string[], permanent: boolean = true): Promise {
- return ids.reduce((previous, current) => (
- previous.then(() => this.deleteSite(current))
- ), Promise.resolve());
- }
-
- updateSiteMember(siteId: string, userId: string, role: string): Promise {
- return this
- .put(`/sites/${siteId}/members/${userId}`, { data: { role } })
- .catch(this.handleError);
- }
-
- addSiteMember(siteId: string, userId: string, role: string): Promise {
- const onSuccess = (response) => response;
- const onError = (response) => {
- return (response.statusCode === 409)
- ? Promise.resolve(this.updateSiteMember(siteId, userId, role))
- : Promise.reject(response);
+ async updateSiteMember(siteId: string, userId: string, role: string) {
+ const siteRole = {
+ role: role
};
- return this
- .post(`/sites/${siteId}/members`, { data: { role, id: userId } })
- .then(onSuccess, onError)
- .catch(this.handleError);
+ await this.apiAuth();
+ return await this.alfrescoJsApi.core.sitesApi.updateSiteMember(siteId, userId, siteRole);
}
- deleteSiteMember(siteId: string, userId: string): Promise {
- return this
- .delete(`/sites/${siteId}/members/${userId}`)
- .catch(this.handleError);
+ async addSiteMember(siteId: string, userId: string, role: string) {
+ const memberBody = {
+ id: userId,
+ role: role
+ };
+
+ await this.apiAuth();
+ return await this.alfrescoJsApi.core.sitesApi.addSiteMember(siteId, memberBody);
+ }
+
+ async deleteSiteMember(siteId: string, userId: string) {
+ await this.apiAuth();
+ return await this.alfrescoJsApi.core.sitesApi.removeSiteMember(siteId, userId);
}
}
diff --git a/e2e/utilities/repo-client/repo-client.ts b/e2e/utilities/repo-client/repo-client.ts
index 153e55f70..bc940ee9f 100755
--- a/e2e/utilities/repo-client/repo-client.ts
+++ b/e2e/utilities/repo-client/repo-client.ts
@@ -54,7 +54,7 @@ export class RepoClient {
}
get sites() {
- return new SitesApi(this.auth, this.config);
+ return new SitesApi(this.auth.username, this.auth.password);
}
get favorites() {