Merged dspace-cris-2023_02_x into task/dspace-cris-2023_02_x/DSC-2599

Author: atarix83

config/config.example.yml

@@ -133,7 +133,7 @@ auth:
     # This is independent from the idle warning.
     timeLeftBeforeTokenRefresh: 120000 # 2 minutes
   # Standard login enabled
-  disableStandardLogin: false
+  isPasswordLoginEnabledForAdminsOnly: false
 
 # Form settings
 form:

package.json

@@ -133,6 +133,7 @@
     "markdown-it-mathjax3": "^4.3.2",
     "mirador": "^3.4.3",
     "mirador-dl-plugin": "^0.13.0",
+    "mirador-imagecropper": "^0.1.9",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
     "ng2-file-upload": "1.4.0",
@@ -205,8 +206,8 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
-    "ngx-export-as": "~1.15.1",
     "ng-mocks": "^14.13.2",
+    "ngx-export-as": "~1.15.1",
     "ngx-mask": "13.1.7",
     "nodemon": "^2.0.22",
     "postcss": "^8.5",

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts

@@ -252,7 +252,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       name: 'email',
       validators: {
         required: null,
-        pattern: '^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$',
+        pattern: '^\\s*[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}\\s*$',
       },
       required: true,
       errorMessages: {
@@ -367,7 +367,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
               },
             ],
           },
-          email: this.email.value,
+          email: (this.email.value as string)?.trim(),
           canLogIn: this.canLogIn.value,
           requireCertificate: this.requireCertificate.value,
         };

src/app/app-routing.module.ts

@@ -179,12 +179,12 @@ import {
             canActivate: [GenericAdministratorGuard, EndUserAgreementCurrentUserGuard]
           },
           {
-            path: 'standard-login',
+            path: 'admin-only-login',
             loadChildren: () => import('./login-page/login-page.module').then((m) => m.LoginPageModule),
             data: {
               isBackDoor: true,
             },
-            canMatch: [() => !environment.auth.disableStandardLogin],
+            canMatch: [() => environment.auth.isPasswordLoginEnabledForAdminsOnly],
           },
           {
             path: 'login',

src/app/core/metadata/schema-json-ld/schema-json-ld.service.ts

@@ -1,17 +1,21 @@
 import { Inject, Injectable } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
+import { DomSanitizer } from '@angular/platform-browser';
 
 import { Item } from '../../shared/item.model';
 import { getSchemaJsonLDProviderByEntity, getSchemaJsonLDProviderByType } from './schema-types/schema-type-decorator';
 import { GenericConstructor } from '../../shared/generic-constructor';
 import { SchemaType } from './schema-types/schema-type';
 import { isEmpty, isNotEmpty } from '../../../shared/empty.util';
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class SchemaJsonLDService {
   static scriptType = 'application/ld+json';
 
-  constructor(@Inject(DOCUMENT) private _document: Document) {}
+  constructor(
+    @Inject(DOCUMENT) private _document: Document,
+    protected sanitizer: DomSanitizer,
+  ) {}
 
   removeStructuredData(): void {
     const els = [];
@@ -57,7 +61,7 @@ export class SchemaJsonLDService {
     }
 
     if (isNotEmpty(constructor)) {
-      const provider: SchemaType = new constructor();
+      const provider: SchemaType = new constructor(this.sanitizer);
       return provider.getSchema(item);
     } else {
       return null;

src/app/core/metadata/schema-json-ld/schema-types/schema-type.ts

@@ -1,9 +1,13 @@
+import { SecurityContext } from '@angular/core';
+import { DomSanitizer } from '@angular/platform-browser';
 import isObject from 'lodash/isObject';
 
 import { Item } from '../../../shared/item.model';
 import { isNotEmpty } from '../../../../shared/empty.util';
 
 export abstract class SchemaType {
+  constructor(protected sanitizer: DomSanitizer) {}
+
   protected abstract createSchema(item: Item): Record<string, any>;
   protected abstract createSchema(item: Item): Record<string, any>;
 
@@ -31,7 +35,36 @@ export abstract class SchemaType {
     }
   }
 
+  protected sanitizeSchema(obj: any):  Record<string, any> {
+    if (Array.isArray(obj)) {
+      return obj.map(v =>
+        typeof v === 'string'
+          ? this.sanitizer.sanitize(SecurityContext.HTML, v)
+          : this.sanitizeSchema(v),
+      );
+    }
+
+    if (typeof obj === 'object' && obj !== null) {
+      const sanitized: Record<string, any> = {};
+      for (const key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          const value = obj[key];
+          sanitized[key] =
+            typeof value === 'string'
+              ? this.sanitizer.sanitize(SecurityContext.HTML, value)
+              : this.sanitizeSchema(value);
+        }
+      }
+      return sanitized;
+    }
+
+    return obj;
+  }
+
+
   getSchema(item: Item): Record<string, any> {
     return SchemaType.removeEmpty(this.createSchema(item));
+    const sanitizedRaw = this.sanitizeSchema(this.createSchema(item));
+    return SchemaType.removeEmpty(sanitizedRaw);
   }
 }

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.html

@@ -0,0 +1,8 @@
+<ds-item-page-cc-license-field
+  [item]="item"
+  [variant]="'full'"
+  [ccLicenseUriField]="dcRightsUri"
+  [ccLicenseNameField]="dcRights"
+  [showLabel]="false"
+  [showUrl]="true">
+</ds-item-page-cc-license-field>

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.scss

@@ -0,0 +1,47 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { CcLicenseLargeComponent } from './cc-license-large.component';
+
+describe('CcLicenseLargeComponent', () => {
+  let component: CcLicenseLargeComponent;
+  let fixture: ComponentFixture<CcLicenseLargeComponent>;
+
+  const mockItem = {
+    firstMetadataValue: jasmine.createSpy('firstMetadataValue').and.returnValue(''),
+    metadata: {},
+    findMetadataSortedByPlace: jasmine.createSpy('findMetadataSortedByPlace').and.returnValue([]),
+  };
+
+  const mockField = {
+    metadataGroup: { elements: [] },
+    styleValue: '',
+  };
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [CcLicenseLargeComponent],
+      providers: [
+        { provide: 'fieldProvider', useValue: mockField },
+        { provide: 'itemProvider', useValue: mockItem },
+        { provide: 'metadataValueProvider', useValue: {} },
+        { provide: 'renderingSubTypeProvider', useValue: '' },
+        { provide: 'tabNameProvider', useValue: '' },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(CcLicenseLargeComponent);
+    component = fixture.componentInstance;
+
+    component.componentsToBeRenderedMap.set(0, [
+      { field: { metadata: 'dc.rights' } as any, value: {} as any },
+      { field: { metadata: 'dc.rights.uri' } as any, value: {} as any },
+    ] as any);
+
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.spec.ts

@@ -0,0 +1,34 @@
+import {Component, Inject, OnInit} from '@angular/core';
+import {FieldRenderingType, MetadataBoxFieldRendering} from '../metadata-box.decorator';
+import {MetadataGroupComponent} from '../metadataGroup/metadata-group.component';
+import {LayoutField} from '../../../../../../../core/layout/models/box.model';
+import {Item} from '../../../../../../../core/shared/item.model';
+import {TranslateService} from '@ngx-translate/core';
+
+@Component({
+  selector: 'ds-cc-license-large',
+  templateUrl: './cc-license-large.component.html',
+  styleUrls: ['./cc-license-large.component.scss']
+})
+@MetadataBoxFieldRendering(FieldRenderingType.CCLICENSEFULL)
+export class CcLicenseLargeComponent extends MetadataGroupComponent implements OnInit {
+
+  dcRights: any;
+  dcRightsUri: any;
+
+  constructor(
+    @Inject('fieldProvider') public fieldProvider: LayoutField,
+    @Inject('itemProvider') public itemProvider: Item,
+    @Inject('renderingSubTypeProvider') public renderingSubTypeProvider: string,
+    @Inject('tabNameProvider') public tabNameProvider: string,
+    protected translateService: TranslateService,
+  ) {
+    super(fieldProvider, itemProvider, renderingSubTypeProvider, tabNameProvider, translateService);
+  }
+  ngOnInit(): void {
+    super.ngOnInit();
+    const ccLicenseEntryMetadata = this.componentsToBeRenderedMap.get(0);
+    [this.dcRights, this.dcRightsUri] = ccLicenseEntryMetadata.map((entryMeta) => entryMeta.field.metadata);
+
+  }
+}