From 18cf30411c44bf6fbad343564c613cc35ad80127 Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Fri, 8 Nov 2024 18:46:48 +0100
Subject: [PATCH 01/19] fix:get available context prevent duplicate domain
 returns, return real node data

---
 .../service/config/ConfigServiceImpl.java       | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Backend/services/core/src/main/java/org/edu_sharing/service/config/ConfigServiceImpl.java b/Backend/services/core/src/main/java/org/edu_sharing/service/config/ConfigServiceImpl.java
index 9fa1fa26c..4fdec3579 100644
--- a/Backend/services/core/src/main/java/org/edu_sharing/service/config/ConfigServiceImpl.java
+++ b/Backend/services/core/src/main/java/org/edu_sharing/service/config/ConfigServiceImpl.java
@@ -116,12 +116,17 @@ public Context getContext(String domain) throws Exception {
 
     @Override
     public List<Context> getAvailableContext() throws Exception {
-        buildContextCache();
-        return contextCache.getKeys()
-                .stream()
-                .map(contextCache::get)
-                .filter(Objects::nonNull) //maybe gets null while we are iterating over
-                .collect(Collectors.toList());
+        return AuthenticationUtil.runAsSystem(() -> {
+            String eduSharingSystemFolderContext = userEnvironmentTool.getEdu_SharingContextFolder();
+            Map<String, Map<String, Object>> dynamicContextObjects = nodeService.getChildrenPropsByType(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, eduSharingSystemFolderContext, CCConstants.CCM_TYPE_CONTEXT);
+            return dynamicContextObjects
+                    .values()
+                    .stream()
+                    .map(x -> x.get(CCConstants.CCM_PROP_CONTEXT_CONFIG).toString())
+                    .map(CheckedFunction.wrap(x -> objectMapper.readValue(x, Context.class), null))
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+        });
     }
 
     private void buildContextCache() throws Exception {

From fad3629a8267a8b1b68066d2d08cd419fc469288 Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Mon, 11 Nov 2024 11:01:26 +0100
Subject: [PATCH 02/19] fix:remove inline style

---
 .../pages/admin-page/mediacenter/mediacenter.component.html  | 3 ---
 .../pages/admin-page/mediacenter/mediacenter.component.scss  | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Frontend/src/app/pages/admin-page/mediacenter/mediacenter.component.html b/Frontend/src/app/pages/admin-page/mediacenter/mediacenter.component.html
index a13987e2f..49ab72dbd 100644
--- a/Frontend/src/app/pages/admin-page/mediacenter/mediacenter.component.html
+++ b/Frontend/src/app/pages/admin-page/mediacenter/mediacenter.component.html
@@ -231,7 +231,6 @@ <h4 class="mat-heading-4 mat-heading-underline">
       <input
         #importMediacentersSelect
         type="file"
-        style="display: none"
         id="importMediacentersSelect"
         accept=".csv"
         (change)="updateMediacentersFile($event)"
@@ -253,7 +252,6 @@ <h4 class="mat-heading-4 mat-heading-underline">
       <input
         #importOrganisationsSelect
         type="file"
-        style="display: none"
         id="importOrganisationsSelect"
         accept=".csv"
         (change)="updateOrganisationsFile($event)"
@@ -276,7 +274,6 @@ <h4 class="mat-heading-4 mat-heading-underline">
       <input
         #importOrgMcSelect
         type="file"
-        style="display: none"
         id="importOrgMcSelect"
         accept=".csv"
         (change)="updateOrgMcFile($event)"
diff --git a/Frontend/src/app/pages/admin-page/mediacenter/mediacenter.component.scss b/Frontend/src/app/pages/admin-page/mediacenter/mediacenter.component.scss
index fb09bee76..da2bd05d4 100644
--- a/Frontend/src/app/pages/admin-page/mediacenter/mediacenter.component.scss
+++ b/Frontend/src/app/pages/admin-page/mediacenter/mediacenter.component.scss
@@ -19,6 +19,11 @@
         }
     }
 }
+#importMediacentersSelect,
+#importOrganisationsSelect,
+#importOrgMcSelect {
+    display: none;
+}
 .select-mediacenter {
     display: flex;
     flex-direction: column;

From 0f185ab9501aed915bc60eecac98e1fe9b3ed25f Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Mon, 11 Nov 2024 13:39:05 +0100
Subject: [PATCH 03/19] fix:possible nlp, logging removed

---
 .../mds-editor-widget-facet-list.component.html                 | 2 +-
 .../mds-editor-widget-facet-list.component.ts                   | 1 -
 .../src/app/pages/search-page/search-page-restore.service.ts    | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-facet-list/mds-editor-widget-facet-list.component.html b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-facet-list/mds-editor-widget-facet-list.component.html
index f7c2fbae1..9f2da6e09 100644
--- a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-facet-list/mds-editor-widget-facet-list.component.html
+++ b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-facet-list/mds-editor-widget-facet-list.component.html
@@ -30,7 +30,7 @@
   </ul>
   <button
     *ngIf="
-      (facetAggregationSubject | async)?.hasMore && facetValuesFiltered.length < MAX_FACET_COUNT
+      (facetAggregationSubject | async)?.hasMore && facetValuesFiltered?.length < MAX_FACET_COUNT
     "
     mat-button
     color="primary"
diff --git a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-facet-list/mds-editor-widget-facet-list.component.ts b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-facet-list/mds-editor-widget-facet-list.component.ts
index 22c090260..2e4f12f8c 100644
--- a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-facet-list/mds-editor-widget-facet-list.component.ts
+++ b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-facet-list/mds-editor-widget-facet-list.component.ts
@@ -157,7 +157,6 @@ export class MdsEditorWidgetFacetListComponent
     private registerFormControls(): void {
         // (Re-)create `formArray` on changed facet values.
         this.facetAggregationSubject.subscribe((facetValues) => {
-            console.log(this.widget.definition.id, facetValues, this.filter.value);
             if (!facetValues) {
                 // restore widget state
                 this.mdsEditorInstance
diff --git a/Frontend/src/app/pages/search-page/search-page-restore.service.ts b/Frontend/src/app/pages/search-page/search-page-restore.service.ts
index eb718d952..07a58bad5 100644
--- a/Frontend/src/app/pages/search-page/search-page-restore.service.ts
+++ b/Frontend/src/app/pages/search-page/search-page-restore.service.ts
@@ -43,7 +43,6 @@ export class SearchPageRestoreService {
     }
     registerMdsState(state: BehaviorSubject<MdsState>): void {
         state.subscribe((s) => {
-            console.log('register', s);
             this._getEntryOrCreate().mdsState = s;
         });
     }

From cf7eadb36eca8d2947639ae8d54ef4a36080c6a4 Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Mon, 11 Nov 2024 16:45:18 +0100
Subject: [PATCH 04/19] fix:search page store query param state of sort
 criteria

---
 .../search-page-results.component.html        |  1 +
 .../search-page-results.component.ts          |  8 ++++++
 .../search-page-results.service.ts            | 25 ++++++++++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/Frontend/src/app/pages/search-page/search-page-results.component.html b/Frontend/src/app/pages/search-page/search-page-results.component.html
index 22b22eac8..a38f8133a 100644
--- a/Frontend/src/app/pages/search-page/search-page-results.component.html
+++ b/Frontend/src/app/pages/search-page/search-page-results.component.html
@@ -46,6 +46,7 @@ <h2 class="mat-heading-2">
   [displayType]="(state | async).displayType"
   (displayTypeChange)="setDisplayType($event)"
   [sort]="(state | async).sortConfig"
+  (sortChange)="updateSort($event)"
   [primaryInstance]="true"
   [initConfig]="{ actionbar, customOptions: addToCollectionMode.value?.customOptions}"
 >
diff --git a/Frontend/src/app/pages/search-page/search-page-results.component.ts b/Frontend/src/app/pages/search-page/search-page-results.component.ts
index ae460a0a1..c1d2cd769 100644
--- a/Frontend/src/app/pages/search-page/search-page-results.component.ts
+++ b/Frontend/src/app/pages/search-page/search-page-results.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import {
     ActionbarComponent,
+    ListSortConfig,
     NodeEntriesDisplayType,
     Scope,
     TemporaryStorageService,
@@ -91,4 +92,11 @@ export class SearchPageResultsComponent implements OnInit, OnDestroy {
     setDisplayType(displayType: NodeEntriesDisplayType) {
         this.results.patchState({ displayType });
     }
+
+    updateSort(sort: ListSortConfig) {
+        this.results.searchSort.setUserValue({
+            active: sort.active,
+            direction: sort.direction,
+        });
+    }
 }
diff --git a/Frontend/src/app/pages/search-page/search-page-results.service.ts b/Frontend/src/app/pages/search-page/search-page-results.service.ts
index 273686256..f66f1685a 100644
--- a/Frontend/src/app/pages/search-page/search-page-results.service.ts
+++ b/Frontend/src/app/pages/search-page/search-page-results.service.ts
@@ -42,6 +42,9 @@ import { SearchPageService, SearchRequestParams } from './search-page.service';
 import { RestConstants } from '../../core-module/rest/rest-constants';
 import { MdsWidgetType } from 'src/app/features/mds/types/types';
 import { RestSearchService } from 'src/app/core-module/core.module';
+import { ActivatedRoute } from '@angular/router';
+import { UserModifiableValuesService } from './user-modifiable-values';
+import { Sort } from '@angular/material/sort';
 
 export interface SearchPageResults {
     diffCount?: Observable<number>;
@@ -56,6 +59,10 @@ export interface SearchPageState {
 
 @Injectable()
 export class SearchPageResultsService implements SearchPageResults, OnDestroy {
+    readonly searchSort = this._userModifiableValues.createMapped<Sort>({
+        fromString: (v) => JSON.parse(v),
+        toString: (v) => JSON.stringify(v),
+    });
     readonly resultsDataSource = new NodeDataSourceRemote(this._injector);
     readonly totalResults = this.resultsDataSource.observeTotal();
     readonly collectionsDataSource = new NodeDataSourceRemote(this._injector);
@@ -81,6 +88,8 @@ export class SearchPageResultsService implements SearchPageResults, OnDestroy {
         private _searchPage: SearchPageService,
         private _searchPageRestore: SearchPageRestoreService,
         private _translate: TranslateService,
+        private _route: ActivatedRoute,
+        private _userModifiableValues: UserModifiableValuesService,
     ) {
         this._registerPageRestore();
         this._registerSearchObservables();
@@ -183,6 +192,20 @@ export class SearchPageResultsService implements SearchPageResults, OnDestroy {
         this.collectionsDataSource.isLoadingSubject.subscribe((isLoading) =>
             this.loadingCollections.next(!!isLoading),
         );
+        this.searchSort.registerQueryParameter('sort', this._route);
+        this.searchSort
+            .observeUserValue()
+            .pipe(first())
+            .subscribe((sort) => {
+                if (sort) {
+                    this.patchState({
+                        sortConfig: {
+                            ...this.state.value.sortConfig,
+                            ...sort,
+                        },
+                    });
+                }
+            });
     }
 
     private _registerColumnsAndSortConfig(): void {
@@ -209,7 +232,7 @@ export class SearchPageResultsService implements SearchPageResults, OnDestroy {
         // Register sort.
         mds.pipe(map((mds) => MdsHelperService.getSortInfo(mds, 'search'))).subscribe(
             (sortInfo) => {
-                if (this.state.value.sortConfig === null) {
+                if (this.state.value.sortConfig === null || !this.state.value.sortConfig?.columns) {
                     this.patchState({
                         sortConfig: {
                             allowed: true,

From a1864de2229d15dd8c4ab805329c93128382ef0c Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Tue, 12 Nov 2024 11:39:11 +0100
Subject: [PATCH 05/19] fix:remove inline style for csp

---
 .../mds-editor-widget-authority.component.html                  | 2 +-
 .../mds-editor-widget-chips.component.html                      | 2 +-
 .../mds-editor-widget-tree.component.html                       | 2 +-
 .../mds-editor-widget-version.component.html                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-authority/mds-editor-widget-authority.component.html b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-authority/mds-editor-widget-authority.component.html
index ba1f51b13..12cb68002 100644
--- a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-authority/mds-editor-widget-authority.component.html
+++ b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-authority/mds-editor-widget-authority.component.html
@@ -41,4 +41,4 @@
 </es-mds-editor-widget-container>
 
 <!-- Load styles for mat-select-arrow. -->
-<mat-select hidden style="display: none"></mat-select>
+<mat-select hidden class="display-none"></mat-select>
diff --git a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-chips/mds-editor-widget-chips.component.html b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-chips/mds-editor-widget-chips.component.html
index 1a0f8fc3b..ef3e6f20b 100644
--- a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-chips/mds-editor-widget-chips.component.html
+++ b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-chips/mds-editor-widget-chips.component.html
@@ -122,4 +122,4 @@
 </es-mds-editor-widget-container>
 
 <!-- Load styles for mat-select-arrow. -->
-<mat-select hidden style="display: none"></mat-select>
+<mat-select hidden class="display-none"></mat-select>
diff --git a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-tree/mds-editor-widget-tree.component.html b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-tree/mds-editor-widget-tree.component.html
index 667b2a491..2852edaeb 100644
--- a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-tree/mds-editor-widget-tree.component.html
+++ b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-tree/mds-editor-widget-tree.component.html
@@ -138,4 +138,4 @@
 </ng-template>
 
 <!-- Load styles for mat-select-arrow. -->
-<mat-select hidden style="display: none"></mat-select>
+<mat-select hidden class="display-none"></mat-select>
diff --git a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-version/mds-editor-widget-version.component.html b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-version/mds-editor-widget-version.component.html
index 0256b5704..5a6123322 100644
--- a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-version/mds-editor-widget-version.component.html
+++ b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-version/mds-editor-widget-version.component.html
@@ -4,7 +4,7 @@
       <input
         #fileInput
         type="file"
-        style="display: none"
+        class="display-none"
         id="xmlSelect"
         (change)="setFile($event)"
       />

From 46bb76acbdd7cc9a35edd8899edaa7e93f346373 Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Tue, 12 Nov 2024 12:00:57 +0100
Subject: [PATCH 06/19] fix: add rate read permission

---
 .../dialog-modules/share-dialog/share-dialog.component.ts       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Frontend/src/app/features/dialogs/dialog-modules/share-dialog/share-dialog.component.ts b/Frontend/src/app/features/dialogs/dialog-modules/share-dialog/share-dialog.component.ts
index 030cf931d..62bb4dc96 100644
--- a/Frontend/src/app/features/dialogs/dialog-modules/share-dialog/share-dialog.component.ts
+++ b/Frontend/src/app/features/dialogs/dialog-modules/share-dialog/share-dialog.component.ts
@@ -78,6 +78,7 @@ export class ShareDialogComponent implements OnInit, AfterViewInit {
         'ReadAll',
         'Comment',
         'Rate',
+        'RateRead',
         'Write',
         'Delete',
         'DeleteChildren',
@@ -109,6 +110,7 @@ export class ShareDialogComponent implements OnInit, AfterViewInit {
         ['Comment', ['Consumer']],
         ['Feedback', ['Consumer']],
         ['Rate', ['Consumer']],
+        ['RateRead', ['Consumer']],
         ['Embed', ['Consumer']],
         ['Write', ['Editor']],
         ['DeleteChildren', ['Delete']],

From b76b92a4a3ba5ecca2357ef70069f255296c7021 Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Wed, 13 Nov 2024 11:47:46 +0100
Subject: [PATCH 07/19] feat: default sort state for search and regular

---
 .../metadataset/v2/MetadataReader.java        | 15 ++++++
 .../restservices/mds/v1/model/MdsSort.java    | 17 ++++---
 .../rest/api/src/main/resources/openapi.json  |  3 ++
 .../search-page/node-data-source-remote.ts    |  3 +-
 .../search-page-results.service.ts            | 46 ++++++++++++++++---
 .../pages/search-page/search-page.service.ts  |  2 +
 6 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataReader.java b/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataReader.java
index 60fa43ff7..2c4f56d87 100644
--- a/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataReader.java
+++ b/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataReader.java
@@ -949,6 +949,21 @@ private List<MetadataSort> getSorts() throws XPathExpressionException {
                         }
                     }
                 }
+                if (name.equals("defaultSearch")) {
+                    NodeList list3 = data.getChildNodes();
+                    for (int k = 0; k < list3.getLength(); k++) {
+                        if(sort.getDefaultValueSearch() == null) {
+                            sort.setDefaultValueSearch(new MetadataSort.MetadataSortDefault());
+                        }
+                        Node data2 = list3.item(k);
+                        if (data2.getNodeName().equals("sortBy")) {
+                            sort.getDefaultValueSearch().setSortBy(data2.getTextContent());
+                        }
+                        if (data2.getNodeName().equals("sortAscending")) {
+                            sort.getDefaultValueSearch().setSortAscending(Boolean.parseBoolean(data2.getTextContent()));
+                        }
+                    }
+                }
                 if (name.equals("columns")) {
                     List<MetadataSortColumn> columns = getMetadataSortColumns(data);
                     sort.setColumns(columns);
diff --git a/Backend/services/core/src/main/java/org/edu_sharing/restservices/mds/v1/model/MdsSort.java b/Backend/services/core/src/main/java/org/edu_sharing/restservices/mds/v1/model/MdsSort.java
index 19bdc4811..13c1789c6 100644
--- a/Backend/services/core/src/main/java/org/edu_sharing/restservices/mds/v1/model/MdsSort.java
+++ b/Backend/services/core/src/main/java/org/edu_sharing/restservices/mds/v1/model/MdsSort.java
@@ -33,7 +33,10 @@ public void setSortAscending(boolean sortAscending) {
 		}
 	}
 	private String id;
+	@JsonProperty(value = "default")
 	private MdsSortDefault defaultValue;
+	@JsonProperty("defaultSearch")
+	private MdsSortDefault defaultValueSearch;
 	private List<MdsSortColumn> columns;
 
 	public MdsSort(){}
@@ -44,6 +47,11 @@ public MdsSort(MetadataSort sort) {
 			this.defaultValue.setSortBy(sort.getDefaultValue().getSortBy());
 			this.defaultValue.setSortAscending(sort.getDefaultValue().isSortAscending());
 		}
+		if(sort.getDefaultValueSearch()!=null){
+			this.defaultValueSearch=new MdsSortDefault();
+			this.defaultValueSearch.setSortBy(sort.getDefaultValueSearch().getSortBy());
+			this.defaultValueSearch.setSortAscending(sort.getDefaultValueSearch().isSortAscending());
+		}
 		if(sort.getColumns()!=null){
 			columns=new ArrayList<>();
 			for(MetadataSortColumn column : sort.getColumns()){
@@ -67,14 +75,5 @@ public List<MdsSortColumn> getColumns() {
 	public void setColumns(List<MdsSortColumn> columns) {
 		this.columns = columns;
 	}
-
-	@JsonProperty("default")
-	public MdsSortDefault getDefaultValue() {
-		return defaultValue;
-	}
-
-	public void setDefaultValue(MdsSortDefault defaultValue) {
-		this.defaultValue = defaultValue;
-	}
 }
 
diff --git a/Backend/services/rest/api/src/main/resources/openapi.json b/Backend/services/rest/api/src/main/resources/openapi.json
index 89a076b91..e305997bc 100644
--- a/Backend/services/rest/api/src/main/resources/openapi.json
+++ b/Backend/services/rest/api/src/main/resources/openapi.json
@@ -2720,6 +2720,9 @@
           "default": {
             "$ref": "#/components/schemas/MdsSortDefault"
           },
+          "defaultSearch": {
+            "$ref": "#/components/schemas/MdsSortDefault"
+          },
           "id": {
             "type": "string"
           }
diff --git a/Frontend/src/app/pages/search-page/node-data-source-remote.ts b/Frontend/src/app/pages/search-page/node-data-source-remote.ts
index 1309053da..dd45401ef 100644
--- a/Frontend/src/app/pages/search-page/node-data-source-remote.ts
+++ b/Frontend/src/app/pages/search-page/node-data-source-remote.ts
@@ -25,7 +25,6 @@ type Range = NodeCacheRange;
 
 export interface NodeRequestParams {
     range: Range;
-    sort?: Sort;
 }
 
 export interface NodeResponse<T> {
@@ -285,7 +284,7 @@ export class NodeDataSourceRemote<
 
     private _downloadAndCache(missingRange: Range): Observable<void> {
         if (missingRange) {
-            return this._remote({ range: missingRange, sort: this._sortHandler.currentSort }).pipe(
+            return this._remote({ range: missingRange }).pipe(
                 tap((response) => (this._paginationHandler.length = response.total)),
                 tap((response) =>
                     this._cache.add(this._getCacheSlice(missingRange, response.data)),
diff --git a/Frontend/src/app/pages/search-page/search-page-results.service.ts b/Frontend/src/app/pages/search-page/search-page-results.service.ts
index f66f1685a..21c1fb263 100644
--- a/Frontend/src/app/pages/search-page/search-page-results.service.ts
+++ b/Frontend/src/app/pages/search-page/search-page-results.service.ts
@@ -8,7 +8,7 @@ import {
     SearchService,
 } from 'ngx-edu-sharing-api';
 import * as rxjs from 'rxjs';
-import { BehaviorSubject, Observable, Subject } from 'rxjs';
+import { BehaviorSubject, combineLatest, Observable, Subject } from 'rxjs';
 import {
     debounceTime,
     distinctUntilChanged,
@@ -96,6 +96,7 @@ export class SearchPageResultsService implements SearchPageResults, OnDestroy {
         this._registerColumnsAndSortConfig();
         this._registerLoadingProgress();
         this._registerResultDiffCount();
+        this._registerDefaultSort();
     }
 
     ngOnDestroy(): void {
@@ -127,6 +128,7 @@ export class SearchPageResultsService implements SearchPageResults, OnDestroy {
                 this._searchPage.searchFilters.observeValue(),
                 // .pipe(tap((value) => console.log('searchFilters changed', value))),
                 this._searchPage.searchString.observeValue(),
+                this.state,
                 // .pipe(tap((value) => console.log('searchString changed', value))),
             ])
             .pipe(
@@ -154,12 +156,13 @@ export class SearchPageResultsService implements SearchPageResults, OnDestroy {
                 ),
                 tap(() => this.loadingParams.next(false)),
                 map(
-                    ([repository, metadataSet, searchFilters, searchString]) =>
+                    ([repository, metadataSet, searchFilters, searchString, state]) =>
                         new SearchRequestParams(
                             repository,
                             metadataSet,
                             searchFilters,
                             searchString,
+                            state.sortConfig,
                         ),
                 ),
                 distinctUntilChanged((x, y) => x.equals(y)),
@@ -168,8 +171,8 @@ export class SearchPageResultsService implements SearchPageResults, OnDestroy {
         const collectionRequestParams: Observable<SearchRequestParams> = searchRequestParams.pipe(
             // Omit searchFilters.
             map(
-                ({ repository, metadataSet, searchString }) =>
-                    new SearchRequestParams(repository, metadataSet, {}, searchString),
+                ({ repository, metadataSet, searchString, sort }) =>
+                    new SearchRequestParams(repository, metadataSet, {}, searchString, sort),
             ),
             distinctUntilChanged((x, y) => x.equals(y)),
         );
@@ -252,6 +255,37 @@ export class SearchPageResultsService implements SearchPageResults, OnDestroy {
             },
         );
     }
+    /**
+     * switches the default sort based on a present search string or not
+     */
+    private _registerDefaultSort() {
+        combineLatest([
+            this._searchPage.searchString
+                .observeValue()
+                .pipe(distinctUntilChanged((a, b) => (a == null ? b == null : b != null))),
+            combineLatest([
+                this._searchPage.activeMetadataSet.observeValue().pipe(filter((mds) => !!mds)),
+                this._searchPage.activeRepository.observeValue(),
+            ]).pipe(
+                switchMap(([metadataSet, repository]) =>
+                    this._mds.getMetadataSet({ repository, metadataSet }),
+                ),
+            ),
+        ])
+            .pipe(filter(([_, mds]) => !!mds.sorts.find((s) => s.id === 'search')?.defaultSearch))
+            .subscribe(([searchString, mds]) => {
+                const sorts = mds.sorts.find((s) => s.id === 'search');
+                const state = searchString ? sorts.defaultSearch : sorts.default;
+                console.log(searchString, mds, state);
+                this.patchState({
+                    sortConfig: {
+                        ...this.state.value.sortConfig,
+                        active: state.sortBy,
+                        direction: state.sortAscending ? 'asc' : 'desc',
+                    },
+                });
+            });
+    }
     patchState(data: Partial<SearchPageState>) {
         this.state.next({ ...this.state.value, ...data });
     }
@@ -274,8 +308,8 @@ export class SearchPageResultsService implements SearchPageResults, OnDestroy {
                     },
                     maxItems: request.range.endIndex - request.range.startIndex,
                     skipCount: request.range.startIndex,
-                    sortAscending: request.sort ? [request.sort.direction === 'asc'] : null,
-                    sortProperties: request.sort ? [request.sort.active] : null,
+                    sortAscending: params.sort ? [params.sort.direction === 'asc'] : null,
+                    sortProperties: params.sort ? [params.sort.active] : null,
                     contentType: 'FILES',
                     repository: params.repository,
                     metadataset: params.metadataSet,
diff --git a/Frontend/src/app/pages/search-page/search-page.service.ts b/Frontend/src/app/pages/search-page/search-page.service.ts
index 191cde4bb..4d932fe27 100644
--- a/Frontend/src/app/pages/search-page/search-page.service.ts
+++ b/Frontend/src/app/pages/search-page/search-page.service.ts
@@ -33,6 +33,7 @@ import { NavigationScheduler } from './navigation-scheduler';
 import { SearchPageResults } from './search-page-results.service';
 import { UserModifiableValuesService } from './user-modifiable-values';
 import { Widget } from '../../features/mds/mds-editor/mds-editor-instance.service';
+import { Sort } from '@angular/material/sort';
 
 export class SearchRequestParams {
     constructor(
@@ -40,6 +41,7 @@ export class SearchRequestParams {
         public readonly metadataSet: string,
         public readonly searchFilters: { [key: string]: string[] },
         public readonly searchString: string,
+        public readonly sort: Sort,
     ) {}
 
     equals(other: SearchRequestParams) {

From 2bbb927cb1562cd1a9778376d4060fa5764957e7 Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Wed, 13 Nov 2024 16:26:07 +0100
Subject: [PATCH 08/19] feat: default sort state for search and regular

---
 .../metadataset/v2/MetadataSort.java          | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataSort.java b/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataSort.java
index 0733a468b..8c3362ea1 100644
--- a/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataSort.java
+++ b/Backend/alfresco/module/src/main/java/org/edu_sharing/metadataset/v2/MetadataSort.java
@@ -1,11 +1,14 @@
 package org.edu_sharing.metadataset.v2;
 
+import com.fasterxml.jackson.annotation.JsonPropertyDescription;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 
 public class MetadataSort implements Serializable {
-	public class MetadataSortDefault implements Serializable {
+	public static class MetadataSortDefault implements Serializable {
 		private String sortBy;
 		private boolean sortAscending;
 
@@ -27,7 +30,14 @@ public void setSortAscending(boolean sortAscending) {
 	}
 	private String id;
 	private String mode;
+	@JsonPropertyDescription("Default sort state (for both with and without a search string)")
+	@Getter
+	@Setter
 	private MetadataSortDefault defaultValue=new MetadataSortDefault();
+	@JsonPropertyDescription("Default sort state only when searching (when unset, defaultValue is used)")
+	@Getter
+	@Setter
+	private MetadataSortDefault defaultValueSearch=null;
 	private List<MetadataSortColumn> columns;
 
 	public String getId() {
@@ -53,14 +63,6 @@ public void setColumns(List<MetadataSortColumn> columns) {
 		this.columns = columns;
 	}
 
-	public MetadataSortDefault getDefaultValue() {
-		return defaultValue;
-	}
-
-	public void setDefaultValue(MetadataSortDefault defaultValue) {
-		this.defaultValue = defaultValue;
-	}
-
 	@Override
 	public boolean equals(Object obj) {
 		if(obj instanceof MetadataSort){

From 1adb7ea7bb87c41b5490173380ea59d122cb9f2a Mon Sep 17 00:00:00 2001
From: Sebastian Wollner <wollner@edu-sharing.net>
Date: Tue, 5 Nov 2024 09:42:55 +0100
Subject: [PATCH 09/19] fix: Error reading
 /opt/alfresco/tomcat/shared/classes/config/defaults/transform/pipelines/.gitkeep

---
 deploy/docker/build/service/src/main/build/assets/entrypoint.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deploy/docker/build/service/src/main/build/assets/entrypoint.sh b/deploy/docker/build/service/src/main/build/assets/entrypoint.sh
index 1b3679865..fc599ffc9 100755
--- a/deploy/docker/build/service/src/main/build/assets/entrypoint.sh
+++ b/deploy/docker/build/service/src/main/build/assets/entrypoint.sh
@@ -378,6 +378,8 @@ grep -q '^[#]*\s*alfresco-pdf-renderer\.exe=' "${alfProps}" || echo 'alfresco-pd
 
 sed -i -r 's|^[#]*\s*local\.transform\.pipeline\.config\.dir=.*|local.transform.pipeline.config.dir='"$ALF_HOME/tomcat/shared/classes/config/default/transform/pipelines|" "${alfProps}"
 grep -q '^[#]*\s*local\.transform\.pipeline\.config\.dir=' "${alfProps}" || echo "local.transform.pipeline.config.dir=$ALF_HOME/tomcat/shared/classes/config/default/transform/pipelines" >>"${alfProps}"
+# fix: Error reading /opt/alfresco/tomcat/shared/classes/config/defaults/transform/pipelines/.gitkeep
+rm -f "$ALF_HOME/tomcat/shared/classes/config/default/transform/pipelines/.gitkeep"
 
 sed -i -r 's|^[#]*\s*ooo\.exe=.*|ooo.exe=|' "${alfProps}"
 grep -q '^[#]*\s*ooo\.exe=' "${alfProps}" || echo "ooo.exe=" >>"${alfProps}"

From 5d48900cf0fbccdb1ffa5082bb21ca3f318085ea Mon Sep 17 00:00:00 2001
From: Sebastian Wollner <wollner@edu-sharing.net>
Date: Thu, 14 Nov 2024 14:27:27 +0100
Subject: [PATCH 10/19] fix: timed permission rollback issue on
 updateTimedPermissions

---
 .../permission/PermissionServiceImpl.java     | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/Backend/services/core/src/main/java/org/edu_sharing/service/permission/PermissionServiceImpl.java b/Backend/services/core/src/main/java/org/edu_sharing/service/permission/PermissionServiceImpl.java
index dffa6ba78..93741a433 100644
--- a/Backend/services/core/src/main/java/org/edu_sharing/service/permission/PermissionServiceImpl.java
+++ b/Backend/services/core/src/main/java/org/edu_sharing/service/permission/PermissionServiceImpl.java
@@ -34,7 +34,6 @@
 import org.edu_sharing.alfrescocontext.gate.AlfAppContextGate;
 import org.edu_sharing.repository.client.rpc.*;
 import org.edu_sharing.repository.client.tools.CCConstants;
-import org.edu_sharing.repository.server.AuthenticationToolAPI;
 import org.edu_sharing.repository.server.MCAlfrescoAPIClient;
 import org.edu_sharing.repository.server.tools.ApplicationInfo;
 import org.edu_sharing.repository.server.tools.ApplicationInfoList;
@@ -57,8 +56,8 @@
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
-import java.util.*;
 import java.util.Collection;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toList;
@@ -584,23 +583,25 @@ private List<ACE> addCollectionCoordinatorPermission(NodeRef nodeRef, List<ACE>
      * @return
      */
     String getAdminAuthority(NodeRef nodeRef) {
-        String authorityAdministrator = null;
-        if (isSharedNode(nodeRef.getId())) {
-            Set<AccessPermission> allSetPermissions = serviceRegistry.getPermissionService()
-                    .getAllSetPermissions(nodeRef);
-            for (AccessPermission ap : allSetPermissions) {
-                NodeRef authorityNodeRef = authorityService.getAuthorityNodeRef(ap.getAuthority());
-                if (authorityNodeRef != null) {
-                    String groupType = (String) nodeService.getProperty(authorityNodeRef,
-                            QName.createQName(CCConstants.CCM_PROP_GROUPEXTENSION_GROUPTYPE));
-                    if (CCConstants.ADMINISTRATORS_GROUP_TYPE.equals(groupType)
-                            && ap.getPermission().equals(PermissionService.COORDINATOR)) {
-                        authorityAdministrator = ap.getAuthority();
+        return AuthenticationUtil.runAsSystem(() -> {
+            String authorityAdministrator = null;
+            if (isSharedNode(nodeRef.getId())) {
+                Set<AccessPermission> allSetPermissions = serviceRegistry.getPermissionService()
+                        .getAllSetPermissions(nodeRef);
+                for (AccessPermission ap : allSetPermissions) {
+                    NodeRef authorityNodeRef = authorityService.getAuthorityNodeRef(ap.getAuthority());
+                    if (authorityNodeRef != null) {
+                        String groupType = (String) nodeService.getProperty(authorityNodeRef,
+                                QName.createQName(CCConstants.CCM_PROP_GROUPEXTENSION_GROUPTYPE));
+                        if (CCConstants.ADMINISTRATORS_GROUP_TYPE.equals(groupType)
+                                && ap.getPermission().equals(PermissionService.COORDINATOR)) {
+                            authorityAdministrator = ap.getAuthority();
+                        }
                     }
                 }
             }
-        }
-        return authorityAdministrator;
+            return authorityAdministrator;
+        });
     }
 
     private boolean containslocalPerm(List<ACE> aces, String eduAuthority, String eduPermission) {
@@ -875,6 +876,7 @@ public void setPermissions(String nodeId, String authority, String[] permissions
             permissionsService.setInheritParentPermissions(nodeRef, inheritPermission);
         }
 
+
         String adminAuthority = getAdminAuthority(nodeRef);
 
         if (permissions != null) {

From 6aa5579ffe94c25bec60ea1fec1b813c1098ac96 Mon Sep 17 00:00:00 2001
From: Sebastian Wollner <wollner@edu-sharing.net>
Date: Fri, 15 Nov 2024 08:59:21 +0100
Subject: [PATCH 11/19] fix: added error handling

---
 .../permission/PermissionServiceImpl.java     | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/Backend/services/core/src/main/java/org/edu_sharing/service/permission/PermissionServiceImpl.java b/Backend/services/core/src/main/java/org/edu_sharing/service/permission/PermissionServiceImpl.java
index 93741a433..d25617f5e 100644
--- a/Backend/services/core/src/main/java/org/edu_sharing/service/permission/PermissionServiceImpl.java
+++ b/Backend/services/core/src/main/java/org/edu_sharing/service/permission/PermissionServiceImpl.java
@@ -86,7 +86,7 @@ public class PermissionServiceImpl implements org.edu_sharing.service.permission
     AuthorityService authorityService = serviceRegistry.getAuthorityService();
     BehaviourFilter policyBehaviourFilter = (BehaviourFilter) applicationContext.getBean("policyBehaviourFilter");
     MCAlfrescoAPIClient repoClient = new MCAlfrescoAPIClient();
-	private GuestService guestService = applicationContext.getBean(GuestService.class);
+    private GuestService guestService = applicationContext.getBean(GuestService.class);
     private PermissionService permissionService;
     private final RetryingTransactionHelper retryingTransactionHelper = serviceRegistry.getRetryingTransactionHelper();
 
@@ -168,7 +168,7 @@ public void setPermissions(String nodeId, List<ACE> aces, Boolean inheritPermiss
             }
 
             // flag to remove expired aces from acesNew
-            if(ace.getTo() != null && ace.getTo() <= now){
+            if (ace.getTo() != null && ace.getTo() <= now) {
                 remove = true;
             }
 
@@ -196,7 +196,7 @@ public void setPermissions(String nodeId, List<ACE> aces, Boolean inheritPermiss
         }
 
         for (ACE aceOld : acesOld) {
-            if(!aceOld.isInherited() && activeTimedAces.stream().anyMatch(x-> Objects.equals(x.getPermission(), aceOld.getPermission()) && Objects.equals(x.getAuthority(), aceOld.getAuthority()))){
+            if (!aceOld.isInherited() && activeTimedAces.stream().anyMatch(x -> Objects.equals(x.getPermission(), aceOld.getPermission()) && Objects.equals(x.getAuthority(), aceOld.getAuthority()))) {
                 continue;
             }
 
@@ -308,12 +308,12 @@ public void updateTimedPermissions() {
             retryingTransactionHelper.doInTransaction(() ->
                     AuthenticationUtil.runAs(() -> {
                         NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, timedPermission.getNode_id());
-                        if(!nodeService.exists(nodeRef)) {
-                            timedPermissionMapper.delete(timedPermission);
-                            return null;
-                        }
 
                         try {
+                            if (!nodeService.exists(nodeRef)) {
+                                timedPermissionMapper.delete(timedPermission);
+                                return null;
+                            }
                             addPermissions(timedPermission.getNode_id(),
                                     Map.of(timedPermission.getAuthority(), new String[]{timedPermission.getPermission()}), false, null, false, timedPermission.getUser());
                             if (timedPermission.getTo() == null) {
@@ -332,15 +332,19 @@ public void updateTimedPermissions() {
         for (TimedPermission timedPermission : permissionsToRemove) {
             retryingTransactionHelper.doInTransaction(() ->
                     AuthenticationUtil.runAs(() -> {
-                        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, timedPermission.getNode_id());
-                        if(nodeService.exists(nodeRef)) {
-                            permissionService.deletePermission(
-                                    nodeRef,
-                                    timedPermission.getAuthority(),
-                                    timedPermission.getPermission());
-                            createNotifyObject(timedPermission.getNode_id(), timedPermission.getUser(), CCConstants.CCM_VALUE_NOTIFY_ACTION_PERMISSION_CHANGE);
+                        try {
+                            NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, timedPermission.getNode_id());
+                            if (nodeService.exists(nodeRef)) {
+                                permissionService.deletePermission(
+                                        nodeRef,
+                                        timedPermission.getAuthority(),
+                                        timedPermission.getPermission());
+                                createNotifyObject(timedPermission.getNode_id(), timedPermission.getUser(), CCConstants.CCM_VALUE_NOTIFY_ACTION_PERMISSION_CHANGE);
+                            }
+                            timedPermissionMapper.delete(timedPermission);
+                        } catch (Throwable e) {
+                            log.error(e.getMessage(), e);
                         }
-                        timedPermissionMapper.delete(timedPermission);
                         return null;
                     }, timedPermission.getUser()));
         }
@@ -371,7 +375,7 @@ private void addPermissions(String _nodeId, Map<String, String[]> _authPerm, Boo
             }
         }
 
-            createNotifyObject(_nodeId, user, CCConstants.CCM_VALUE_NOTIFY_ACTION_PERMISSION_ADD);
+        createNotifyObject(_nodeId, user, CCConstants.CCM_VALUE_NOTIFY_ACTION_PERMISSION_ADD);
 
         for (String authority : _authPerm.keySet()) {
             String[] permissions = _authPerm.get(authority);
@@ -726,7 +730,7 @@ public void addPermissions(String nodeId, ACE[] aces) throws Exception {
             }
 
             // flag to remove expired aces from acesNew
-            if(ace.getTo() != null && ace.getTo() <= now){
+            if (ace.getTo() != null && ace.getTo() <= now) {
                 remove = true;
             }
 
@@ -825,7 +829,7 @@ public void removePermissions(String nodeId, ACE[] aces) throws Exception {
 
                         if (!isGlobalAdmin && ace.getAuthority().equals(fullyAuthenticatedUser)) {
                             String owner = ownableService.getOwner(nodeRef);
-                            if (!fullyAuthenticatedUser.equals(owner)){
+                            if (!fullyAuthenticatedUser.equals(owner)) {
                                 log.warn("user should not uninvite himself");
                                 continue;
                             }
@@ -967,7 +971,7 @@ public StringBuffer getFindUsersSearchString(String query, Map<String, Double> s
                             fieldQuery.append(" OR ");
                         }
                         fieldQuery.append("@cm\\:").append(field.getKey()).append(":").append("\"").append(token).append("\"");
-                        if(field.getValue() > 1) {
+                        if (field.getValue() > 1) {
                             fieldQuery.append(" OR ");
                             fieldQuery.append("@cm\\:").append(field.getKey()).append(":").append("\"").append(StringUtils.strip(token, "*")).append("\"^").append(field.getValue());
                         }
@@ -1089,8 +1093,8 @@ private List<String> getOrganizationsOfUser() {
     }
 
     private void filterGuestAuthority(StringBuffer searchQuery) {
-		for(String guest : guestService.getAllGuestAuthorities()){
-			searchQuery.append(" AND NOT @cm\\:userName:\""+ QueryParser.escape(guest)+"\"");
+        for (String guest : guestService.getAllGuestAuthorities()) {
+            searchQuery.append(" AND NOT @cm\\:userName:\"" + QueryParser.escape(guest) + "\"");
         }
     }
 
@@ -1635,7 +1639,7 @@ public Map<String, Boolean> hasAllPermissions(String storeProtocol, String store
     @Override
     public Map<String, Boolean> hasAllPermissions(String storeProtocol, String storeId, String nodeId,
                                                   String[] permissions) {
-		boolean guest = guestService.isGuestUser(AuthenticationUtil.getFullyAuthenticatedUser());
+        boolean guest = guestService.isGuestUser(AuthenticationUtil.getFullyAuthenticatedUser());
         PermissionService permissionService = serviceRegistry.getPermissionService();
         Map<String, Boolean> result = new HashMap<>();
         NodeRef nodeRef = new NodeRef(new StoreRef(storeProtocol, storeId), nodeId);

From 54fac4085224e527e2dad643b69425d0da58d8ad Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@metaventis.com>
Date: Sat, 16 Nov 2024 20:30:11 +0000
Subject: [PATCH 12/19] Tsimon/9.1 sync performance

---
 .../repository/client/tools/I18nAngular.java  |   18 +-
 .../edu_sharing/restservices/GroupDao.java    |   68 +-
 .../org/edu_sharing/restservices/NodeDao.java |   15 +-
 .../restservices/OrganizationDao.java         |   20 +-
 .../restservices/iam/v1/IamApi.java           | 1990 +++++++++--------
 .../restservices/node/v1/NodeApi.java         |    5 +-
 .../rest/api/src/main/resources/openapi.json  |   17 +
 7 files changed, 1087 insertions(+), 1046 deletions(-)

diff --git a/Backend/services/core/src/main/java/org/edu_sharing/repository/client/tools/I18nAngular.java b/Backend/services/core/src/main/java/org/edu_sharing/repository/client/tools/I18nAngular.java
index cb2f4f054..62f15bc63 100644
--- a/Backend/services/core/src/main/java/org/edu_sharing/repository/client/tools/I18nAngular.java
+++ b/Backend/services/core/src/main/java/org/edu_sharing/repository/client/tools/I18nAngular.java
@@ -10,11 +10,14 @@
 
 import jakarta.servlet.ServletContext;
 import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Class to load language data from the angular i18n files (json)
  */
 public class I18nAngular {
+    private static Map<String,String> I18N_CACHE = new HashMap<>();
     public static final String GENDER_SEPARATOR = "*";
     public static Logger logger=Logger.getLogger(I18nAngular.class);
     public static String getTranslationAngular(String scope,String key){
@@ -54,9 +57,16 @@ public static JSONObject getLanguageStrings() throws Exception{
      */
     private static String getTranslationAngular(String scope,String key,String language){
         try {
+            String cache = I18N_CACHE.get(language + ":" + key);
+            if(cache != null) {
+                return cache;
+            }
             String override=getTranslationFromOverride(key,language);
-            if(override!=null)
-                return replaceGenderSeperator(override);
+            if(override!=null) {
+                override = replaceGenderSeperator(override);
+                I18N_CACHE.put(language + ":" + key, override);
+                return override;
+            }
             // Using global instance singe it only is used for file reading
             ServletContext servletContext = Context.getGlobalContext();
             if(servletContext == null) {
@@ -75,7 +85,9 @@ private static String getTranslationAngular(String scope,String key,String langu
                 object=object.getJSONObject(list[i]);
             }
             String result = object.getString(list[list.length-1]);
-            return replaceGenderSeperator(result);
+            result = replaceGenderSeperator(result);
+            I18N_CACHE.put(language + ":" + key, result);
+            return result;
         } catch (Exception e) {
             if(language.startsWith("de-")) {
                 return getTranslationAngular(scope, key, "de");
diff --git a/Backend/services/core/src/main/java/org/edu_sharing/restservices/GroupDao.java b/Backend/services/core/src/main/java/org/edu_sharing/restservices/GroupDao.java
index 788e75aa6..1d67ca967 100644
--- a/Backend/services/core/src/main/java/org/edu_sharing/restservices/GroupDao.java
+++ b/Backend/services/core/src/main/java/org/edu_sharing/restservices/GroupDao.java
@@ -3,9 +3,11 @@
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.QName;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
@@ -25,6 +27,7 @@
 import org.edu_sharing.restservices.shared.GroupProfile;
 import org.edu_sharing.service.authority.AuthorityService;
 import org.edu_sharing.service.authority.AuthorityServiceFactory;
+import org.edu_sharing.service.authority.AuthorityServiceHelper;
 import org.edu_sharing.service.nodeservice.NodeServiceHelper;
 import org.edu_sharing.service.notification.NotificationService;
 import org.edu_sharing.service.notification.NotificationServiceFactoryUtility;
@@ -38,6 +41,8 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static org.alfresco.service.cmr.security.PermissionService.GROUP_PREFIX;
+
 public class GroupDao {
 
     static Logger logger = Logger.getLogger(GroupDao.class);
@@ -59,31 +64,34 @@ public static GroupDao getGroup(RepositoryDao repoDao, String groupName) throws
         }
     }
 
-    public static GroupDao createGroup(RepositoryDao repoDao, String groupName, GroupProfile profile, String parentGroup) throws DAOException {
+    public static String createGroup(RepositoryDao repoDao, String groupName, GroupProfile profile, String parentGroup) throws DAOException {
         try {
             AuthorityService authorityService = AuthorityServiceFactory.getAuthorityService(repoDao.getApplicationInfo().getAppId());
             String result = authorityService.createGroup(groupName, profile.getDisplayName(), parentGroup);
-            GroupDao groupDao = GroupDao.getGroup(repoDao, result);
             if (result != null) {
                 // permission check was done already, so run as system to allow org admin to set properties
                 AuthenticationUtil.runAsSystem(() -> {
-                    groupDao.applyProfile(profile);
+                    applyProfile(result.startsWith(GROUP_PREFIX) ? result : GROUP_PREFIX + result, profile);
                     return null;
                 });
             }
-            // reload data after it was changed
-            return GroupDao.getGroup(repoDao, result);
+            return result;
         } catch (Exception e) {
             throw DAOException.mapping(e);
         }
     }
 
-    void applyProfile(GroupProfile profile) {
-        setGroupEmail(profile);
-        setGroupType(profile);
-        setScopeType(profile);
+    static void applyProfile(String authorityName, GroupProfile profile) {
+        ApplicationContext alfApplicationContext = AlfAppContextGate.getApplicationContext();
+        ServiceRegistry serviceRegistry = (ServiceRegistry) alfApplicationContext.getBean(ServiceRegistry.SERVICE_REGISTRY);
+        NodeService nodeService = serviceRegistry.getNodeService();
+
+        NodeRef authorityRef = AuthorityServiceHelper.getAuthorityNodeRef(authorityName);
+        setGroupEmail(nodeService, authorityRef, profile);
+        setGroupType(nodeService, authorityRef, profile);
+        setScopeType(nodeService, authorityRef, profile);
         if(profile.getCustomAttributes() != null && !profile.getCustomAttributes().isEmpty()) {
-            authorityService.setCustomAttributes(authorityName, profile.getCustomAttributes());
+            AuthorityServiceFactory.getLocalService().setCustomAttributes(authorityName, profile.getCustomAttributes());
         }
     }
 
@@ -138,13 +146,13 @@ public GroupDao(RepositoryDao repoDao, String groupName) throws DAOException {
             this.repoDao = repoDao;
 
             this.authorityName =
-                    groupName.startsWith(PermissionService.GROUP_PREFIX)
+                    groupName.startsWith(GROUP_PREFIX)
                             ? groupName
-                            : PermissionService.GROUP_PREFIX + groupName;
+                            : GROUP_PREFIX + groupName;
 
             this.groupName =
-                    groupName.startsWith(PermissionService.GROUP_PREFIX)
-                            ? groupName.substring(PermissionService.GROUP_PREFIX.length())
+                    groupName.startsWith(GROUP_PREFIX)
+                            ? groupName.substring(GROUP_PREFIX.length())
                             : groupName;
 
             this.displayName = ((MCAlfrescoAPIClient) baseClient).getGroupDisplayName(this.groupName);
@@ -181,7 +189,7 @@ public void changeProfile(GroupProfile profile) throws DAOException {
                 @Override
                 public Void doWork() throws Exception {
                     ((MCAlfrescoAPIClient) repoDao.getBaseClient()).createOrUpdateGroup(groupName, profile.getDisplayName());
-                    applyProfile(profile);
+                    applyProfile(authorityName, profile);
 
                     // rename admin group
                     renameSubGroup(profile, org.edu_sharing.alfresco.service.AuthorityService.ADMINISTRATORS_GROUP, org.edu_sharing.alfresco.service.AuthorityService.ADMINISTRATORS_GROUP_DISPLAY_POSTFIX);
@@ -210,7 +218,7 @@ private void renameOrganisationFolder() {
     }
 
     private void renameSubGroup(GroupProfile profile, String subgroup, String postfix) {
-        String authorityName = PermissionService.GROUP_PREFIX + org.edu_sharing.alfresco.service.AuthorityService.getGroupName(
+        String authorityName = GROUP_PREFIX + org.edu_sharing.alfresco.service.AuthorityService.getGroupName(
                 subgroup, groupName);
         if (authorityService.authorityExists(authorityName)) {
             String newDisplayName = profile.getDisplayName() + postfix;
@@ -220,23 +228,23 @@ private void renameSubGroup(GroupProfile profile, String subgroup, String postfi
         }
     }
 
-    protected void setGroupType(GroupProfile profile) {
+    static protected void setGroupType(NodeService nodeService, NodeRef authorityRef, GroupProfile profile) {
         if (profile.getGroupType() != null) {
-            authorityService.addAuthorityAspect(PermissionService.GROUP_PREFIX + groupName, CCConstants.CCM_ASPECT_GROUPEXTENSION);
+            nodeService.addAspect(authorityRef, QName.createQName(CCConstants.CCM_ASPECT_GROUPEXTENSION), new HashMap<>());
         }
-        authorityService.setAuthorityProperty(PermissionService.GROUP_PREFIX + groupName, CCConstants.CCM_PROP_GROUPEXTENSION_GROUPTYPE, profile.getGroupType());
+        NodeServiceHelper.setProperty(authorityRef, CCConstants.CCM_PROP_GROUPEXTENSION_GROUPTYPE, profile.getGroupType(), true);
     }
 
-    protected void setGroupEmail(GroupProfile profile) {
-        authorityService.setAuthorityProperty(PermissionService.GROUP_PREFIX + groupName, CCConstants.CCM_PROP_GROUPEXTENSION_GROUPEMAIL, profile.getGroupEmail());
+    static protected void setGroupEmail(NodeService nodeService, NodeRef authorityRef, GroupProfile profile) {
+        nodeService.setProperty(authorityRef, QName.createQName(CCConstants.CCM_PROP_GROUPEXTENSION_GROUPEMAIL), profile.getGroupEmail());
 
     }
 
-    protected void setScopeType(GroupProfile profile) {
+    static protected void setScopeType(NodeService nodeService, NodeRef authorityRef, GroupProfile profile) {
         if (profile.getScopeType() != null) {
-            authorityService.addAuthorityAspect(PermissionService.GROUP_PREFIX + groupName, CCConstants.CCM_ASPECT_SCOPE);
+            nodeService.addAspect(authorityRef, QName.createQName(CCConstants.CCM_ASPECT_SCOPE), new HashMap<>());
         }
-        authorityService.setAuthorityProperty(PermissionService.GROUP_PREFIX + groupName, CCConstants.CCM_PROP_SCOPE_TYPE, profile.getScopeType());
+        nodeService.setProperty(authorityRef, QName.createQName(CCConstants.CCM_PROP_SCOPE_TYPE), profile.getScopeType());
     }
 
     public void delete() throws DAOException {
@@ -246,7 +254,7 @@ public void delete() throws DAOException {
             AuthenticationUtil.runAsSystem(new RunAsWork<Void>() {
                 @Override
                 public Void doWork() throws Exception {
-                    authorityService.deleteAuthority(PermissionService.GROUP_PREFIX + groupName);
+                    authorityService.deleteAuthority(GROUP_PREFIX + groupName);
                     return null;
                 }
             });
@@ -333,7 +341,7 @@ public Group asGroup(boolean resolveOrganizations) {
         data.setProfile(profile);
         data.setProperties(getProperties());
         data.setAspects(getAspects());
-        data.setSignupMethod(getSignupMethod(ref));
+        data.setSignupMethod(getSignupMethod(properties));
 
         return data;
     }
@@ -342,8 +350,8 @@ private Map<String, Serializable> getCustomAttributes() {
         return authorityService.getCustomAttributes(authorityName);
     }
 
-    public static GroupSignupMethod getSignupMethod(NodeRef ref) {
-        String method = NodeServiceHelper.getProperty(ref, CCConstants.CCM_PROP_GROUP_SIGNUP_METHOD);
+    public static GroupSignupMethod getSignupMethod(Map<String, Object> properties) {
+        String method = (String) properties.get(CCConstants.CCM_PROP_GROUP_SIGNUP_METHOD);
         if (method == null) {
             return null;
         }
@@ -426,7 +434,7 @@ public GroupSignupResult signupUser(String password) throws DAOException {
         try {
             ToolPermissionHelper.throwIfToolpermissionMissing(CCConstants.CCM_VALUE_TOOLPERMISSION_SIGNUP_GROUP);
             return AuthenticationUtil.runAsSystem(() -> {
-                GroupSignupMethod method = getSignupMethod(ref);
+                GroupSignupMethod method = getSignupMethod(properties);
                 boolean addMember = false;
                 NodeRef userRef = authorityService.getAuthorityNodeRef(AuthenticationUtil.getFullyAuthenticatedUser());
 
diff --git a/Backend/services/core/src/main/java/org/edu_sharing/restservices/NodeDao.java b/Backend/services/core/src/main/java/org/edu_sharing/restservices/NodeDao.java
index 381db63fc..17a628710 100755
--- a/Backend/services/core/src/main/java/org/edu_sharing/restservices/NodeDao.java
+++ b/Backend/services/core/src/main/java/org/edu_sharing/restservices/NodeDao.java
@@ -2687,22 +2687,23 @@ public void setOwner(String username) {
         nodeService.setOwner(this.getId(), username);
     }
 
-    public void setProperty(String property, Serializable value, boolean keepModifiedDate) {
+    public static void setProperty(RepositoryDao repoDao, String nodeId, String property, Serializable value, boolean keepModifiedDate) {
+        NodeService nodeService = NodeServiceFactory.getNodeService(repoDao.getId());
         if (keepModifiedDate) {
             nodeService.keepModifiedDate(
-                    StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getProtocol(), StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getIdentifier(), this.getId(),
-                    () -> setPropertyInternal(property, value)
+                    StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getProtocol(), StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getIdentifier(), nodeId,
+                    () -> setPropertyInternal(nodeService, nodeId, property, value)
             );
         } else {
-            setPropertyInternal(property, value);
+            setPropertyInternal(nodeService, nodeId, property, value);
         }
     }
 
-    private void setPropertyInternal(String property, Serializable value) {
+    private static void setPropertyInternal(NodeService nodeService, String nodeId, String property, Serializable value) {
         if (value == null) {
-            nodeService.removeProperty(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getProtocol(), StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getIdentifier(), this.getId(), property);
+            nodeService.removeProperty(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getProtocol(), StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getIdentifier(), nodeId, property);
         } else {
-            nodeService.setProperty(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getProtocol(), StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getIdentifier(), this.getId(), property, value, false);
+            nodeService.setProperty(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getProtocol(), StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.getIdentifier(), nodeId, property, value, false);
         }
     }
 
diff --git a/Backend/services/core/src/main/java/org/edu_sharing/restservices/OrganizationDao.java b/Backend/services/core/src/main/java/org/edu_sharing/restservices/OrganizationDao.java
index c66a4ae1b..a5f5a9d5c 100644
--- a/Backend/services/core/src/main/java/org/edu_sharing/restservices/OrganizationDao.java
+++ b/Backend/services/core/src/main/java/org/edu_sharing/restservices/OrganizationDao.java
@@ -1,31 +1,24 @@
 package org.edu_sharing.restservices;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
 import org.alfresco.service.cmr.security.PermissionService;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.edu_sharing.alfresco.authentication.HttpContext;
 import org.edu_sharing.alfresco.service.OrganisationService;
 import org.edu_sharing.repository.client.rpc.EduGroup;
 import org.edu_sharing.repository.client.tools.CCConstants;
 import org.edu_sharing.repository.server.MCAlfrescoAPIClient;
-import org.edu_sharing.restservices.organization.v1.model.GroupSignupDetails;
-import org.edu_sharing.restservices.shared.Authority;
-import org.edu_sharing.restservices.shared.GroupProfile;
-import org.edu_sharing.restservices.shared.NodeRef;
-import org.edu_sharing.restservices.shared.Organization;
+import org.edu_sharing.restservices.shared.*;
 import org.edu_sharing.service.authority.AuthorityServiceFactory;
-import org.edu_sharing.service.nodeservice.NodeServiceHelper;
 import org.edu_sharing.service.organization.OrganizationService;
 import org.edu_sharing.service.organization.OrganizationServiceFactory;
-import org.edu_sharing.service.organization.GroupSignupMethod;
 import org.edu_sharing.service.search.SearchServiceFactory;
 import org.edu_sharing.spring.ApplicationContextFactory;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 
 public class OrganizationDao {
 
@@ -168,10 +161,11 @@ public Organization asOrganization() {
     	data.setAuthorityType(Authority.Type.GROUP);
     	data.setGroupName(groupName);
     	data.setAdministrationAccess(hasAdministrationAccess());
-    	data.setSignupMethod(GroupDao.getSignupMethod(ref));
 
     	try {
-			data.setProfile(GroupDao.getGroup(repoDao, authorityName).asGroup().getProfile());
+			Group group = GroupDao.getGroup(repoDao, authorityName).asGroup();
+			data.setSignupMethod(group.getSignupMethod());
+			data.setProfile(group.getProfile());
 		}catch(Throwable t){
     		throw new RuntimeException("Error getting profile for organization "+authorityName,t);
 		}
diff --git a/Backend/services/core/src/main/java/org/edu_sharing/restservices/iam/v1/IamApi.java b/Backend/services/core/src/main/java/org/edu_sharing/restservices/iam/v1/IamApi.java
index 3b89cec0d..f241480f5 100644
--- a/Backend/services/core/src/main/java/org/edu_sharing/restservices/iam/v1/IamApi.java
+++ b/Backend/services/core/src/main/java/org/edu_sharing/restservices/iam/v1/IamApi.java
@@ -52,23 +52,23 @@ public class IamApi  {
 
 	private static Logger logger = Logger.getLogger(IamApi.class);
 
-    @GET
-
-    @Path("/people/{repository}")    
-    
-    @Operation(summary = "Search users.", description = "Search users. (admin rights are required.)")
-
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = UserEntries.class))),        
-	        @ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-	        @ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-	    })
-
-    public Response searchUser(
+	@GET
+
+	@Path("/people/{repository}")
+
+	@Operation(summary = "Search users.", description = "Search users. (admin rights are required.)")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = UserEntries.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response searchUser(
 			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
 			@Parameter(description = "pattern",required=true) @QueryParam("pattern") String pattern,
 			@Parameter(description = "global search context, defaults to true, otherwise just searches for users within the organizations", required = false, schema = @Schema(defaultValue="true")) @QueryParam("global") Boolean global,
@@ -79,92 +79,92 @@ public Response searchUser(
 			@Parameter(description = RestConstants.MESSAGE_SORT_ASCENDING) @QueryParam("sortAscending") List<Boolean> sortAscending,
 			@Context HttpServletRequest req) {
 
-    	try {
-    		
-	    	RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+		try {
+
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
 			Map<String, String> filter=new HashMap<>();
 			if(status!=null)
 				filter.put(CCConstants.getValidLocalName(CCConstants.CM_PROP_PERSON_ESPERSONSTATUS),status.name());
 
 			SearchResult<String> search=SearchServiceFactory.getSearchService(repoDao.getId()).searchUsers(
-	    					pattern,
-	    					global==null ? true : global,
-	    					skipCount!=null ? skipCount : 0,
-	    	    			maxItems!=null ? maxItems : RestConstants.DEFAULT_MAX_ITEMS,
-	    					new SortDefinition(sortProperties,sortAscending),
-	    					filter
-	    			);
-
-	    	List<UserSimple> result = new ArrayList<>();
-	    	for (String user: search.getData()) {
-	    		result.add(new PersonDao(repoDao,user).asPersonSimple(true));
-	    	}	
-	    	UserEntries response = new UserEntries();
-	    	response.setList(result);
-	    	response.setPagination(new Pagination(search));
-	    		    	
-	    	
-	    	return Response.status(Response.Status.OK).entity(response).build();
-	    	
-   
-    	} catch (Throwable t) {
-    		return ErrorResponse.createResponse(t);
-    	}
-  }
-
-    
-    @OPTIONS        
-    @Path("/people/{repository}")
-    @Hidden
-
-    public Response options01() {
-    	
-    	return Response.status(Response.Status.OK).header("Allow", "OPTIONS, GET").build();
-    }
-    
-    @GET
-    @Path("/people/{repository}/{person}")
-    @Operation(summary = "Get the user.", description = "Get the user. (Not all information are feteched for foreign profiles if current user is not an admin)")
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = UserEntry.class))),
-	        @ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
-	    })
-    public Response getUser(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
-    		@Context HttpServletRequest req) {
-
-    	try {
-    		
-	    	RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	PersonDao personDao = PersonDao.getPerson(repoDao, person);
-	    	
-	    	UserEntry response = new UserEntry();
-	    	response.setPerson(personDao.asPerson());
-
-	    	org.edu_sharing.alfresco.repository.server.authentication.Context context =  org.edu_sharing.alfresco.repository.server.authentication.Context.getCurrentInstance();
-	    String username = context.getSessionAttribute(CCConstants.AUTH_USERNAME);
-	    	String authType = context.getAuthType();
-		if(person.equals("-me-") || person.equals(username)) {
-		 	if(authType != null && !authType.equals(CCConstants.AUTH_TYPE_DEFAULT)) {
-		 		response.setEditProfile(false);
-			}else {
-				response.setEditProfile(true);
+					pattern,
+					global==null ? true : global,
+					skipCount!=null ? skipCount : 0,
+					maxItems!=null ? maxItems : RestConstants.DEFAULT_MAX_ITEMS,
+					new SortDefinition(CCConstants.NAMESPACE_CM,sortProperties,sortAscending),
+					filter
+			);
+
+			List<UserSimple> result = new ArrayList<>();
+			for (String user: search.getData()) {
+				result.add(new PersonDao(repoDao,user).asPersonSimple(true));
 			}
+			UserEntries response = new UserEntries();
+			response.setList(result);
+			response.setPagination(new Pagination(search));
+
+
+			return Response.status(Response.Status.OK).entity(response).build();
+
+
+		} catch (Throwable t) {
+			return ErrorResponse.createResponse(t);
 		}
+	}
+
+
+	@OPTIONS
+	@Path("/people/{repository}")
+	@Hidden
+
+	public Response options01() {
+
+		return Response.status(Response.Status.OK).header("Allow", "OPTIONS, GET").build();
+	}
 
+	@GET
+	@Path("/people/{repository}/{person}")
+	@Operation(summary = "Get the user.", description = "Get the user. (Not all information are feteched for foreign profiles if current user is not an admin)")
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = UserEntry.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+	public Response getUser(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
+			@Context HttpServletRequest req) {
+
+		try {
+
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			PersonDao personDao = PersonDao.getPerson(repoDao, person);
+
+			UserEntry response = new UserEntry();
+			response.setPerson(personDao.asPerson());
+
+			org.edu_sharing.alfresco.repository.server.authentication.Context context =  org.edu_sharing.alfresco.repository.server.authentication.Context.getCurrentInstance();
+			String username = context.getSessionAttribute(CCConstants.AUTH_USERNAME);
+			String authType = context.getAuthType();
+			if(person.equals("-me-") || person.equals(username)) {
+				if(authType != null && !authType.equals(CCConstants.AUTH_TYPE_DEFAULT)) {
+					response.setEditProfile(false);
+				}else {
+					response.setEditProfile(true);
+				}
+			}
+
+
+			return Response.status(Response.Status.OK).entity(response).build();
 
-	    	return Response.status(Response.Status.OK).entity(response).build();
-	    	
-    	} catch (Throwable t) {
-    		return ErrorResponse.createResponse(t, ErrorResponse.ErrorResponseLogging.relaxed);
-    	}
-    }
+		} catch (Throwable t) {
+			return ErrorResponse.createResponse(t, ErrorResponse.ErrorResponseLogging.relaxed);
+		}
+	}
 
 	@GET
 	@Path("/people/{repository}/{person}/stats")
@@ -190,165 +190,165 @@ public Response getUserStats(
 			return ErrorResponse.createResponse(t, ErrorResponse.ErrorResponseLogging.relaxed);
 		}
 	}
-    @GET       
-    @Path("/people/{repository}/{person}/nodeList/{list}")    
-    @Operation(summary = "Get a specific node list for a user", description = "For guest users, the list will be temporary stored in the current session")
-    
-    @ApiResponses(
-    	value = { 
-    			 @ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = NodeEntries.class))),        
-    		        @ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-    		        @ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-    		    })
-
-    public Response getNodeList(
+	@GET
+	@Path("/people/{repository}/{person}/nodeList/{list}")
+	@Operation(summary = "Get a specific node list for a user", description = "For guest users, the list will be temporary stored in the current session")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = NodeEntries.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response getNodeList(
 			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
 			@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
 			@Parameter(description = "list name",required=true) @PathParam("list") String list,
 			@Parameter(description = RestConstants.MESSAGE_PROPERTY_FILTER, array = @ArraySchema(schema = @Schema(defaultValue="-all-")))  @QueryParam("propertyFilter") List<String> propertyFilter,
-    		@Parameter(description = RestConstants.MESSAGE_SORT_PROPERTIES) @QueryParam("sortProperties") List<String> sortProperties,
-    		@Parameter(description = RestConstants.MESSAGE_SORT_ASCENDING) @QueryParam("sortAscending") List<Boolean> sortAscending,
-    		@Context HttpServletRequest req) {
+			@Parameter(description = RestConstants.MESSAGE_SORT_PROPERTIES) @QueryParam("sortProperties") List<String> sortProperties,
+			@Parameter(description = RestConstants.MESSAGE_SORT_ASCENDING) @QueryParam("sortAscending") List<Boolean> sortAscending,
+			@Context HttpServletRequest req) {
 		try{
 			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	PersonDao personDao = PersonDao.getPerson(repoDao, person);
+			PersonDao personDao = PersonDao.getPerson(repoDao, person);
 			SortDefinition sortDefinition = new SortDefinition(sortProperties,sortAscending);
-    		Filter propFilter = new Filter(propertyFilter);
-	    	NodeEntries result=new NodeEntries();
-	    	List<NodeRef> refList = personDao.getNodeList(list);
-	    	if(refList!=null){
-                refList=NodeDao.sortApiNodeRefs(repoDao,refList,null,sortDefinition);
-	    	    result=NodeDao.convertToRest(repoDao,propFilter,refList,0,Integer.MAX_VALUE);
-	    	}
-	    	return Response.status(Response.Status.OK).entity(result).build();
+			Filter propFilter = new Filter(propertyFilter);
+			NodeEntries result=new NodeEntries();
+			List<NodeRef> refList = personDao.getNodeList(list);
+			if(refList!=null){
+				refList=NodeDao.sortApiNodeRefs(repoDao,refList,null,sortDefinition);
+				result=NodeDao.convertToRest(repoDao,propFilter,refList,0,Integer.MAX_VALUE);
+			}
+			return Response.status(Response.Status.OK).entity(result).build();
 		}catch(Throwable t){
 			return ErrorResponse.createResponse(t);
 		}
-    }
-    @PUT       
-    @Path("/people/{repository}/{person}/nodeList/{list}/{node}")    
-    @Operation(summary = "Add a node to node a list of a user", description = "For guest users, the list will be temporary stored in the current session")
-    
-    @ApiResponses(
-    	value = { 
-    			 @ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),        
-    		        @ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-    		        @ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-    		    })
-
-    public Response addNodeList(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
-    		@Parameter(description = "list name. If this list does not exist, it will be created",required=true) @PathParam("list") String list,    		
-    		@Parameter(description = RestConstants.MESSAGE_NODE_ID,required=true) @PathParam("node") String node,    		
-    		@Context HttpServletRequest req) {
+	}
+	@PUT
+	@Path("/people/{repository}/{person}/nodeList/{list}/{node}")
+	@Operation(summary = "Add a node to node a list of a user", description = "For guest users, the list will be temporary stored in the current session")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response addNodeList(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
+			@Parameter(description = "list name. If this list does not exist, it will be created",required=true) @PathParam("list") String list,
+			@Parameter(description = RestConstants.MESSAGE_NODE_ID,required=true) @PathParam("node") String node,
+			@Context HttpServletRequest req) {
 		try{
 			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	PersonDao personDao = PersonDao.getPerson(repoDao, person);
-	    	personDao.addNodeList(list, node);
-	    	return Response.status(Response.Status.OK).build();
+			PersonDao personDao = PersonDao.getPerson(repoDao, person);
+			personDao.addNodeList(list, node);
+			return Response.status(Response.Status.OK).build();
 		}catch(Throwable t){
 			return ErrorResponse.createResponse(t);
 		}
-    }
-    @DELETE       
-    @Path("/people/{repository}/{person}/nodeList/{list}/{node}")    
-    @Operation(summary = "Delete a node of a node list of a user", description = "For guest users, the list will be temporary stored in the current session")
-    
-    @ApiResponses(
-    	value = { 
-    			 @ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),        
-    		        @ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-    		        @ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-    		    })
-
-    public Response removeNodeList(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
-    		@Parameter(description = "list name",required=true) @PathParam("list") String list,    		
-    		@Parameter(description = RestConstants.MESSAGE_NODE_ID,required=true) @PathParam("node") String node,    		
-    		@Context HttpServletRequest req) {
+	}
+	@DELETE
+	@Path("/people/{repository}/{person}/nodeList/{list}/{node}")
+	@Operation(summary = "Delete a node of a node list of a user", description = "For guest users, the list will be temporary stored in the current session")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response removeNodeList(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
+			@Parameter(description = "list name",required=true) @PathParam("list") String list,
+			@Parameter(description = RestConstants.MESSAGE_NODE_ID,required=true) @PathParam("node") String node,
+			@Context HttpServletRequest req) {
 		try{
 			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	PersonDao personDao = PersonDao.getPerson(repoDao, person);
-	    	personDao.removeNodeList(list, node);
-	    	return Response.status(Response.Status.OK).build();
+			PersonDao personDao = PersonDao.getPerson(repoDao, person);
+			personDao.removeNodeList(list, node);
+			return Response.status(Response.Status.OK).build();
 		}catch(Throwable t){
 			return ErrorResponse.createResponse(t);
 		}
-    }
-    @GET       
-    @Path("/people/{repository}/{person}/preferences")    
-    @Operation(summary = "Get preferences stored for user", description = "Will fail for guest")
-    
-    @ApiResponses(
-    	value = { 
-    			 @ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Preferences.class))),        
-    		        @ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-    		        @ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-    		    })
-
-    public Response getPreferences(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
-    		@Context HttpServletRequest req) {
+	}
+	@GET
+	@Path("/people/{repository}/{person}/preferences")
+	@Operation(summary = "Get preferences stored for user", description = "Will fail for guest")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Preferences.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response getPreferences(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
+			@Context HttpServletRequest req) {
 		try{
 			org.edu_sharing.service.authority.AuthorityService service=AuthorityServiceFactory.getAuthorityService(ApplicationInfoList.getHomeRepository().getAppId());
 			if(service.isGuest())
 				throw new Exception("Not allowed for guest user");
 			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	PersonDao personDao = PersonDao.getPerson(repoDao, person);
-	    	String preferences=personDao.getPreferences();
-	    	Preferences pref=new Preferences();
-	    	pref.setPreferences(preferences);
-	    	return Response.status(Response.Status.OK).entity(pref).build();
+			PersonDao personDao = PersonDao.getPerson(repoDao, person);
+			String preferences=personDao.getPreferences();
+			Preferences pref=new Preferences();
+			pref.setPreferences(preferences);
+			return Response.status(Response.Status.OK).entity(pref).build();
 		}catch(Throwable t){
 			return ErrorResponse.createResponse(t);
 		}
-    }
-    @PUT       
-    @Path("/people/{repository}/{person}/preferences")    
-    @Operation(summary = "Set preferences for user", description = "Will fail for guest")
-    
-    @ApiResponses(
-    	value = { 
-    			 @ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),        
-    		        @ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    		        @ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-    		        @ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-    		    })
-
-    public Response setPreferences(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
-    		@Parameter(description = "preferences (json string)", required = true, schema = @Schema(defaultValue="-me-" )) String content,
-    		@Context HttpServletRequest req) {
+	}
+	@PUT
+	@Path("/people/{repository}/{person}/preferences")
+	@Operation(summary = "Set preferences for user", description = "Will fail for guest")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response setPreferences(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
+			@Parameter(description = "preferences (json string)", required = true, schema = @Schema(defaultValue="-me-" )) String content,
+			@Context HttpServletRequest req) {
 		try{
 			org.edu_sharing.service.authority.AuthorityService service=AuthorityServiceFactory.getAuthorityService(ApplicationInfoList.getHomeRepository().getAppId());
 			if(service.isGuest())
 				throw new Exception("Not allowed for guest user");
 			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	PersonDao personDao = PersonDao.getPerson(repoDao, person);
-	    	personDao.setPreferences(content);
-	    	return Response.status(Response.Status.OK).build();
+			PersonDao personDao = PersonDao.getPerson(repoDao, person);
+			personDao.setPreferences(content);
+			return Response.status(Response.Status.OK).build();
 		}catch(Throwable t){
 			return ErrorResponse.createResponse(t);
 		}
-    }
+	}
 
 	@GET
 	@Path("/people/{repository}/{person}/profileSettings")
@@ -377,168 +377,558 @@ public Response getProfileSettings(
 			ProfileSettings personDaoProfileSettings = personDao.getProfileSettings();
 			return Response.status(Response.Status.OK).entity(personDaoProfileSettings).build();
 		} catch (Throwable t) {
-			return ErrorResponse.createResponse(t);
+			return ErrorResponse.createResponse(t);
+		}
+	}
+
+
+	@PUT
+	@Path("/people/{repository}/{person}/profileSettings")
+	@Operation(summary = "Set profileSettings Configuration", description = "Will fail for guest")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response setProfileSettings(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-")) @PathParam("repository") String repository,
+			@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-")) @PathParam("person") String person,
+			@Parameter(description = "ProfileSetting Object", required = true) ProfileSettings profileSettings,
+			@Context HttpServletRequest req) {
+		try {
+			org.edu_sharing.service.authority.AuthorityService service = AuthorityServiceFactory.getAuthorityService(ApplicationInfoList.getHomeRepository().getAppId());
+			if (service.isGuest())
+				throw new Exception("Not allowed for guest user");
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			PersonDao personDao = PersonDao.getPerson(repoDao, person);
+			personDao.setProfileSettings(profileSettings);
+			return Response.status(Response.Status.OK).build();
+		} catch (Throwable t) {
+			return ErrorResponse.createResponse(t);
+		}
+	}
+
+
+
+	@POST
+
+	@Path("/people/{repository}/{person}")
+
+	@Operation(summary = "Create a new user.", description = "Create a new user. (admin rights are required.)")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = User.class))),
+					@ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response createUser(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "username",required=true) @PathParam("person") String person,
+			@Parameter(description = "profile" ,required=true ) UserProfileEdit profile,
+			@Parameter(description = "Password, leave empty if you don't want to set any" ,required=false )@QueryParam("password") @ValidPassword String password,
+			@Parameter(description = "returnResult, if true the created person object will be returned.", required=false) @QueryParam("returnResult") @DefaultValue("true") boolean returnResult,
+			@Parameter(description = "setupHomeDir, if true the created persons homedir will be setup with the default folders.", required=false) @QueryParam("setupHomeDir") @DefaultValue("true") boolean setupHomeDir,
+			@Context HttpServletRequest req) {
+
+		try {
+
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			if(!setupHomeDir){
+				OnUpdatePersonPropertiesPolicy.constructPersonFolders.set(false);
+			}
+			PersonDao personDao = PersonDao.createPerson(repoDao, person, password, profile,returnResult);
+			User result;
+			if(personDao == null){
+				result = new User();
+				result.setUserName(person);
+			}else{
+				result = personDao.asPerson();
+			}
+
+			return Response.status(Response.Status.OK).entity(result).build();
+
+		} catch (DAOValidationException t) {
+
+			logger.warn(t.getMessage(), t);
+			return Response.status(Response.Status.BAD_REQUEST).entity(new ErrorResponse(t)).build();
+
+		} catch (DAOSecurityException t) {
+
+			logger.warn(t.getMessage(), t);
+			return Response.status(Response.Status.FORBIDDEN).entity(new ErrorResponse(t)).build();
+
+		} catch (DAOMissingException t) {
+
+			logger.warn(t.getMessage(), t);
+			return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponse(t)).build();
+
+		} catch (Throwable t) {
+
+			logger.error(t.getMessage(), t);
+			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(new ErrorResponse(t)).build();
+		}finally {
+			OnUpdatePersonPropertiesPolicy.constructPersonFolders.set(null);
+		}
+	}
+
+	@PUT
+	@Path("/people/{repository}/{person}/status/{status}")
+	@Operation(summary = "update the user status.", description = "update the user status. (admin rights are required.)")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response updateUserStatus(
+			@Parameter(description = RestConstants.MESSAGE_REPOSITORY_ID, required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "username",required=true) @PathParam("person") String person,
+			@Parameter(description = "the new status to set",required=true) @PathParam("status") PersonLifecycleService.PersonStatus status,
+			@Parameter(description = "notify the user via mail", required = true, schema = @Schema(defaultValue="true")) @QueryParam("notify") Boolean notifyMail,
+			@Context HttpServletRequest req) {
+
+		try {
+
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			PersonDao personDao = PersonDao.getPerson(repoDao, person);
+
+			personDao.setStatus(status,notifyMail==null ? true : notifyMail);
+
+			return Response.status(Response.Status.OK).build();
+
+		} catch (DAOValidationException t) {
+
+			logger.warn(t.getMessage(), t);
+			return Response.status(Response.Status.BAD_REQUEST).entity(new ErrorResponse(t)).build();
+
+		} catch (DAOSecurityException t) {
+
+			logger.warn(t.getMessage(), t);
+			return Response.status(Response.Status.FORBIDDEN).entity(new ErrorResponse(t)).build();
+
+		} catch (DAOMissingException t) {
+
+			logger.warn(t.getMessage(), t);
+			return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponse(t)).build();
+
+		} catch (Throwable t) {
+
+			logger.error(t.getMessage(), t);
+			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(new ErrorResponse(t)).build();
+		}
+	}
+
+	@DELETE
+
+	@Path("/people/{repository}/{person}")
+
+	@Operation(summary = "Delete the user.", description = "Delete the user. (admin rights are required.)")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = Void.class))),
+					@ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response deleteUser(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "username",required=true) @PathParam("person") String person,
+			@Parameter(description = "force the deletion (if false then only persons which are previously marked for deletion are getting deleted)", required = false, schema = @Schema(defaultValue="false")) @QueryParam("force") Boolean force,
+			@Context HttpServletRequest req) {
+
+		try {
+
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			PersonDao personDao = PersonDao.getPerson(repoDao, person);
+
+			personDao.delete(force != null && force);
+
+			return Response.status(Response.Status.OK).build();
+
+		} catch (Throwable t) {
+			return ErrorResponse.createResponse(t);
+		}
+	}
+
+	@OPTIONS
+	@Path("/people/{repository}/{person}")
+	@Hidden
+
+	public Response options02() {
+
+		return Response.status(Response.Status.OK).header("Allow", "OPTIONS, GET, POST, DELETE").build();
+	}
+
+	@PUT
+
+	@Path("/people/{repository}/{person}/profile")
+
+	@Operation(summary = "Set profile of the user.", description = "Set profile of the user. (To set foreign profiles, admin rights are required.)")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response changeUserProfile(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
+			@Parameter(description = "properties" ,required=true ) UserProfileEdit profile,
+			@Context HttpServletRequest req) {
+
+		try {
+
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			PersonDao personDao = PersonDao.getPerson(repoDao, person);
+
+			personDao.changeProfile(profile);
+
+			return Response.status(Response.Status.OK).build();
+
+		} catch (Throwable t) {
+			return ErrorResponse.createResponse(t);
+		}
+	}
+	@PUT
+	@Path("/people/{repository}/{person}/avatar")
+	@Operation(summary = "Set avatar of the user.", description = "Set avatar of the user. (To set foreign avatars, admin rights are required.)")
+	@Consumes({ "multipart/form-data" })
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response changeUserAvatar(
+			@Parameter(description = RestConstants.MESSAGE_REPOSITORY_ID, required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
+			@Parameter(description = "avatar image" ,required=true ) @FormDataParam("avatar") InputStream avatar,
+			@Context HttpServletRequest req) {
+
+		try {
+
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			PersonDao personDao = PersonDao.getPerson(repoDao, person);
+
+			personDao.changeAvatar(avatar);
+
+			return Response.status(Response.Status.OK).build();
+
+		} catch (Throwable t) {
+
+			return ErrorResponse.createResponse(t);
+		}
+	}
+	@DELETE
+	@Path("/people/{repository}/{person}/avatar")
+	@Operation(summary = "Remove avatar of the user.", description = "Remove avatar of the user. (To Remove foreign avatars, admin rights are required.)")
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response removeUserAvatar(
+			@Parameter(description = RestConstants.MESSAGE_REPOSITORY_ID, required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
+			@Context HttpServletRequest req) {
+
+		try {
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			PersonDao personDao = PersonDao.getPerson(repoDao, person);
+			personDao.removeAvatar();
+			return Response.status(Response.Status.OK).build();
+
+		} catch (Throwable t) {
+			return ErrorResponse.createResponse(t);
+		}
+	}
+
+	@OPTIONS
+	@Path("/people/{repository}/{person}/profile")
+	@Hidden
+
+	public Response options03() {
+
+		return Response.status(Response.Status.OK).header("Allow", "OPTIONS, PUT").build();
+	}
+
+	@PUT
+
+	@Path("/people/{repository}/{person}/credential")
+
+	@Operation(summary = "Change/Set password of the user.", description = "Change/Set password of the user. (To change foreign passwords or set passwords, admin rights are required.)")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = Void.class))),
+					@ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response changeUserPassword(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
+			@Parameter(description = "credential" ,required=true ) @Valid UserCredential credential,
+			@Context HttpServletRequest req) {
+
+		try {
+
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			PersonDao personDao = PersonDao.getPerson(repoDao, person);
+
+			personDao.changePassword(credential.getOldPassword(), credential.getNewPassword());
+
+			return Response.status(Response.Status.OK).build();
+
+		} catch (DAOValidationException t) {
+
+			logger.warn(t.getMessage(), t);
+			return Response.status(Response.Status.BAD_REQUEST).entity(new ErrorResponse(t)).build();
+
+		} catch (DAOSecurityException t) {
+
+			logger.warn(t.getMessage(), t);
+			return Response.status(Response.Status.FORBIDDEN).entity(new ErrorResponse(t)).build();
+
+		} catch (DAOMissingException t) {
+
+			logger.warn(t.getMessage(), t);
+			return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponse(t)).build();
+
+		} catch (Throwable t) {
+
+			logger.error(t.getMessage(), t);
+			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(new ErrorResponse(t)).build();
+		}
+	}
+
+	@OPTIONS
+	@Path("/people/{repository}/{person}/credential")
+	@Hidden
+
+	public Response options04() {
+
+		return Response.status(Response.Status.OK).header("Allow", "OPTIONS, PUT").build();
+	}
+
+	@GET
+
+	@Path("/groups/{repository}")
+
+	@Operation(summary = "Search groups.", description = "Search groups. (admin rights are required.)")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = GroupEntries.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response searchGroups(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "pattern",required=true) @QueryParam("pattern") String pattern,
+			@Parameter(description = "find a specific groupType",required=false) @QueryParam("groupType") String groupType,
+			@Parameter(description = "find a specific signupMethod for groups (or asterisk for all including one)",required=false) @QueryParam("signupMethod") String signupMethod,
+			@Parameter(description = "global search context, defaults to true, otherwise just searches for groups within the organizations", required = false, schema = @Schema(defaultValue="true")) @QueryParam("global") Boolean global,
+			@Parameter(description = RestConstants.MESSAGE_MAX_ITEMS, schema = @Schema(defaultValue=""+RestConstants.DEFAULT_MAX_ITEMS)) @QueryParam("maxItems") Integer maxItems,
+			@Parameter(description = RestConstants.MESSAGE_SKIP_COUNT, schema = @Schema(defaultValue="0")) @QueryParam("skipCount") Integer skipCount,
+			@Parameter(description = RestConstants.MESSAGE_SORT_PROPERTIES) @QueryParam("sortProperties") List<String> sortProperties,
+			@Parameter(description = RestConstants.MESSAGE_SORT_ASCENDING) @QueryParam("sortAscending") List<Boolean> sortAscending,
+			@Context HttpServletRequest req) {
+
+		try {
+			Map<String, String> props = new HashMap<>();
+			if(groupType!=null && !groupType.isEmpty()){
+				props.put(CCConstants.getValidLocalName(CCConstants.CCM_PROP_GROUPEXTENSION_GROUPTYPE), groupType);
+			}
+			if(signupMethod!=null && !signupMethod.isEmpty()){
+				props.put(CCConstants.getValidLocalName(CCConstants.CCM_PROP_GROUP_SIGNUP_METHOD), signupMethod);
+			}
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			SearchResult<String> search=SearchServiceFactory.getSearchService(repoDao.getId()).findAuthorities(
+					AuthorityType.GROUP,
+					pattern,
+					global==null ? true : global,
+					skipCount!=null ? skipCount : 0,
+					maxItems!=null ? maxItems : RestConstants.DEFAULT_MAX_ITEMS,
+					new SortDefinition(sortProperties,sortAscending),
+					props
+			);
+
+			List<Group> result = new ArrayList<>();
+			for (String group: search.getData()) {
+				try {
+					result.add(new GroupDao(repoDao, group).asGroup());
+				} catch(DAOMissingException e) {
+					logger.warn("Group " + group + " as provided by search was not found", e);
+					Group groupObj = new Group();
+					groupObj.setAuthorityName(group);
+					result.add(groupObj);
+				}
+			}
+			GroupEntries response = new GroupEntries();
+			response.setList(result);
+			response.setPagination(new Pagination(search));
+
+			return Response.status(Response.Status.OK).entity(response).build();
+
+
+		} catch (Throwable t) {
+			return ErrorResponse.createResponse(t);
+		}
+	}
+
+
+	@OPTIONS
+	@Path("/groups/{repository}")
+	@Hidden
+
+	public Response options05() {
+
+		return Response.status(Response.Status.OK).header("Allow", "OPTIONS, GET").build();
+	}
+
+	@GET
+
+	@Path("/groups/{repository}/{group}")
+
+	@Operation(summary = "Get the group.", description = "Get the group. (To get foreign profiles, admin rights are required.)")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = GroupEntry.class))),
+					@ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response getGroup(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "groupname",required=true) @PathParam("group") String group,
+			@Parameter(description = "resolve the organization(s) this group is part of? disabling will slightly improve performance and should considered for bulk calls",required=false) @QueryParam("resolveOrganizations") Boolean resolveOrganizations,
+			@Context HttpServletRequest req) {
+
+		try {
+
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			GroupDao groupDao = GroupDao.getGroup(repoDao, group);
+
+			GroupEntry response = new GroupEntry();
+			response.setGroup(groupDao.asGroup(resolveOrganizations == null || resolveOrganizations));
+
+			return Response.status(Response.Status.OK).entity(response).build();
+
+		} catch (Throwable t) {
+			return ErrorResponse.createResponse(t, ErrorResponse.ErrorResponseLogging.relaxed);
 		}
 	}
 
+	@POST
 
-	@PUT
-	@Path("/people/{repository}/{person}/profileSettings")
-	@Operation(summary = "Set profileSettings Configuration", description = "Will fail for guest")
+	@Path("/groups/{repository}/{group}")
+
+	@Operation(summary = "Create a new group.", description = "Create a new group. (admin rights are required.)")
 
 	@ApiResponses(
 			value = {
-					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
-					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+					@ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = Group.class))),
+					@ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
 			})
 
-	public Response setProfileSettings(
-			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-")) @PathParam("repository") String repository,
-			@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-")) @PathParam("person") String person,
-			@Parameter(description = "ProfileSetting Object", required = true) ProfileSettings profileSettings,
+	public Response createGroup(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "groupname",required=true) @PathParam("group") String group,
+			@Parameter(description = "parent (will be added to this parent, also for name hashing), may be null",required=false) @QueryParam("parent") String parent,
+			@Parameter(description = "returnResult, if true the created group object will be returned.", required=false) @QueryParam("returnResult") @DefaultValue("true") Boolean returnResult,
+			@Parameter(description = "properties" ,required=true ) GroupProfile profile,
 			@Context HttpServletRequest req) {
+
 		try {
-			org.edu_sharing.service.authority.AuthorityService service = AuthorityServiceFactory.getAuthorityService(ApplicationInfoList.getHomeRepository().getAppId());
-			if (service.isGuest())
-				throw new Exception("Not allowed for guest user");
+
 			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-			PersonDao personDao = PersonDao.getPerson(repoDao, person);
-			personDao.setProfileSettings(profileSettings);
-			return Response.status(Response.Status.OK).build();
-		} catch (Throwable t) {
-			return ErrorResponse.createResponse(t);
-		}
-	}
+			String groupId = GroupDao.createGroup(repoDao, group, profile,parent);
+			Group result;
+			if(returnResult == null || returnResult) {
+				result = GroupDao.getGroup(repoDao, groupId).asGroup();
+			} else {
+				result = new Group();
+				result.setAuthorityName(groupId);
+			}
+			return Response.status(Response.Status.OK).entity(result).build();
 
+		} catch (DAOValidationException t) {
 
+			logger.warn(t.getMessage(), t);
+			return Response.status(Response.Status.BAD_REQUEST).entity(new ErrorResponse(t)).build();
 
-    @POST
+		} catch (DAOSecurityException t) {
 
-    @Path("/people/{repository}/{person}")    
-    
-    @Operation(summary = "Create a new user.", description = "Create a new user. (admin rights are required.)")
+			logger.warn(t.getMessage(), t);
+			return Response.status(Response.Status.FORBIDDEN).entity(new ErrorResponse(t)).build();
 
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = User.class))),
-	        @ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-	        @ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-	    })
+		} catch (DAOMissingException t) {
 
-    public Response createUser(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "username",required=true) @PathParam("person") String person,
-    	    @Parameter(description = "profile" ,required=true ) UserProfileEdit profile,
-    	    @Parameter(description = "Password, leave empty if you don't want to set any" ,required=false )@QueryParam("password") @ValidPassword String password,
-			@Parameter(description = "returnResult, if true the created person object will be returned.", required=false) @QueryParam("returnResult") @DefaultValue("true") boolean returnResult,
-			@Parameter(description = "setupHomeDir, if true the created persons homedir will be setup with the default folders.", required=false) @QueryParam("setupHomeDir") @DefaultValue("true") boolean setupHomeDir,
-    		@Context HttpServletRequest req) {
+			logger.warn(t.getMessage(), t);
+			return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponse(t)).build();
 
-    	try {
-    		
-	    	RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-			if(!setupHomeDir){
-				OnUpdatePersonPropertiesPolicy.constructPersonFolders.set(false);
-			}
-			PersonDao personDao = PersonDao.createPerson(repoDao, person, password, profile,returnResult);
-			User result;
-			if(personDao == null){
-				result = new User();
-				result.setUserName(person);
-			}else{
-				result = personDao.asPerson();
-			}
-	    	
-	    	return Response.status(Response.Status.OK).entity(result).build();
-	    	
-    	} catch (DAOValidationException t) {
-    		
-    		logger.warn(t.getMessage(), t);
-    		return Response.status(Response.Status.BAD_REQUEST).entity(new ErrorResponse(t)).build();
-    		
-    	} catch (DAOSecurityException t) {
-    		
-    		logger.warn(t.getMessage(), t);
-    		return Response.status(Response.Status.FORBIDDEN).entity(new ErrorResponse(t)).build();
-    		
-    	} catch (DAOMissingException t) {
-    		
-    		logger.warn(t.getMessage(), t);
-    		return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponse(t)).build();
-    		
-    	} catch (Throwable t) {
-    		
-    		logger.error(t.getMessage(), t);
-    		return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(new ErrorResponse(t)).build();
-    	}finally {
-			OnUpdatePersonPropertiesPolicy.constructPersonFolders.set(null);
+		} catch (Throwable t) {
+
+			logger.error(t.getMessage(), t);
+			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(new ErrorResponse(t)).build();
 		}
-    }
-
-    @PUT
-    @Path("/people/{repository}/{person}/status/{status}")
-    @Operation(summary = "update the user status.", description = "update the user status. (admin rights are required.)")
-
-    @ApiResponses(
-    	value = {
-			@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
-			@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-			@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-			@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-			@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-			@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
-		})
-
-    public Response updateUserStatus(
-    		@Parameter(description = RestConstants.MESSAGE_REPOSITORY_ID, required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "username",required=true) @PathParam("person") String person,
-    		@Parameter(description = "the new status to set",required=true) @PathParam("status") PersonLifecycleService.PersonStatus status,
-    		@Parameter(description = "notify the user via mail", required = true, schema = @Schema(defaultValue="true")) @QueryParam("notify") Boolean notifyMail,
-    		@Context HttpServletRequest req) {
-
-    	try {
-    		
-	    	RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	PersonDao personDao = PersonDao.getPerson(repoDao, person);
-
-	    	personDao.setStatus(status,notifyMail==null ? true : notifyMail);
-	    	
-	    	return Response.status(Response.Status.OK).build();
-	    	
-    	} catch (DAOValidationException t) {
-    		
-    		logger.warn(t.getMessage(), t);
-    		return Response.status(Response.Status.BAD_REQUEST).entity(new ErrorResponse(t)).build();
-    		
-    	} catch (DAOSecurityException t) {
-    		
-    		logger.warn(t.getMessage(), t);
-    		return Response.status(Response.Status.FORBIDDEN).entity(new ErrorResponse(t)).build();
-    		
-    	} catch (DAOMissingException t) {
-    		
-    		logger.warn(t.getMessage(), t);
-    		return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponse(t)).build();
-    		
-    	} catch (Throwable t) {
-    		
-    		logger.error(t.getMessage(), t);
-    		return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(new ErrorResponse(t)).build();
-    	}
-    }
+	}
 
 	@DELETE
 
-	@Path("/people/{repository}/{person}")
+	@Path("/groups/{repository}/{group}")
 
-	@Operation(summary = "Delete the user.", description = "Delete the user. (admin rights are required.)")
+	@Operation(summary = "Delete the group.", description = "Delete the group. (admin rights are required.)")
 
 	@ApiResponses(
 			value = {
@@ -550,19 +940,19 @@ public Response updateUserStatus(
 					@ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
 			})
 
-	public Response deleteUser(
+	public Response deleteGroup(
 			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-			@Parameter(description = "username",required=true) @PathParam("person") String person,
-			@Parameter(description = "force the deletion (if false then only persons which are previously marked for deletion are getting deleted)", required = false, schema = @Schema(defaultValue="false")) @QueryParam("force") Boolean force,
+			@Parameter(description = "groupname",required=true) @PathParam("group") String group,
 			@Context HttpServletRequest req) {
 
 		try {
+			new MCAlfrescoAPIClient().doInTransaction(()-> {
+				RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+				GroupDao groupDao = GroupDao.getGroup(repoDao, group);
 
-			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-			PersonDao personDao = PersonDao.getPerson(repoDao, person);
-
-			personDao.delete(force != null && force);
-
+				groupDao.delete();
+				return groupDao;
+			});
 			return Response.status(Response.Status.OK).build();
 
 		} catch (Throwable t) {
@@ -570,420 +960,38 @@ public Response deleteUser(
 		}
 	}
 
-    @OPTIONS        
-    @Path("/people/{repository}/{person}")
-    @Hidden
-
-    public Response options02() {
-    	
-    	return Response.status(Response.Status.OK).header("Allow", "OPTIONS, GET, POST, DELETE").build();
-    }
-
-    @PUT
-
-    @Path("/people/{repository}/{person}/profile")    
-    
-    @Operation(summary = "Set profile of the user.", description = "Set profile of the user. (To set foreign profiles, admin rights are required.)")
-
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
-	        @ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
-	    })
-
-    public Response changeUserProfile(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
-    	    @Parameter(description = "properties" ,required=true ) UserProfileEdit profile,
-    		@Context HttpServletRequest req) {
-
-    	try {
-    		
-	    	RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	PersonDao personDao = PersonDao.getPerson(repoDao, person);
-	    	
-	    	personDao.changeProfile(profile);
-	    		    	
-	    	return Response.status(Response.Status.OK).build();
-
-    	} catch (Throwable t) {
-    		return ErrorResponse.createResponse(t);
-    	}
-    }
-    @PUT
-    @Path("/people/{repository}/{person}/avatar")
-    @Operation(summary = "Set avatar of the user.", description = "Set avatar of the user. (To set foreign avatars, admin rights are required.)")
-	@Consumes({ "multipart/form-data" })
+	@OPTIONS
+	@Path("/groups/{repository}/{group}")
+	@Hidden
+
+	public Response options06() {
+
+		return Response.status(Response.Status.OK).header("Allow", "OPTIONS, GET, POST, DELETE").build();
+	}
+
+	@PUT
+
+	@Path("/groups/{repository}/{group}/profile")
+
+	@Operation(summary = "Set profile of the group.", description = "Set profile of the group. (admin rights are required.)")
+
 	@ApiResponses(
-    	value = {
-	        @ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
-	        @ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
-	    })
-
-    public Response changeUserAvatar(
-    		@Parameter(description = RestConstants.MESSAGE_REPOSITORY_ID, required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
-    	    @Parameter(description = "avatar image" ,required=true ) @FormDataParam("avatar") InputStream avatar,
-    		@Context HttpServletRequest req) {
-
-    	try {
-
-	    	RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	PersonDao personDao = PersonDao.getPerson(repoDao, person);
-
-	    	personDao.changeAvatar(avatar);
-
-	    	return Response.status(Response.Status.OK).build();
-
-    	} catch (Throwable t) {
-
-    		return ErrorResponse.createResponse(t);
-    	}
-    }
-    @DELETE
-    @Path("/people/{repository}/{person}/avatar")
-    @Operation(summary = "Remove avatar of the user.", description = "Remove avatar of the user. (To Remove foreign avatars, admin rights are required.)")
-    @ApiResponses(
-    	value = {
-	        @ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
-	        @ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-	        @ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
-	    })
-
-    public Response removeUserAvatar(
-    		@Parameter(description = RestConstants.MESSAGE_REPOSITORY_ID, required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
-    		@Context HttpServletRequest req) {
-
-    	try {
-	    	RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	PersonDao personDao = PersonDao.getPerson(repoDao, person);
-	    	personDao.removeAvatar();
-	    	return Response.status(Response.Status.OK).build();
-
-    	} catch (Throwable t) {
-    		return ErrorResponse.createResponse(t);
-    	}
-    }
-
-    @OPTIONS        
-    @Path("/people/{repository}/{person}/profile")
-    @Hidden
-
-    public Response options03() {
-    	
-    	return Response.status(Response.Status.OK).header("Allow", "OPTIONS, PUT").build();
-    }
-
-    @PUT
-
-    @Path("/people/{repository}/{person}/credential")    
-    
-    @Operation(summary = "Change/Set password of the user.", description = "Change/Set password of the user. (To change foreign passwords or set passwords, admin rights are required.)")
-
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = Void.class))),        
-	        @ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-	        @ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-	    })
-
-    public Response changeUserPassword(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "username (or \"-me-\" for current user)", required = true, schema = @Schema(defaultValue="-me-" )) @PathParam("person") String person,
-    	    @Parameter(description = "credential" ,required=true ) @Valid UserCredential credential,
-    		@Context HttpServletRequest req) {
-
-    	try {
-    		
-	    	RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	PersonDao personDao = PersonDao.getPerson(repoDao, person);
-	    	
-    		personDao.changePassword(credential.getOldPassword(), credential.getNewPassword());
-	    		    	
-	    	return Response.status(Response.Status.OK).build();
-	    	
-    	} catch (DAOValidationException t) {
-    		
-    		logger.warn(t.getMessage(), t);
-    		return Response.status(Response.Status.BAD_REQUEST).entity(new ErrorResponse(t)).build();
-    		
-    	} catch (DAOSecurityException t) {
-    		
-    		logger.warn(t.getMessage(), t);
-    		return Response.status(Response.Status.FORBIDDEN).entity(new ErrorResponse(t)).build();
-    		
-    	} catch (DAOMissingException t) {
-    		
-    		logger.warn(t.getMessage(), t);
-    		return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponse(t)).build();
-    		
-    	} catch (Throwable t) {
-    		
-    		logger.error(t.getMessage(), t);
-    		return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(new ErrorResponse(t)).build();
-    	}
-    }
-
-    @OPTIONS        
-    @Path("/people/{repository}/{person}/credential")
-    @Hidden
-
-    public Response options04() {	
-    	
-    	return Response.status(Response.Status.OK).header("Allow", "OPTIONS, PUT").build();
-    }
-    
-    @GET
-
-    @Path("/groups/{repository}")    
-    
-    @Operation(summary = "Search groups.", description = "Search groups. (admin rights are required.)")
-
-    @ApiResponses(
-        	value = { 
-    	        @ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = GroupEntries.class))),
-    	        @ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    	        @ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    	        @ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-    	        @ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-    	        @ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-    	    })
-
-        public Response searchGroups(
-        		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-        		@Parameter(description = "pattern",required=true) @QueryParam("pattern") String pattern,
-        		@Parameter(description = "find a specific groupType",required=false) @QueryParam("groupType") String groupType,
-				@Parameter(description = "find a specific signupMethod for groups (or asterisk for all including one)",required=false) @QueryParam("signupMethod") String signupMethod,
-				@Parameter(description = "global search context, defaults to true, otherwise just searches for groups within the organizations", required = false, schema = @Schema(defaultValue="true")) @QueryParam("global") Boolean global,
-        		@Parameter(description = RestConstants.MESSAGE_MAX_ITEMS, schema = @Schema(defaultValue=""+RestConstants.DEFAULT_MAX_ITEMS)) @QueryParam("maxItems") Integer maxItems,
-        	    @Parameter(description = RestConstants.MESSAGE_SKIP_COUNT, schema = @Schema(defaultValue="0")) @QueryParam("skipCount") Integer skipCount,
-        	    @Parameter(description = RestConstants.MESSAGE_SORT_PROPERTIES) @QueryParam("sortProperties") List<String> sortProperties,
-        	    @Parameter(description = RestConstants.MESSAGE_SORT_ASCENDING) @QueryParam("sortAscending") List<Boolean> sortAscending,
-        		@Context HttpServletRequest req) {
-
-        	try {
-        		Map<String, String> props = new HashMap<>();
-        		if(groupType!=null && !groupType.isEmpty()){
-        			props.put(CCConstants.getValidLocalName(CCConstants.CCM_PROP_GROUPEXTENSION_GROUPTYPE), groupType);
-        		}
-				if(signupMethod!=null && !signupMethod.isEmpty()){
-					props.put(CCConstants.getValidLocalName(CCConstants.CCM_PROP_GROUP_SIGNUP_METHOD), signupMethod);
-				}
-    	    	RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-    	    	SearchResult<String> search=SearchServiceFactory.getSearchService(repoDao.getId()).findAuthorities(
-    	    					AuthorityType.GROUP,
-    	    					pattern,
-    	    					global==null ? true : global, 
-    	    					skipCount!=null ? skipCount : 0,
-    	    					maxItems!=null ? maxItems : RestConstants.DEFAULT_MAX_ITEMS,
-    	    					new SortDefinition(sortProperties,sortAscending),
-    	    					props
-    	    			);
-
-    	    	List<Group> result = new ArrayList<>();
-    	    	for (String group: search.getData()) {
-					try {
-						result.add(new GroupDao(repoDao, group).asGroup());
-					} catch(DAOMissingException e) {
-						logger.warn("Group " + group + " as provided by search was not found", e);
-						Group groupObj = new Group();
-						groupObj.setAuthorityName(group);
-						result.add(groupObj);
-					}
-    	    	}	
-    	    	GroupEntries response = new GroupEntries();
-    	    	response.setList(result);
-    	    	response.setPagination(new Pagination(search));		    	
-    	    	
-    	    	return Response.status(Response.Status.OK).entity(response).build();
-    	    	
-        	 
-        	} catch (Throwable t) {
-        		return ErrorResponse.createResponse(t);
-        	}
-    }
-
-        
-    @OPTIONS        
-    @Path("/groups/{repository}")
-    @Hidden
-
-    public Response options05() {
-    	
-    	return Response.status(Response.Status.OK).header("Allow", "OPTIONS, GET").build();
-    }
-    
-    @GET
-
-    @Path("/groups/{repository}/{group}")    
-    
-    @Operation(summary = "Get the group.", description = "Get the group. (To get foreign profiles, admin rights are required.)")
-
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = GroupEntry.class))),        
-	        @ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-	        @ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-	    })
-
-    public Response getGroup(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "groupname",required=true) @PathParam("group") String group,
-    		@Context HttpServletRequest req) {
-
-    	try {
-    		
-	    	RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	GroupDao groupDao = GroupDao.getGroup(repoDao, group);
-	    	
-	    	GroupEntry response = new GroupEntry();
-	    	response.setGroup(groupDao.asGroup());
-	    		    	
-	    	return Response.status(Response.Status.OK).entity(response).build();
-	    	
-    	} catch (Throwable t) {
-    		return ErrorResponse.createResponse(t, ErrorResponse.ErrorResponseLogging.relaxed);
-    	}
-    }
-    
-    @POST
-
-    @Path("/groups/{repository}/{group}")    
-    
-    @Operation(summary = "Create a new group.", description = "Create a new group. (admin rights are required.)")
-
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = Group.class))),
-	        @ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-	        @ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-	    })
-
-    public Response createGroup(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "groupname",required=true) @PathParam("group") String group,
-    		@Parameter(description = "parent (will be added to this parent, also for name hashing), may be null",required=false) @QueryParam("parent") String parent,
-    		@Parameter(description = "properties" ,required=true ) GroupProfile profile,
-    		@Context HttpServletRequest req) {
-
-    	try {
-    		
-	    	RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	Group groupResult = GroupDao.createGroup(repoDao, group, profile,parent).asGroup();
-	    	
-	    	return Response.status(Response.Status.OK).entity(groupResult).build();
-	    	
-    	} catch (DAOValidationException t) {
-    		
-    		logger.warn(t.getMessage(), t);
-    		return Response.status(Response.Status.BAD_REQUEST).entity(new ErrorResponse(t)).build();
-    		
-    	} catch (DAOSecurityException t) {
-    		
-    		logger.warn(t.getMessage(), t);
-    		return Response.status(Response.Status.FORBIDDEN).entity(new ErrorResponse(t)).build();
-    		
-    	} catch (DAOMissingException t) {
-    		
-    		logger.warn(t.getMessage(), t);
-    		return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponse(t)).build();
-    		
-    	} catch (Throwable t) {
-    		
-    		logger.error(t.getMessage(), t);
-    		return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(new ErrorResponse(t)).build();
-    	}
-    }
-    
-    @DELETE
-
-    @Path("/groups/{repository}/{group}")    
-    
-    @Operation(summary = "Delete the group.", description = "Delete the group. (admin rights are required.)")
-
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = Void.class))),        
-	        @ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-	        @ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-	    })
-
-    public Response deleteGroup(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "groupname",required=true) @PathParam("group") String group,
-    		@Context HttpServletRequest req) {
-
-    	try {
-			new MCAlfrescoAPIClient().doInTransaction(()-> {
-				RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-				GroupDao groupDao = GroupDao.getGroup(repoDao, group);
+			value = {
+					@ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = Void.class))),
+					@ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
 
-				groupDao.delete();
-				return groupDao;
-			});
-	    	return Response.status(Response.Status.OK).build();
-	    	
-    	} catch (Throwable t) {
-			return ErrorResponse.createResponse(t);
-		}
-    }
-
-    @OPTIONS        
-    @Path("/groups/{repository}/{group}")
-    @Hidden
-
-    public Response options06() {
-    	
-    	return Response.status(Response.Status.OK).header("Allow", "OPTIONS, GET, POST, DELETE").build();
-    }
-
-    @PUT
-
-    @Path("/groups/{repository}/{group}/profile")    
-    
-    @Operation(summary = "Set profile of the group.", description = "Set profile of the group. (admin rights are required.)")
-
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = Void.class))),        
-	        @ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-	        @ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-	    })
-
-    public Response changeGroupProfile(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "groupname",required=true ) @PathParam("group") String group,
-    	    @Parameter(description = "properties" ,required=true ) GroupProfile profile,
-    		@Context HttpServletRequest req) {
-
-    	try {
+	public Response changeGroupProfile(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "groupname",required=true ) @PathParam("group") String group,
+			@Parameter(description = "properties" ,required=true ) GroupProfile profile,
+			@Context HttpServletRequest req) {
+
+		try {
 			new MCAlfrescoAPIClient().doInTransaction(()->{
 				RepositoryDao repoDao = RepositoryDao.getRepository(repository);
 				GroupDao groupDao = GroupDao.getGroup(repoDao, group);
@@ -991,19 +999,19 @@ public Response changeGroupProfile(
 				return groupDao;
 			});
 			return Response.status(Response.Status.OK).build();
-    	} catch (Throwable t) {
+		} catch (Throwable t) {
 			return ErrorResponse.createResponse(t);
-    	}
-    }
+		}
+	}
+
+	@OPTIONS
+	@Path("/groups/{repository}/{group}/profile")
+	@Hidden
 
-    @OPTIONS        
-    @Path("/groups/{repository}/{group}/profile")
-    @Hidden
+	public Response options07() {
 
-    public Response options07() {
-    	
-    	return Response.status(Response.Status.OK).header("Allow", "OPTIONS, PUT").build();
-    }
+		return Response.status(Response.Status.OK).header("Allow", "OPTIONS, PUT").build();
+	}
 
 	@POST
 	@Path("/groups/{repository}/{group}/signup/config")
@@ -1179,105 +1187,105 @@ public Response rejectSignup(
 
 	@GET
 
-    @Path("/people/{repository}/{person}/memberships")
+	@Path("/people/{repository}/{person}/memberships")
 
-    @Operation(summary = "Get all groups the given user is member of.")
+	@Operation(summary = "Get all groups the given user is member of.")
 
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = GroupEntries.class))),
-	        @ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-	        @ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-	    })
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = GroupEntries.class))),
+					@ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
 
-    public Response getUserGroups(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "authority name",required=true ) @PathParam("person") String person,
-       		@Parameter(description = "pattern",required=false) @QueryParam("pattern") String pattern,
-    		@Parameter(description = RestConstants.MESSAGE_MAX_ITEMS, schema = @Schema(defaultValue=""+RestConstants.DEFAULT_MAX_ITEMS)) @QueryParam("maxItems") Integer maxItems,
-    	    @Parameter(description = RestConstants.MESSAGE_SKIP_COUNT, schema = @Schema(defaultValue="0")) @QueryParam("skipCount") Integer skipCount,
-    	    @Parameter(description = RestConstants.MESSAGE_SORT_PROPERTIES) @QueryParam("sortProperties") List<String> sortProperties,
-    	    @Parameter(description = RestConstants.MESSAGE_SORT_ASCENDING) @QueryParam("sortAscending") List<Boolean> sortAscending,
+	public Response getUserGroups(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "authority name",required=true ) @PathParam("person") String person,
+			@Parameter(description = "pattern",required=false) @QueryParam("pattern") String pattern,
+			@Parameter(description = RestConstants.MESSAGE_MAX_ITEMS, schema = @Schema(defaultValue=""+RestConstants.DEFAULT_MAX_ITEMS)) @QueryParam("maxItems") Integer maxItems,
+			@Parameter(description = RestConstants.MESSAGE_SKIP_COUNT, schema = @Schema(defaultValue="0")) @QueryParam("skipCount") Integer skipCount,
+			@Parameter(description = RestConstants.MESSAGE_SORT_PROPERTIES) @QueryParam("sortProperties") List<String> sortProperties,
+			@Parameter(description = RestConstants.MESSAGE_SORT_ASCENDING) @QueryParam("sortAscending") List<Boolean> sortAscending,
 
-    		@Context HttpServletRequest req) {
+			@Context HttpServletRequest req) {
 
-    	try {
+		try {
 
-    		RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
 			GroupEntries response = PersonDao.getPerson(repoDao, person).getMemberships(
-    				pattern, 
-    				skipCount!=null ? skipCount : 0,
-	    			maxItems!=null ? maxItems : RestConstants.DEFAULT_MAX_ITEMS,
+					pattern,
+					skipCount!=null ? skipCount : 0,
+					maxItems!=null ? maxItems : RestConstants.DEFAULT_MAX_ITEMS,
+					new SortDefinition(sortProperties,sortAscending)
+			);
+
+			return Response.status(Response.Status.OK).entity(response).build();
+
+		} catch (Throwable t) {
+			return ErrorResponse.createResponse(t);
+		}
+	}
+
+
+	@GET
+
+	@Path("/groups/{repository}/{group}/members")
+
+	@Operation(summary = "Get all members of the group.", description = "Get all members of the group. (admin rights are required.)")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = AuthorityEntries.class))),
+					@ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response getMembership(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "authority name (begins with GROUP_)",required=true ) @PathParam("group") String group,
+			@Parameter(description = "pattern",required=false) @QueryParam("pattern") String pattern,
+			@Parameter(description = "authorityType either GROUP or USER, empty to show all",required=false) @QueryParam("authorityType") String authorityType,
+			@Parameter(description = RestConstants.MESSAGE_MAX_ITEMS, schema = @Schema(defaultValue=""+RestConstants.DEFAULT_MAX_ITEMS)) @QueryParam("maxItems") Integer maxItems,
+			@Parameter(description = RestConstants.MESSAGE_SKIP_COUNT, schema = @Schema(defaultValue="0")) @QueryParam("skipCount") Integer skipCount,
+			@Parameter(description = RestConstants.MESSAGE_SORT_PROPERTIES) @QueryParam("sortProperties") List<String> sortProperties,
+			@Parameter(description = RestConstants.MESSAGE_SORT_ASCENDING) @QueryParam("sortAscending") List<Boolean> sortAscending,
+
+			@Context HttpServletRequest req) {
+
+		try {
+
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			GroupDao.getGroup(repoDao, group).checkAdminAccess();
+			SearchResult<String> search=SearchServiceFactory.getSearchService(repoDao.getId()).searchGroupMembers(
+					group,
+					pattern,
+					authorityType,
+					skipCount!=null ? skipCount : 0,
+					maxItems!=null ? maxItems : RestConstants.DEFAULT_MAX_ITEMS,
 					new SortDefinition(sortProperties,sortAscending)
 			);
+			AuthorityEntries response = new AuthorityEntries();
+			List<Authority> result = new ArrayList<>();
+			for (String member: search.getData()) {
+				result.add(
+						member.startsWith(PermissionService.GROUP_PREFIX) ?
+								new GroupDao(repoDao,member).asGroup() :
+								new PersonDao(repoDao, member).asPerson());
+			}
+			response.setList(result);
+			response.setPagination(new Pagination(search));
+			return Response.status(Response.Status.OK).entity(response).build();
 
-	    	return Response.status(Response.Status.OK).entity(response).build();
-
-    	} catch (Throwable t) {
-    		return ErrorResponse.createResponse(t);
-    	}
-    }
-
-
-    @GET
-
-    @Path("/groups/{repository}/{group}/members")    
-    
-    @Operation(summary = "Get all members of the group.", description = "Get all members of the group. (admin rights are required.)")
-
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = AuthorityEntries.class))),        
-	        @ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-	        @ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-	    })
-
-    public Response getMembership(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "authority name (begins with GROUP_)",required=true ) @PathParam("group") String group,
-       		@Parameter(description = "pattern",required=false) @QueryParam("pattern") String pattern,
-       		@Parameter(description = "authorityType either GROUP or USER, empty to show all",required=false) @QueryParam("authorityType") String authorityType,
-    		@Parameter(description = RestConstants.MESSAGE_MAX_ITEMS, schema = @Schema(defaultValue=""+RestConstants.DEFAULT_MAX_ITEMS)) @QueryParam("maxItems") Integer maxItems,
-    	    @Parameter(description = RestConstants.MESSAGE_SKIP_COUNT, schema = @Schema(defaultValue="0")) @QueryParam("skipCount") Integer skipCount,
-    	    @Parameter(description = RestConstants.MESSAGE_SORT_PROPERTIES) @QueryParam("sortProperties") List<String> sortProperties,
-    	    @Parameter(description = RestConstants.MESSAGE_SORT_ASCENDING) @QueryParam("sortAscending") List<Boolean> sortAscending,
- 
-    		@Context HttpServletRequest req) {
-
-    	try {
-    		
-    		RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-    		GroupDao.getGroup(repoDao, group).checkAdminAccess();
-	    	SearchResult<String> search=SearchServiceFactory.getSearchService(repoDao.getId()).searchGroupMembers(
-	    					group,
-	    					pattern,
-	    					authorityType,
-	    					skipCount!=null ? skipCount : 0,
-	    	    			maxItems!=null ? maxItems : RestConstants.DEFAULT_MAX_ITEMS,
-	    					new SortDefinition(sortProperties,sortAscending)
-	    			);
-	    	AuthorityEntries response = new AuthorityEntries();
-    		List<Authority> result = new ArrayList<>();
-	    	for (String member: search.getData()) {
-	    		result.add(
-	    				member.startsWith(PermissionService.GROUP_PREFIX) ?
-	    							new GroupDao(repoDao,member).asGroup() :
-	    							new PersonDao(repoDao, member).asPerson());	
-	    	}	
-	    	response.setList(result);
-	    	response.setPagination(new Pagination(search));
-	    	return Response.status(Response.Status.OK).entity(response).build();
-	    	
-    	} catch (Throwable t) {
-    		return ErrorResponse.createResponse(t);
-    	}
-    }
+		} catch (Throwable t) {
+			return ErrorResponse.createResponse(t);
+		}
+	}
 
 
 	@GET
@@ -1319,113 +1327,113 @@ public Response getSubgroupByType(
 
 	@PUT
 
-    @Path("/groups/{repository}/{group}/members/{member}")    
-    
-    @Operation(summary = "Add member to the group.", description = "Add member to the group. (admin rights are required.)")
-
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),        
-	        @ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-	        @ApiResponse(responseCode="409", description=RestConstants.HTTP_409, content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-	        @ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-	    })
-
-    public Response addMembership(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "groupname",required=true ) @PathParam("group") String group,
-    		@Parameter(description = "authorityName of member",required=true ) @PathParam("member") String member,
-    		@Context HttpServletRequest req) {
-
-    	try {
+	@Path("/groups/{repository}/{group}/members/{member}")
+
+	@Operation(summary = "Add member to the group.", description = "Add member to the group. (admin rights are required.)")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = Void.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="409", description=RestConstants.HTTP_409, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response addMembership(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "groupname",required=true ) @PathParam("group") String group,
+			@Parameter(description = "authorityName of member",required=true ) @PathParam("member") String member,
+			@Context HttpServletRequest req) {
+
+		try {
 			new MCAlfrescoAPIClient().doInTransaction(()-> {
 				RepositoryDao repoDao = RepositoryDao.getRepository(repository);
 				GroupDao groupDao = GroupDao.getGroup(repoDao, group);
 				groupDao.addMember(member);
 				return groupDao;
 			});
-	    	return Response.status(Response.Status.OK).build();
-	    	
-    	} catch (Throwable t) {
-    		return  ErrorResponse.createResponse(t);
-    	}
-    }
-    
-    @DELETE
-
-    @Path("/groups/{repository}/{group}/members/{member}")    
-    
-    @Operation(summary = "Delete member from the group.", description = "Delete member from the group. (admin rights are required.)")
-
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = Void.class))),        
-	        @ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-	        @ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-	    })
-
-    public Response deleteMembership(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "groupname",required=true ) @PathParam("group") String group,
-    		@Parameter(description = "authorityName of member",required=true ) @PathParam("member") String member,
-    		@Context HttpServletRequest req) {
-
-    	try {
+			return Response.status(Response.Status.OK).build();
+
+		} catch (Throwable t) {
+			return  ErrorResponse.createResponse(t);
+		}
+	}
+
+	@DELETE
+
+	@Path("/groups/{repository}/{group}/members/{member}")
+
+	@Operation(summary = "Delete member from the group.", description = "Delete member from the group. (admin rights are required.)")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description="OK.", content = @Content(schema = @Schema(implementation = Void.class))),
+					@ApiResponse(responseCode="400", description="Preconditions are not present.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description="Authorization failed.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description="Session user has insufficient rights to perform this operation.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description="Ressources are not found.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description="Fatal error occured.", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response deleteMembership(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "groupname",required=true ) @PathParam("group") String group,
+			@Parameter(description = "authorityName of member",required=true ) @PathParam("member") String member,
+			@Context HttpServletRequest req) {
+
+		try {
 			new MCAlfrescoAPIClient().doInTransaction(()-> {
 				RepositoryDao repoDao = RepositoryDao.getRepository(repository);
 				GroupDao groupDao = GroupDao.getGroup(repoDao, group);
 				groupDao.deleteMember(member);
 				return groupDao;
 			});
-	    	return Response.status(Response.Status.OK).build();
-    	} catch (Throwable t) {
+			return Response.status(Response.Status.OK).build();
+		} catch (Throwable t) {
 			return  ErrorResponse.createResponse(t);
 		}
-    }
-
-    @OPTIONS        
-    @Path("/groups/{repository}/{group}/members/{member}")
-    @Hidden
-
-    public Response options09() {
-    	
-    	return Response.status(Response.Status.OK).header("Allow", "OPTIONS, PUT, DELETE").build();
-    }
-    
-    
-    @GET
-
-    @Path("/authorities/{repository}")    
-    
-    @Operation(summary = "Search authorities.", description = "Search authorities.")
-
-    @ApiResponses(
-    	value = { 
-	        @ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = AuthorityEntries.class))),        
-	        @ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),        
-	        @ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))), 
-	        @ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class))) 
-	    })
-
-    public Response searchAuthorities(
-    		@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
-    		@Parameter(description = "pattern",required=true) @QueryParam("pattern") String pattern,
-    		@Parameter(description = "global search context, defaults to true, otherwise just searches for users within the organizations", required = false, schema = @Schema(defaultValue="true")) @QueryParam("global") Boolean global,
+	}
+
+	@OPTIONS
+	@Path("/groups/{repository}/{group}/members/{member}")
+	@Hidden
+
+	public Response options09() {
+
+		return Response.status(Response.Status.OK).header("Allow", "OPTIONS, PUT, DELETE").build();
+	}
+
+
+	@GET
+
+	@Path("/authorities/{repository}")
+
+	@Operation(summary = "Search authorities.", description = "Search authorities.")
+
+	@ApiResponses(
+			value = {
+					@ApiResponse(responseCode="200", description=RestConstants.HTTP_200, content = @Content(schema = @Schema(implementation = AuthorityEntries.class))),
+					@ApiResponse(responseCode="400", description=RestConstants.HTTP_400, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="401", description=RestConstants.HTTP_401, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="403", description=RestConstants.HTTP_403, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="404", description=RestConstants.HTTP_404, content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+					@ApiResponse(responseCode="500", description=RestConstants.HTTP_500, content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+			})
+
+	public Response searchAuthorities(
+			@Parameter(description = "ID of repository (or \"-home-\" for home repository)", required = true, schema = @Schema(defaultValue="-home-" )) @PathParam("repository") String repository,
+			@Parameter(description = "pattern",required=true) @QueryParam("pattern") String pattern,
+			@Parameter(description = "global search context, defaults to true, otherwise just searches for users within the organizations", required = false, schema = @Schema(defaultValue="true")) @QueryParam("global") Boolean global,
 			@Parameter(description = "find a specific groupType (does nothing for persons)",required=false) @QueryParam("groupType") String groupType,
 			@Parameter(description = "find a specific signupMethod for groups (or asterisk for all including one) (does nothing for persons)",required=false) @QueryParam("signupMethod") String signupMethod,
 			@Parameter(description = RestConstants.MESSAGE_MAX_ITEMS, schema = @Schema(defaultValue=""+RestConstants.DEFAULT_MAX_ITEMS)) @QueryParam("maxItems") Integer maxItems,
-    	    @Parameter(description = RestConstants.MESSAGE_SKIP_COUNT, schema = @Schema(defaultValue="0")) @QueryParam("skipCount") Integer skipCount,
-    		@Context HttpServletRequest req) {
+			@Parameter(description = RestConstants.MESSAGE_SKIP_COUNT, schema = @Schema(defaultValue="0")) @QueryParam("skipCount") Integer skipCount,
+			@Context HttpServletRequest req) {
 
-    	try {
+		try {
 			Map<String, String> props = new HashMap<>();
 			if(groupType!=null && !groupType.isEmpty()){
 				props.put(CCConstants.getValidLocalName(CCConstants.CCM_PROP_GROUPEXTENSION_GROUPTYPE), groupType);
@@ -1433,34 +1441,34 @@ public Response searchAuthorities(
 			if(signupMethod!=null && !signupMethod.isEmpty()){
 				props.put(CCConstants.getValidLocalName(CCConstants.CCM_PROP_GROUP_SIGNUP_METHOD), signupMethod);
 			}
-	    	RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-	    	SearchResult<String> search=SearchServiceFactory.getSearchService(repoDao.getId()).findAuthorities(
-	    					null,
-	    					pattern,
-	    					global==null ? true : global,
-	    					skipCount!=null ? skipCount : 0,
-	    	    			maxItems!=null ? maxItems : RestConstants.DEFAULT_MAX_ITEMS,
-	    					null,
-	    					props
-	    					
-	    			);
-
-	    	List<Authority> result = new ArrayList<>();
-	    	for (String user: search.getData()) {
-	    		result.add(getUserOrGroup(repoDao, user));
-	    	}	
-	    	AuthorityEntries response = new AuthorityEntries();
-	    	response.setList(result);
-	    	response.setPagination(new Pagination(search));
-	    		    	
-	    	
-	    	return Response.status(Response.Status.OK).entity(response).build();
-	    	
-    	 
-    	} catch (Throwable t) {
-    		return ErrorResponse.createResponse(t);
-    	}
-  }
+			RepositoryDao repoDao = RepositoryDao.getRepository(repository);
+			SearchResult<String> search=SearchServiceFactory.getSearchService(repoDao.getId()).findAuthorities(
+					null,
+					pattern,
+					global==null ? true : global,
+					skipCount!=null ? skipCount : 0,
+					maxItems!=null ? maxItems : RestConstants.DEFAULT_MAX_ITEMS,
+					null,
+					props
+
+			);
+
+			List<Authority> result = new ArrayList<>();
+			for (String user: search.getData()) {
+				result.add(getUserOrGroup(repoDao, user));
+			}
+			AuthorityEntries response = new AuthorityEntries();
+			response.setList(result);
+			response.setPagination(new Pagination(search));
+
+
+			return Response.status(Response.Status.OK).entity(response).build();
+
+
+		} catch (Throwable t) {
+			return ErrorResponse.createResponse(t);
+		}
+	}
 	@GET
 
 	@Path("/authorities/{repository}/recent")
diff --git a/Backend/services/core/src/main/java/org/edu_sharing/restservices/node/v1/NodeApi.java b/Backend/services/core/src/main/java/org/edu_sharing/restservices/node/v1/NodeApi.java
index 2b3711e86..edb515a80 100644
--- a/Backend/services/core/src/main/java/org/edu_sharing/restservices/node/v1/NodeApi.java
+++ b/Backend/services/core/src/main/java/org/edu_sharing/restservices/node/v1/NodeApi.java
@@ -2286,8 +2286,9 @@ public Response setProperty(
 	    	try {
 			
 		    	RepositoryDao repoDao = RepositoryDao.getRepository(repository);
-		    	NodeDao nodeDao = NodeDao.getNode(repoDao, node);
-		    	nodeDao.setProperty(
+		    	NodeDao.setProperty(
+						repoDao,
+						node,
 						property,
 						value == null || value.size() != 1? (Serializable) value : value.get(0),
 						keepModifiedDate != null && keepModifiedDate
diff --git a/Backend/services/rest/api/src/main/resources/openapi.json b/Backend/services/rest/api/src/main/resources/openapi.json
index e305997bc..724e4ebc5 100644
--- a/Backend/services/rest/api/src/main/resources/openapi.json
+++ b/Backend/services/rest/api/src/main/resources/openapi.json
@@ -16605,6 +16605,14 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "description": "resolve the organization(s) this group is part of? disabling will slightly improve performance and should considered for bulk calls",
+            "in": "query",
+            "name": "resolveOrganizations",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -16704,6 +16712,15 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "description": "returnResult, if true the created group object will be returned.",
+            "in": "query",
+            "name": "returnResult",
+            "schema": {
+              "default": true,
+              "type": "boolean"
+            }
           }
         ],
         "requestBody": {

From 3f0bfe023a58a1cb17122d69b1bf08a48d643756 Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Sat, 16 Nov 2024 21:33:04 +0100
Subject: [PATCH 13/19] fix:sharing page broken

---
 Frontend/src/app/pages/sharing-page/sharing-page.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Frontend/src/app/pages/sharing-page/sharing-page.component.ts b/Frontend/src/app/pages/sharing-page/sharing-page.component.ts
index fb843dea1..f32957013 100644
--- a/Frontend/src/app/pages/sharing-page/sharing-page.component.ts
+++ b/Frontend/src/app/pages/sharing-page/sharing-page.component.ts
@@ -40,6 +40,7 @@ import { OptionsHelperService } from '../../services/options-helper.service';
     selector: 'es-sharing-page',
     templateUrl: 'sharing-page.component.html',
     styleUrls: ['sharing-page.component.scss'],
+    providers: [OptionsHelperService],
 })
 export class SharingPageComponent {
     readonly NodeEntriesDisplayType = NodeEntriesDisplayType;

From 2ef6543d61422a31448822006c5742b21a79f331 Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Sat, 16 Nov 2024 22:34:46 +0100
Subject: [PATCH 14/19] fix:right click menu broken multiselect workspace +
 subtree async enabled

---
 .../src/lib/dropdown/dropdown.component.ts    | 13 +++---
 .../projects/edu-sharing-ui/src/lib/index.ts  |  1 +
 .../node-entries-card-small.component.ts      |  4 +-
 .../node-entries-card.component.ts            |  2 +-
 .../option-button/option-button.component.ts  |  4 +-
 .../src/lib/services/node-entries.service.ts  |  3 +-
 .../src/lib/services/ui.service.ts            | 10 ++---
 .../src/lib/types/option-item.ts              |  5 ++-
 .../sub-tree/sub-tree.component.html          |  6 +--
 .../sub-tree/sub-tree.component.ts            | 41 ++++++++++++-------
 .../workspace-page/tree/tree.component.ts     | 19 ++++++++-
 .../src/app/services/node-helper.service.ts   | 11 ++++-
 12 files changed, 78 insertions(+), 41 deletions(-)

diff --git a/Frontend/projects/edu-sharing-ui/src/lib/dropdown/dropdown.component.ts b/Frontend/projects/edu-sharing-ui/src/lib/dropdown/dropdown.component.ts
index 8cc8ad31c..a5ecccbb8 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/dropdown/dropdown.component.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/dropdown/dropdown.component.ts
@@ -4,6 +4,7 @@ import { OptionItem } from '../types/option-item';
 import { Helper } from '../util/helper';
 import { UIService } from '../services/ui.service';
 import { BehaviorSubject } from 'rxjs';
+import { Node } from 'ngx-edu-sharing-api';
 
 /**
  * The dropdown is one base component of the action bar (showing more actions),
@@ -23,11 +24,11 @@ export class DropdownComponent implements OnChanges {
     options$ = new BehaviorSubject<OptionItem[]>([]);
 
     /**
-     * The object that should be returned via the option's callback.
+     * The objects that should be returned via the option's callback.
      *
      * Can be null
      */
-    @Input() callbackObject: any;
+    @Input() callbackObjects: Node[];
 
     /**
      * Should disabled ("greyed out") options be shown or hidden?
@@ -45,10 +46,10 @@ export class DropdownComponent implements OnChanges {
     constructor(private ui: UIService) {}
 
     ngOnChanges(changes?: SimpleChanges): void {
-        if (changes == null || changes?.options || changes?.callbackObject) {
+        if (changes == null || changes?.options || changes?.callbackObjects) {
             this.options$.next(this.ui.filterValidOptions(Helper.deepCopyArray(this.options)));
-            if (this.callbackObject) {
-                this.ui.updateOptionEnabledState(this.options$, this.callbackObject);
+            if (this.callbackObjects) {
+                this.ui.updateOptionEnabledState(this.options$, this.callbackObjects);
             }
         }
     }
@@ -57,7 +58,7 @@ export class DropdownComponent implements OnChanges {
         if (!option.isEnabled) {
             return;
         }
-        setTimeout(() => option.callback(this.callbackObject));
+        setTimeout(() => option.callback(null, this.callbackObjects));
     }
 
     isNewGroup(i: number) {
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/index.ts b/Frontend/projects/edu-sharing-ui/src/lib/index.ts
index b3fe0b3de..9e0c8c151 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/index.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/index.ts
@@ -52,6 +52,7 @@ export * from './services/accessibility.service';
 export * from './services/app-container.service';
 export * from './services/local-events.service';
 export * from './services/node-helper.service';
+export * from './services/node-entries.service';
 export * from './services/nodes-drag-drop.service';
 export * from './services/options-helper-data.service';
 export * from './services/repo-url.service';
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/node-entries/node-entries-card-small/node-entries-card-small.component.ts b/Frontend/projects/edu-sharing-ui/src/lib/node-entries/node-entries-card-small/node-entries-card-small.component.ts
index 75b41b93e..9be29c05c 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/node-entries/node-entries-card-small/node-entries-card-small.component.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/node-entries/node-entries-card-small/node-entries-card-small.component.ts
@@ -27,10 +27,10 @@ export class NodeEntriesCardSmallComponent<T extends Node> implements OnChanges
     optionsOnCard() {
         const options = this.entriesService.options[Target.List];
         const always = options.filter((o) => o.showAlways);
-        if (always.some((o) => o.showCallback(this.node))) {
+        if (always.some((o) => o.showCallback([this.node]))) {
             return always;
         }
-        return options.filter((o) => o.showAsAction && o.showCallback(this.node)).slice(0, 3);
+        return options.filter((o) => o.showAsAction && o.showCallback([this.node])).slice(0, 3);
     }
 
     openContextmenu(event: MouseEvent | Event) {
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/node-entries/node-entries-card/node-entries-card.component.ts b/Frontend/projects/edu-sharing-ui/src/lib/node-entries/node-entries-card/node-entries-card.component.ts
index a738b7a6a..3cd403901 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/node-entries/node-entries-card/node-entries-card.component.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/node-entries/node-entries-card/node-entries-card.component.ts
@@ -64,7 +64,7 @@ export class NodeEntriesCardComponent<T extends Node> implements OnChanges, OnIn
     optionsOnCard() {
         const options = this.entriesService.options?.[Target.List];
         const always = options?.filter((o) => o.showAlways);
-        if (always?.some((o) => o.showCallback(this.node))) {
+        if (always?.some((o) => o.showCallback([this.node]))) {
             return always;
         }
         // we do NOT show any additional actions
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/node-entries/option-button/option-button.component.ts b/Frontend/projects/edu-sharing-ui/src/lib/node-entries/option-button/option-button.component.ts
index 58e090e23..aec6ebc45 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/node-entries/option-button/option-button.component.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/node-entries/option-button/option-button.component.ts
@@ -35,14 +35,14 @@ export class OptionButtonComponent implements OnChanges {
 
     async optionIsValid(optionItem: OptionItem, node: Node): Promise<boolean> {
         if (optionItem.enabledCallback) {
-            return await optionItem.enabledCallback(node);
+            return await optionItem.enabledCallback([node]);
         }
         return optionItem.isEnabled;
     }
 
     private async optionIsShown(optionItem: OptionItem, node: Node): Promise<boolean> {
         if (optionItem.showCallback) {
-            return optionItem.showCallback(node);
+            return optionItem.showCallback([node]);
         }
         return true;
     }
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/services/node-entries.service.ts b/Frontend/projects/edu-sharing-ui/src/lib/services/node-entries.service.ts
index f6a368ce7..b55ac20e4 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/services/node-entries.service.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/services/node-entries.service.ts
@@ -1,6 +1,7 @@
 import { SelectionModel } from '@angular/cdk/collections';
 import { EventEmitter, Injectable, signal, WritableSignal } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
+import { Node } from 'ngx-edu-sharing-api';
 import {
     ClickSource,
     FetchEvent,
@@ -231,7 +232,7 @@ export class NodeEntriesService<T extends NodeEntriesDataType> {
         }
         // Wait for the menu to reflect changed options.
         setTimeout(() => {
-            dropdown.callbackObject = node;
+            dropdown.callbackObjects = this.selection.selected as unknown as Node[];
             dropdown.ngOnChanges();
             if (dropdown.canShowDropdown()) {
                 if (onDone) {
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/services/ui.service.ts b/Frontend/projects/edu-sharing-ui/src/lib/services/ui.service.ts
index e2aef0567..a5e92c1f0 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/services/ui.service.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/services/ui.service.ts
@@ -13,6 +13,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
 import { UIConstants } from '../util/ui-constants';
 import { OptionItem } from '../types/option-item';
 import { distinctUntilChanged, map } from 'rxjs/operators';
+import { Node } from 'ngx-edu-sharing-api';
 
 @Injectable({ providedIn: 'root' })
 export class UIService {
@@ -128,13 +129,10 @@ export class UIService {
      * can be used by dropdown or action menus to update the state for the current element
      * @param options
      */
-    async updateOptionEnabledState(
-        options: BehaviorSubject<OptionItem[]>,
-        object: Node | any = null,
-    ) {
-        options.value.forEach((o) => {
+    async updateOptionEnabledState(options: BehaviorSubject<OptionItem[]>, objects: Node[] = null) {
+        options.value?.forEach((o) => {
             o.isEnabled = !o.customEnabledCallback;
-            o.enabledCallback(object).then((result) => {
+            o.enabledCallback(objects).then((result) => {
                 o.isEnabled = result;
                 options.next(options.value);
             });
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/types/option-item.ts b/Frontend/projects/edu-sharing-ui/src/lib/types/option-item.ts
index d65f83184..c112b3450 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/types/option-item.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/types/option-item.ts
@@ -6,6 +6,7 @@
 
  */
 import { KeyboardShortcutCondition } from '../types/keyboard-shortcuts';
+import { Node } from 'ngx-edu-sharing-api';
 
 export enum NodesRightMode {
     // rights on the current node, no matter if its a reference or origianl
@@ -86,7 +87,7 @@ export class OptionItem {
      * Is handled by optionsHelper and may not be used otherwise
      * Please use @customShowCallback instead
      */
-    public showCallback: (node?: Node | any) => Promise<boolean>;
+    public showCallback: (nodes?: Node[]) => Promise<boolean>;
     /**
      * A function called with the node as parm which should return true or false if the option should be shown for this node
      * Will be called by the optionsHelper
@@ -97,7 +98,7 @@ export class OptionItem {
      * Is handled by optionsHelper and may not be used otherwise
      * Please use @customEnabledCallback instead
      */
-    public enabledCallback: (node?: Node | any) => Promise<boolean>;
+    public enabledCallback: (nodes?: Node[]) => Promise<boolean>;
     /**
      * A function called with the node as param which should return true or false if the option should be enabled or not
      * Will be called by the optionsHelper
diff --git a/Frontend/src/app/pages/workspace-page/sub-tree/sub-tree.component.html b/Frontend/src/app/pages/workspace-page/sub-tree/sub-tree.component.html
index 2c2a2bf11..f4cf11215 100644
--- a/Frontend/src/app/pages/workspace-page/sub-tree/sub-tree.component.html
+++ b/Frontend/src/app/pages/workspace-page/sub-tree/sub-tree.component.html
@@ -1,11 +1,11 @@
 <div class="sub-tree-wrapper">
-  <es-dropdown #dropdown></es-dropdown>
+  <es-dropdown #dropdown [options]="entriesService.options?.[Target.ListDropdown]"></es-dropdown>
   <button
     #dropdownTrigger="matMenuTrigger"
     mat-button
     class="dropdown-dummy cdk-visually-hidden"
-    [style.left]="dropdownLeft"
-    [style.top]="dropdownTop"
+    [style.left.px]="dropdownLeft"
+    [style.top.px]="dropdownTop"
     tabindex="-1"
     aria-hidden="true"
     [matMenuTriggerFor]="dropdown.menu"
diff --git a/Frontend/src/app/pages/workspace-page/sub-tree/sub-tree.component.ts b/Frontend/src/app/pages/workspace-page/sub-tree/sub-tree.component.ts
index 8c8dee704..a218edfbf 100644
--- a/Frontend/src/app/pages/workspace-page/sub-tree/sub-tree.component.ts
+++ b/Frontend/src/app/pages/workspace-page/sub-tree/sub-tree.component.ts
@@ -17,9 +17,11 @@ import {
     DropdownComponent,
     DropSource,
     LocalEventsService,
+    NodeEntriesService,
     OptionItem,
     OptionsHelperDataService,
     Scope,
+    Target,
     UIAnimation,
 } from 'ngx-edu-sharing-ui';
 import {
@@ -31,6 +33,7 @@ import {
 } from '../../../core-module/core.module';
 import { Helper } from '../../../core-module/rest/helper';
 import { canDropOnNode } from '../workspace-utils';
+import { Event } from 'typedoc';
 
 @Component({
     selector: 'es-workspace-sub-tree',
@@ -40,15 +43,16 @@ import { canDropOnNode } from '../workspace-utils';
         trigger('openOverlay', UIAnimation.openOverlay(UIAnimation.ANIMATION_TIME_FAST)),
         trigger('open', UIAnimation.openOverlay()),
     ],
-    providers: [OptionsHelperDataService],
+    providers: [OptionsHelperDataService, NodeEntriesService],
 })
 export class WorkspaceSubTreeComponent implements OnInit, OnDestroy {
+    readonly Target = Target;
     private static MAX_FOLDER_COUNT = 100;
 
     @ViewChild('dropdown') dropdown: DropdownComponent;
     @ViewChild('dropdownTrigger') dropdownTrigger: MatMenuTrigger;
-    dropdownLeft: string;
-    dropdownTop: string;
+    dropdownLeft: number;
+    dropdownTop: number;
 
     private _currentPath: string[] = [];
     /** Parent hierarchy of the currently selected node. */
@@ -91,6 +95,7 @@ export class WorkspaceSubTreeComponent implements OnInit, OnDestroy {
     constructor(
         private nodeApi: RestNodeService,
         private optionsService: OptionsHelperDataService,
+        public entriesService: NodeEntriesService<Node>,
         private localEvents: LocalEventsService,
         public ui: UIService,
     ) {}
@@ -129,7 +134,7 @@ export class WorkspaceSubTreeComponent implements OnInit, OnDestroy {
 
     optionIsShown(optionItem: OptionItem, node: Node) {
         if (optionItem.showCallback) {
-            return optionItem.showCallback(node);
+            return optionItem.showCallback([node]);
         }
         return true;
     }
@@ -140,6 +145,7 @@ export class WorkspaceSubTreeComponent implements OnInit, OnDestroy {
             .getChildren(this._node, [RestConstants.FILTER_FOLDERS], {
                 offset: this._nodes.length,
                 count: RestConstants.COUNT_UNLIMITED,
+                propertyFilter: [RestConstants.ALL],
             })
             .subscribe((data: NodeList) => {
                 this.loadingMore = false;
@@ -148,10 +154,12 @@ export class WorkspaceSubTreeComponent implements OnInit, OnDestroy {
             });
     }
 
-    contextMenu(event: any, node: Node) {
+    async contextMenu(event: MouseEvent, node: Node) {
         event.preventDefault();
         event.stopPropagation();
-
+        if (event instanceof MouseEvent) {
+            ({ clientX: this.dropdownLeft, clientY: this.dropdownTop } = event);
+        }
         this.showDropdown(event, node);
     }
 
@@ -159,18 +167,22 @@ export class WorkspaceSubTreeComponent implements OnInit, OnDestroy {
         this.onUpdateOptions.emit(event);
     }
 
-    private showDropdown(event: any, node: Node) {
+    private async showDropdown(event: MouseEvent, node: Node) {
         //if(this._options==null || this._options.length<1)
         //  return;
-        this.dropdownLeft = event.clientX + 'px';
-        this.dropdownTop = event.clientY + 'px';
         this.optionsService.setData({
-            activeObjects: [node],
             scope: Scope.WorkspaceTree,
+            allObjects: this._nodes,
+            activeObjects: [node],
         });
-        this.optionsService.initComponents(null, null, this.dropdown);
-        this.optionsService.refreshComponents();
-        this.dropdownTrigger.openMenu();
+        this.entriesService.options = {
+            [Target.ListDropdown]: await this.optionsService.getAvailableOptions(
+                Target.ListDropdown,
+            ),
+        };
+        this.entriesService.openDropdown(this.dropdown, node, () =>
+            this.dropdownTrigger.openMenu(),
+        );
     }
 
     dropToParent(event: any) {
@@ -211,8 +223,9 @@ export class WorkspaceSubTreeComponent implements OnInit, OnDestroy {
         this.nodeApi
             .getChildren(this._node, [RestConstants.FILTER_FOLDERS], {
                 count: WorkspaceSubTreeComponent.MAX_FOLDER_COUNT,
+                propertyFilter: [RestConstants.ALL],
             })
-            .subscribe((data: NodeList) => {
+            .subscribe(async (data: NodeList) => {
                 this._nodes = data.nodes;
                 this.moreItems = data.pagination.total - data.pagination.count;
                 this.loadingStates = Helper.initArray(this._nodes.length, true);
diff --git a/Frontend/src/app/pages/workspace-page/tree/tree.component.ts b/Frontend/src/app/pages/workspace-page/tree/tree.component.ts
index 9caadadd1..4fdb2e3f3 100644
--- a/Frontend/src/app/pages/workspace-page/tree/tree.component.ts
+++ b/Frontend/src/app/pages/workspace-page/tree/tree.component.ts
@@ -1,13 +1,23 @@
 import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
 import { Node } from '../../../core-module/core.module';
-import { CanDrop, DragData, DropSource, NodeRoot, OptionItem } from 'ngx-edu-sharing-ui';
+import {
+    CanDrop,
+    DragData,
+    DropSource,
+    NodeRoot,
+    OptionItem,
+    OptionsHelperDataService,
+    Scope,
+} from 'ngx-edu-sharing-ui';
 import { WorkspacePageComponent } from '../workspace-page.component';
 import { WorkspaceSubTreeComponent } from '../sub-tree/sub-tree.component';
+import { NodeEntriesService } from 'ngx-edu-sharing-ui/services/node-entries.service';
 
 @Component({
     selector: 'es-workspace-tree',
     templateUrl: 'tree.component.html',
     styleUrls: ['tree.component.scss'],
+    providers: [NodeEntriesService, OptionsHelperDataService],
 })
 export class WorkspaceTreeComponent {
     @Input() root: NodeRoot;
@@ -37,7 +47,12 @@ export class WorkspaceTreeComponent {
 
     currentPath: string[] = [];
 
-    constructor() {}
+    constructor(private optionsHelperDataService: OptionsHelperDataService) {
+        this.optionsHelperDataService.setData({
+            scope: Scope.WorkspaceTree,
+        });
+        this.optionsHelperDataService.initComponents();
+    }
 
     canDropOnRecycle = (dragData: DragData<'RECYCLE'>): CanDrop => {
         return { accept: dragData.action === 'move' };
diff --git a/Frontend/src/app/services/node-helper.service.ts b/Frontend/src/app/services/node-helper.service.ts
index 282e3e5bc..57653cbd1 100644
--- a/Frontend/src/app/services/node-helper.service.ts
+++ b/Frontend/src/app/services/node-helper.service.ts
@@ -53,6 +53,7 @@ import {
 } from 'ngx-edu-sharing-api';
 import { DialogsService } from '../features/dialogs/dialogs.service';
 import { DialogButton } from '../util/dialog-button';
+import { isArray } from 'lodash';
 
 export interface ConfigEntry {
     name: string;
@@ -684,8 +685,14 @@ export class NodeHelperService extends NodeHelperServiceBase {
         }
         return prop;
     }
-    static getActionbarNodes<T>(nodes: T[], node: T): T[] {
-        return node ? [node] : nodes && nodes.length ? nodes : null;
+    static getActionbarNodes<T>(listNodes: T[], externalNode: T | T[]): T[] {
+        return externalNode
+            ? isArray(externalNode)
+                ? externalNode
+                : [externalNode]
+            : listNodes && listNodes.length
+            ? listNodes
+            : null;
     }
 
     referenceOriginalExists(node: Node | CollectionReference) {

From d4baa690de930e3704c01cf12e59355396cecd23 Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Tue, 19 Nov 2024 13:29:03 +0100
Subject: [PATCH 15/19] feat:prepare license pipe

---
 .../common/edu-sharing-ui-common.module.ts    |   2 +
 .../projects/edu-sharing-ui/src/lib/index.ts  |   1 +
 .../src/lib/pipes/node-license.pipe.ts        |  20 +++
 .../src/lib/spinner/spinner.component.html    |  13 +-
 .../src/lib/spinner/spinner.component.scss    | 142 +-----------------
 .../src/lib/spinner/spinner.component.ts      |   4 +-
 6 files changed, 29 insertions(+), 153 deletions(-)
 create mode 100644 Frontend/projects/edu-sharing-ui/src/lib/pipes/node-license.pipe.ts

diff --git a/Frontend/projects/edu-sharing-ui/src/lib/common/edu-sharing-ui-common.module.ts b/Frontend/projects/edu-sharing-ui/src/lib/common/edu-sharing-ui-common.module.ts
index 1b6f93333..ab3d00175 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/common/edu-sharing-ui-common.module.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/common/edu-sharing-ui-common.module.ts
@@ -27,6 +27,7 @@ import { VCardNamePipe } from '../pipes/vcard-name.pipe';
 import { SortDropdownComponent } from '../sort-dropdown/sort-dropdown.component';
 import { SpinnerComponent } from '../spinner/spinner.component';
 import { PropertySlugPipe } from '../pipes/property-slug.pipe';
+import { NodeLicensePipe } from 'ngx-edu-sharing-ui/pipes/node-license.pipe';
 
 @NgModule({
     declarations: [
@@ -43,6 +44,7 @@ import { PropertySlugPipe } from '../pipes/property-slug.pipe';
         NodeIconPipe,
         NodeImagePipe,
         NodeImageSizePipe,
+        NodeLicensePipe,
         NodePersonNamePipe,
         NodeTitlePipe,
         NodeUrlComponent,
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/index.ts b/Frontend/projects/edu-sharing-ui/src/lib/index.ts
index 9e0c8c151..95803928b 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/index.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/index.ts
@@ -41,6 +41,7 @@ export * from './pipes/format-date.pipe';
 export * from './pipes/node-icon.pipe';
 export * from './pipes/node-image-size.pipe';
 export * from './pipes/node-image.pipe';
+export * from './pipes/node-license.pipe';
 export * from './pipes/node-person-name.pipe';
 export * from './pipes/node-title.pipe';
 export * from './pipes/vcard-name.pipe';
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/pipes/node-license.pipe.ts b/Frontend/projects/edu-sharing-ui/src/lib/pipes/node-license.pipe.ts
new file mode 100644
index 000000000..727e10f86
--- /dev/null
+++ b/Frontend/projects/edu-sharing-ui/src/lib/pipes/node-license.pipe.ts
@@ -0,0 +1,20 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { Node, RestConstants } from 'ngx-edu-sharing-api';
+import { TranslateService } from '@ngx-translate/core';
+
+export type LicenseType = 'name' | 'details';
+
+@Pipe({ name: 'esNodeLicense' })
+export class NodeLicensePipe implements PipeTransform {
+    constructor(private translate: TranslateService) {}
+    transform(node: Node, args: { type: LicenseType }) {
+        if (node.properties[RestConstants.CCM_PROP_LICENSE]?.[0]) {
+            if (args?.type === 'name') {
+                return this.translate.get(
+                    'LICENSE.NAMES.' + node.properties[RestConstants.CCM_PROP_LICENSE]?.[0],
+                );
+            }
+        }
+        return null;
+    }
+}
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.html b/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.html
index 9536d25f2..5a639df8e 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.html
+++ b/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.html
@@ -1,14 +1,3 @@
 <div class="spinner">
-  <span aria-live="polite" class="cdk-visually-hidden">{{ 'LOADING' | translate }}</span>
-  <div class="spinnercontainer">
-    <div class="inner">
-      <div class="spinner1"></div>
-    </div>
-    <div class="inner">
-      <div class="spinner2"></div>
-    </div>
-    <div class="inner">
-      <div class="spinner3"></div>
-    </div>
-  </div>
+  <mat-progress-spinner color="primary" mode="indeterminate" [diameter]="54"></mat-progress-spinner>
 </div>
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.scss b/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.scss
index 03f8e47e9..3de4d2cb2 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.scss
+++ b/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.scss
@@ -1,141 +1,5 @@
-/*SPINNER*/
-$path: '../../../../assets/spinner/';
 .spinner {
-    margin: 0 auto;
-}
-.spinnercontainer {
-    margin: auto;
-    margin-top: 20px;
-    height: 54px;
-    color: rgba(0, 0, 0, 0); /*do not change*/
-    text-align: center;
-    float: left;
-    width: 100%;
-}
-
-.inner {
-    width: 30px;
-    height: 50px;
-    display: inline-block;
-}
-
-.spinner1 {
-    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDEyLjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgNTE0NDgpICAtLT4KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIiBbCgk8IUVOVElUWSBuc19zdmcgImh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KCTwhRU5USVRZIG5zX3hsaW5rICJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KXT4KPHN2ZyAgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9IiZuc19zdmc7IiB4bWxuczp4bGluaz0iJm5zX3hsaW5rOyIgd2lkdGg9IjE1LjY1NyIgaGVpZ2h0PSIxMy41NTkiCgkgdmlld0JveD0iMCAwIDE1LjY1NyAxMy41NTkiIG92ZXJmbG93PSJ2aXNpYmxlIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxNS42NTcgMTMuNTU5IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPHBvbHlnb24gb3BhY2l0eT0iMC42IiBmaWxsPSIjYzFjNmUzIiBwb2ludHM9IjMuOTE0LDEzLjU1OSAwLDYuNzggMy45MTQsMCAxMS43NDMsMCAxNS42NTcsNi43OCAxMS43NDMsMTMuNTU5ICIvPgo8L3N2Zz4K);
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: 50px;
-    width: 50px;
-    height: 50px;
-    -webkit-animation: spin 2s infinite ease-in;
-    -moz-animation: spin 2s infinite ease-in;
-    -ms-animation: spin 2s infinite ease-in;
-    -o-animation: spin 2s infinite ease-in;
-    animation: spin 2s infinite ease-in;
-    -webkit-animation-delay: 0.1s;
-    -moz-animation-delay: 0.1s;
-    animation-delay: 0.1s;
-}
-
-.spinner2 {
-    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDEyLjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgNTE0NDgpICAtLT4KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIiBbCgk8IUVOVElUWSBuc19zdmcgImh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KCTwhRU5USVRZIG5zX3hsaW5rICJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KXT4KPHN2ZyAgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9IiZuc19zdmc7IiB4bWxuczp4bGluaz0iJm5zX3hsaW5rOyIgd2lkdGg9IjE1LjY1NyIgaGVpZ2h0PSIxMy41NTkiCgkgdmlld0JveD0iMCAwIDE1LjY1NyAxMy41NTkiIG92ZXJmbG93PSJ2aXNpYmxlIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxNS42NTcgMTMuNTU5IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPHBvbHlnb24gb3BhY2l0eT0iMC42IiBmaWxsPSIjN2Y5MWMzIiBwb2ludHM9IjMuOTE0LDEzLjU1OSAwLDYuNzggMy45MTQsMCAxMS43NDMsMCAxNS42NTcsNi43OCAxMS43NDMsMTMuNTU5ICIvPgo8L3N2Zz4K);
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: 50px;
-    width: 50px;
-    height: 50px;
-    -webkit-animation: spin 2s infinite ease-in;
-    -moz-animation: spin 2s infinite ease-in;
-    -ms-animation: spin 2s infinite ease-in;
-    -o-animation: spin 2s infinite ease-in;
-    animation: spin 2s infinite ease-in;
-    -webkit-animation-delay: 0.25s;
-    -moz-animation-delay: 0.25s;
-    animation-delay: 0.25s;
-}
-
-.spinner3 {
-    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDEyLjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgNTE0NDgpICAtLT4KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIiBbCgk8IUVOVElUWSBuc19zdmcgImh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KCTwhRU5USVRZIG5zX3hsaW5rICJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KXT4KPHN2ZyAgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9IiZuc19zdmc7IiB4bWxuczp4bGluaz0iJm5zX3hsaW5rOyIgd2lkdGg9IjE1LjY1NyIgaGVpZ2h0PSIxMy41NTkiCgkgdmlld0JveD0iMCAwIDE1LjY1NyAxMy41NTkiIG92ZXJmbG93PSJ2aXNpYmxlIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxNS42NTcgMTMuNTU5IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPHBvbHlnb24gb3BhY2l0eT0iMC42IiBmaWxsPSIjMzE2MmE3IiBwb2ludHM9IjMuOTE0LDEzLjU1OSAwLDYuNzggMy45MTQsMCAxMS43NDMsMCAxNS42NTcsNi43OCAxMS43NDMsMTMuNTU5ICIvPgo8L3N2Zz4K);
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: 50px;
-    width: 50px;
-    height: 50px;
-    -webkit-animation: spin 2s infinite ease-in;
-    -moz-animation: spin 2s infinite ease-in;
-    -ms-animation: spin 2s infinite ease-in;
-    -o-animation: spin 2s infinite ease-in;
-    animation: spin 2s infinite ease-in;
-    -webkit-animation-delay: 0.5s;
-    -moz-animation-delay: 0.5s;
-    animation-delay: 0.5s;
-}
-
-@-webkit-keyframes spin {
-    0% {
-        transform: scale(1);
-    }
-
-    50% {
-        transform: scale(0.5);
-    }
-
-    100% {
-        transform: scale(1);
-    }
-}
-
-@-moz-keyframes spin {
-    0% {
-        transform: scale(1);
-    }
-
-    50% {
-        transform: scale(0.5);
-    }
-
-    100% {
-        transform: scale(1);
-    }
-}
-
-@-ms-keyframes spin {
-    0% {
-        transform: scale(1);
-    }
-
-    50% {
-        transform: scale(0.5);
-    }
-
-    100% {
-        transform: scale(1);
-    }
-}
-
-@-o-keyframes spin {
-    0% {
-        transform: scale(1);
-    }
-
-    50% {
-        transform: scale(0.5);
-    }
-
-    100% {
-        transform: scale(1);
-    }
-}
-
-@keyframes spin {
-    0% {
-        transform: scale(1);
-    }
-
-    50% {
-        transform: scale(0.5) rotate(90deg);
-    }
-
-    100% {
-        transform: scale(1);
-    }
+    display: flex;
+    justify-content: center;
+    padding: 20px;
 }
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.ts b/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.ts
index 8419df37a..3d4fc9132 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.ts
@@ -1,12 +1,12 @@
 import { Component, HostBinding, OnInit } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 
 @Component({
     selector: 'es-spinner',
     templateUrl: 'spinner.component.html',
     styleUrls: ['spinner.component.scss'],
     standalone: true,
-    imports: [TranslateModule],
+    imports: [MatProgressSpinnerModule],
 })
 export class SpinnerComponent {
     @HostBinding('attr.data-test') readonly dataTest = 'loading-spinner';

From 5f3d69454ffcf0e3f8b218e5e6e6e7883e34ef79 Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Tue, 19 Nov 2024 14:04:27 +0100
Subject: [PATCH 16/19] feat:prepare license pipe

---
 .../src/lib/common/edu-sharing-ui-common.module.ts              | 2 +-
 .../projects/edu-sharing-ui/src/lib/pipes/node-license.pipe.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Frontend/projects/edu-sharing-ui/src/lib/common/edu-sharing-ui-common.module.ts b/Frontend/projects/edu-sharing-ui/src/lib/common/edu-sharing-ui-common.module.ts
index ab3d00175..e569f5d86 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/common/edu-sharing-ui-common.module.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/common/edu-sharing-ui-common.module.ts
@@ -27,7 +27,7 @@ import { VCardNamePipe } from '../pipes/vcard-name.pipe';
 import { SortDropdownComponent } from '../sort-dropdown/sort-dropdown.component';
 import { SpinnerComponent } from '../spinner/spinner.component';
 import { PropertySlugPipe } from '../pipes/property-slug.pipe';
-import { NodeLicensePipe } from 'ngx-edu-sharing-ui/pipes/node-license.pipe';
+import { NodeLicensePipe } from '../pipes/node-license.pipe';
 
 @NgModule({
     declarations: [
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/pipes/node-license.pipe.ts b/Frontend/projects/edu-sharing-ui/src/lib/pipes/node-license.pipe.ts
index 727e10f86..e226f0c03 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/pipes/node-license.pipe.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/pipes/node-license.pipe.ts
@@ -2,7 +2,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 import { Node, RestConstants } from 'ngx-edu-sharing-api';
 import { TranslateService } from '@ngx-translate/core';
 
-export type LicenseType = 'name' | 'details';
+export type LicenseType = 'name';
 
 @Pipe({ name: 'esNodeLicense' })
 export class NodeLicensePipe implements PipeTransform {

From 59cb8e53693ea338d95c42c089db6e61789b5f8d Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Tue, 19 Nov 2024 14:24:55 +0100
Subject: [PATCH 17/19] feat:license details support display mode

---
 .../license-details.component.html            | 23 +++++++++++++++----
 .../license-details.component.ts              |  9 +++++++-
 Frontend/src/app/features/mds/mds.module.ts   |  1 +
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-license/license-details/license-details.component.html b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-license/license-details/license-details.component.html
index 3dbf37f3e..45c2b19f7 100644
--- a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-license/license-details/license-details.component.html
+++ b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-license/license-details/license-details.component.html
@@ -1,7 +1,16 @@
 <div class="currentLicense">
-  <h4 *ngIf="type !== 'MULTI'">{{ 'WORKSPACE.LICENSE.CURRENT' | translate }}</h4>
-  <img *ngIf="type !== 'MULTI'" class="currentLicenseIcon" src="{{ getLicenseIcon() }}" />
-  <div class="license-additional-data" *ngIf="type === 'CC_BY' || type === 'CC_BY_SA'">
+  <h4 *ngIf="type !== 'MULTI' && displayMode === 'full'">
+    {{ 'WORKSPACE.LICENSE.CURRENT' | translate }}
+  </h4>
+  <img
+    *ngIf="type !== 'MULTI' && displayMode === 'full'"
+    class="currentLicenseIcon"
+    src="{{ getLicenseIcon() }}"
+  />
+  <div
+    class="license-additional-data"
+    *ngIf="(type === 'CC_BY' || type === 'CC_BY_SA') && displayMode === 'full'"
+  >
     <div *ngIf="ccVersion != '4.0'" class="licenseLocale">
       {{ 'COUNTRY_CODE.' + (ccCountry ? ccCountry : 'INTERNATIONAL') | translate }}
     </div>
@@ -39,7 +48,13 @@ <h4>{{ getLicenseName() }}</h4>
         {{ 'COUNTRY_CODE.' + (ccCountry ? ccCountry : 'INTERNATIONAL') | uppercase | translate }}.
       </div>
     </div>
-    <div *ngIf="type === 'CC_BY' || type === 'CC_0'" class="licenseUrl">
+    <div
+      *ngIf="
+        (type === 'CC_BY' || type === 'CC_0') &&
+        (displayMode === 'full' || displayMode === 'minimalUrl')
+      "
+      class="licenseUrl"
+    >
       <a [href]="getLicenseUrl() | async" target="_blank">{{
         'WORKSPACE.LICENSE.MORE' | translate
       }}</a>
diff --git a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-license/license-details/license-details.component.ts b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-license/license-details/license-details.component.ts
index 57c734012..9db094a36 100644
--- a/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-license/license-details/license-details.component.ts
+++ b/Frontend/src/app/features/mds/mds-editor/widgets/mds-editor-widget-license/license-details/license-details.component.ts
@@ -17,6 +17,13 @@ export class LicenseDetailsComponent implements OnChanges {
         [RestConstants.LOM_PROP_RIGHTS_DESCRIPTION]: 'lom.rights.description',
     };
 
+    /**
+     * display mode
+     * full: show all details including icon, link, and so one
+     * minimal: show only name and description
+     * minimalUrl: like minimal but with license url
+     */
+    @Input() displayMode: 'full' | 'minimal' | 'minimalUrl' = 'full';
     @Input() nodes: Node[];
     @Input() properties: Values;
     type: string;
@@ -36,7 +43,7 @@ export class LicenseDetailsComponent implements OnChanges {
     ) {}
     ngOnChanges(changes: SimpleChanges) {
         // Set the `draggable` attribute when this directive is active.
-        if (changes.nodes?.currentValue) {
+        if (changes.nodes?.currentValue || changes.properties?.currentValue) {
             this.readLicense();
         }
     }
diff --git a/Frontend/src/app/features/mds/mds.module.ts b/Frontend/src/app/features/mds/mds.module.ts
index 096ead6b1..3ba5b15fc 100644
--- a/Frontend/src/app/features/mds/mds.module.ts
+++ b/Frontend/src/app/features/mds/mds.module.ts
@@ -93,6 +93,7 @@ import { MdsWidgetComponent } from './mds-viewer/widget/mds-widget.component';
     ],
     imports: [SharedModule, NgxSliderModule, EditorModule, MatFormFieldModule],
     exports: [
+        LicenseDetailsComponent,
         MdsEditorWidgetAuthorComponent,
         MdsEditorWrapperComponent,
         MdsViewerComponent,

From a6455445719f331a7963341557d2a9c933330866 Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Tue, 19 Nov 2024 14:28:46 +0100
Subject: [PATCH 18/19] fix:rollback spinner

---
 .../src/lib/spinner/spinner.component.html    |  13 +-
 .../src/lib/spinner/spinner.component.scss    | 142 +++++++++++++++++-
 .../src/lib/spinner/spinner.component.ts      |   4 +-
 3 files changed, 153 insertions(+), 6 deletions(-)

diff --git a/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.html b/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.html
index 5a639df8e..9536d25f2 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.html
+++ b/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.html
@@ -1,3 +1,14 @@
 <div class="spinner">
-  <mat-progress-spinner color="primary" mode="indeterminate" [diameter]="54"></mat-progress-spinner>
+  <span aria-live="polite" class="cdk-visually-hidden">{{ 'LOADING' | translate }}</span>
+  <div class="spinnercontainer">
+    <div class="inner">
+      <div class="spinner1"></div>
+    </div>
+    <div class="inner">
+      <div class="spinner2"></div>
+    </div>
+    <div class="inner">
+      <div class="spinner3"></div>
+    </div>
+  </div>
 </div>
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.scss b/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.scss
index 3de4d2cb2..03f8e47e9 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.scss
+++ b/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.scss
@@ -1,5 +1,141 @@
+/*SPINNER*/
+$path: '../../../../assets/spinner/';
 .spinner {
-    display: flex;
-    justify-content: center;
-    padding: 20px;
+    margin: 0 auto;
+}
+.spinnercontainer {
+    margin: auto;
+    margin-top: 20px;
+    height: 54px;
+    color: rgba(0, 0, 0, 0); /*do not change*/
+    text-align: center;
+    float: left;
+    width: 100%;
+}
+
+.inner {
+    width: 30px;
+    height: 50px;
+    display: inline-block;
+}
+
+.spinner1 {
+    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDEyLjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgNTE0NDgpICAtLT4KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIiBbCgk8IUVOVElUWSBuc19zdmcgImh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KCTwhRU5USVRZIG5zX3hsaW5rICJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KXT4KPHN2ZyAgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9IiZuc19zdmc7IiB4bWxuczp4bGluaz0iJm5zX3hsaW5rOyIgd2lkdGg9IjE1LjY1NyIgaGVpZ2h0PSIxMy41NTkiCgkgdmlld0JveD0iMCAwIDE1LjY1NyAxMy41NTkiIG92ZXJmbG93PSJ2aXNpYmxlIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxNS42NTcgMTMuNTU5IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPHBvbHlnb24gb3BhY2l0eT0iMC42IiBmaWxsPSIjYzFjNmUzIiBwb2ludHM9IjMuOTE0LDEzLjU1OSAwLDYuNzggMy45MTQsMCAxMS43NDMsMCAxNS42NTcsNi43OCAxMS43NDMsMTMuNTU5ICIvPgo8L3N2Zz4K);
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: 50px;
+    width: 50px;
+    height: 50px;
+    -webkit-animation: spin 2s infinite ease-in;
+    -moz-animation: spin 2s infinite ease-in;
+    -ms-animation: spin 2s infinite ease-in;
+    -o-animation: spin 2s infinite ease-in;
+    animation: spin 2s infinite ease-in;
+    -webkit-animation-delay: 0.1s;
+    -moz-animation-delay: 0.1s;
+    animation-delay: 0.1s;
+}
+
+.spinner2 {
+    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDEyLjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgNTE0NDgpICAtLT4KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIiBbCgk8IUVOVElUWSBuc19zdmcgImh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KCTwhRU5USVRZIG5zX3hsaW5rICJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KXT4KPHN2ZyAgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9IiZuc19zdmc7IiB4bWxuczp4bGluaz0iJm5zX3hsaW5rOyIgd2lkdGg9IjE1LjY1NyIgaGVpZ2h0PSIxMy41NTkiCgkgdmlld0JveD0iMCAwIDE1LjY1NyAxMy41NTkiIG92ZXJmbG93PSJ2aXNpYmxlIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxNS42NTcgMTMuNTU5IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPHBvbHlnb24gb3BhY2l0eT0iMC42IiBmaWxsPSIjN2Y5MWMzIiBwb2ludHM9IjMuOTE0LDEzLjU1OSAwLDYuNzggMy45MTQsMCAxMS43NDMsMCAxNS42NTcsNi43OCAxMS43NDMsMTMuNTU5ICIvPgo8L3N2Zz4K);
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: 50px;
+    width: 50px;
+    height: 50px;
+    -webkit-animation: spin 2s infinite ease-in;
+    -moz-animation: spin 2s infinite ease-in;
+    -ms-animation: spin 2s infinite ease-in;
+    -o-animation: spin 2s infinite ease-in;
+    animation: spin 2s infinite ease-in;
+    -webkit-animation-delay: 0.25s;
+    -moz-animation-delay: 0.25s;
+    animation-delay: 0.25s;
+}
+
+.spinner3 {
+    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDEyLjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgNTE0NDgpICAtLT4KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIiBbCgk8IUVOVElUWSBuc19zdmcgImh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KCTwhRU5USVRZIG5zX3hsaW5rICJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KXT4KPHN2ZyAgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9IiZuc19zdmc7IiB4bWxuczp4bGluaz0iJm5zX3hsaW5rOyIgd2lkdGg9IjE1LjY1NyIgaGVpZ2h0PSIxMy41NTkiCgkgdmlld0JveD0iMCAwIDE1LjY1NyAxMy41NTkiIG92ZXJmbG93PSJ2aXNpYmxlIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxNS42NTcgMTMuNTU5IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPHBvbHlnb24gb3BhY2l0eT0iMC42IiBmaWxsPSIjMzE2MmE3IiBwb2ludHM9IjMuOTE0LDEzLjU1OSAwLDYuNzggMy45MTQsMCAxMS43NDMsMCAxNS42NTcsNi43OCAxMS43NDMsMTMuNTU5ICIvPgo8L3N2Zz4K);
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: 50px;
+    width: 50px;
+    height: 50px;
+    -webkit-animation: spin 2s infinite ease-in;
+    -moz-animation: spin 2s infinite ease-in;
+    -ms-animation: spin 2s infinite ease-in;
+    -o-animation: spin 2s infinite ease-in;
+    animation: spin 2s infinite ease-in;
+    -webkit-animation-delay: 0.5s;
+    -moz-animation-delay: 0.5s;
+    animation-delay: 0.5s;
+}
+
+@-webkit-keyframes spin {
+    0% {
+        transform: scale(1);
+    }
+
+    50% {
+        transform: scale(0.5);
+    }
+
+    100% {
+        transform: scale(1);
+    }
+}
+
+@-moz-keyframes spin {
+    0% {
+        transform: scale(1);
+    }
+
+    50% {
+        transform: scale(0.5);
+    }
+
+    100% {
+        transform: scale(1);
+    }
+}
+
+@-ms-keyframes spin {
+    0% {
+        transform: scale(1);
+    }
+
+    50% {
+        transform: scale(0.5);
+    }
+
+    100% {
+        transform: scale(1);
+    }
+}
+
+@-o-keyframes spin {
+    0% {
+        transform: scale(1);
+    }
+
+    50% {
+        transform: scale(0.5);
+    }
+
+    100% {
+        transform: scale(1);
+    }
+}
+
+@keyframes spin {
+    0% {
+        transform: scale(1);
+    }
+
+    50% {
+        transform: scale(0.5) rotate(90deg);
+    }
+
+    100% {
+        transform: scale(1);
+    }
 }
diff --git a/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.ts b/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.ts
index 3d4fc9132..8419df37a 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/spinner/spinner.component.ts
@@ -1,12 +1,12 @@
 import { Component, HostBinding, OnInit } from '@angular/core';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { TranslateModule } from '@ngx-translate/core';
 
 @Component({
     selector: 'es-spinner',
     templateUrl: 'spinner.component.html',
     styleUrls: ['spinner.component.scss'],
     standalone: true,
-    imports: [MatProgressSpinnerModule],
+    imports: [TranslateModule],
 })
 export class SpinnerComponent {
     @HostBinding('attr.data-test') readonly dataTest = 'loading-spinner';

From 11ed4a7d7f350f5e5998c4d637ff54c5b3bc82d7 Mon Sep 17 00:00:00 2001
From: Torsten Simon <simon@edu-sharing.net>
Date: Tue, 19 Nov 2024 16:34:53 +0100
Subject: [PATCH 19/19] fix:vcard displayName FN fallback

---
 Frontend/projects/edu-sharing-ui/src/lib/util/VCard.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Frontend/projects/edu-sharing-ui/src/lib/util/VCard.ts b/Frontend/projects/edu-sharing-ui/src/lib/util/VCard.ts
index 35ddeda5d..8617fcdc3 100644
--- a/Frontend/projects/edu-sharing-ui/src/lib/util/VCard.ts
+++ b/Frontend/projects/edu-sharing-ui/src/lib/util/VCard.ts
@@ -168,7 +168,7 @@ export class VCard {
         const string =
             (this.title ?? '') + ' ' + (this.givenname ?? '') + ' ' + (this.surname ?? '');
         if (string.trim() === '') {
-            return this.org || '';
+            return this.org || this.get('FN') || '';
         }
         return string;
     }