fix compatibility with nc13

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Jul 3, 2018 · 201a09d · 201a09d
1 parent 6643d13
commit 201a09d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/build/bundle.js b/build/bundle.js
diff --git a/js/Api.ts b/js/Api.ts
@@ -20,12 +20,23 @@ export class Api {
 
 	listFolders(): Thenable<Folder[]> {
 		return $.getJSON(this.getUrl('folders'))
-			.then((data:OCSResult<Folder[]>) => data.ocs.data);
+			.then((data: OCSResult<Folder[]>) => data.ocs.data);
 	}
 
 	listGroups(): Thenable<Group[]> {
-		return $.getJSON(OC.linkToOCS('cloud', 1) + 'groups/details')
-			.then((data: OCSResult<{ groups: string[]; }>) => data.ocs.data.groups);
+		const version = parseInt(oc_config.version, 10);
+		if (version >= 14) {
+			return $.getJSON(OC.linkToOCS('cloud', 1) + 'groups/details')
+				.then((data: OCSResult<{ groups: Group[]; }>) => data.ocs.data.groups);
+		} else {
+			return $.getJSON(OC.linkToOCS('cloud', 1) + 'groups')
+				.then((data: OCSResult<{ groups: string[]; }>) => data.ocs.data.groups.map(group => {
+					return {
+						id: group,
+						displayname: group
+					};
+				}));
+		}
 	}
 
 	createFolder(mountPoint: string): Thenable<number> {

diff --git a/js/Nextcloud.d.ts b/js/Nextcloud.d.ts
@@ -37,6 +37,19 @@ declare namespace OC {
 
 declare function t(app: string, string: string, vars?: { [key: string]: string }, count?: number, options?: EscapeOptions): string;
 
+declare const oc_config: {
+	blacklist_files_regex: string;
+	enable_avatars: boolean;
+	last_password_link: string | null;
+	modRewriteWorking: boolean;
+	session_keepalive: boolean;
+	session_lifetime: boolean;
+	"sharing.maxAutocompleteResults": number;
+	"sharing.minSearchStringLength": number;
+	version: string;
+	versionString: string;
+};
+
 declare module 'NC' {
 	export interface OCSResult<T> {
 		ocs: {