Refactoring

ui/src/app/metadata-provider/component/forms/advanced-info-form.component.ts → ui/src/app/metadata/domain/component/forms/advanced-info-form.component.ts

@@ -7,18 +7,18 @@ import { Store } from '@ngrx/store';
 
 import * as fromCollection from '../../../domain/reducer';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
+import { MetadataResolver, Contact } from '../../../domain/model';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 import { EntityValidators } from '../../../domain/service/entity-validators.service';
-import * as patterns from '../../../shared/regex';
+import * as fromMetadata from '../../../metadata.reducer';
 
 @Component({
     selector: 'adv-info-form',
     changeDetection: ChangeDetectionStrategy.OnPush,
     templateUrl: './advanced-info-form.component.html'
 })
 export class AdvancedInfoFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     contactTypes: string[] = [
         'support',
@@ -39,15 +39,15 @@ export class AdvancedInfoFormComponent extends ProviderFormFragmentComponent imp
         protected fb: FormBuilder,
         protected statusEmitter: ProviderStatusEmitter,
         protected valueEmitter: ProviderValueEmitter,
-        protected store: Store<fromCollection.CollectionState>
+        protected store: Store<fromMetadata.MetadataState>
     ) {
         super(fb, statusEmitter, valueEmitter);
 
         this.ids$ = this.store
             .select(fromCollection.getAllEntityIds)
             .pipe(
                 takeUntil(this.ngUnsubscribe),
-                combineLatest(this.store.select(fromCollection.getSelectedProvider), (ids: string[], provider: MetadataProvider) => {
+                combineLatest(this.store.select(fromCollection.getSelectedProvider), (ids: string[], provider: MetadataResolver) => {
                     return ids.filter(id => provider.entityId !== id);
                 })
             );
@@ -90,15 +90,15 @@ export class AdvancedInfoFormComponent extends ProviderFormFragmentComponent imp
     }
 
     ngOnChanges(): void {
-        this.provider.organization = this.provider.organization || {};
-        this.provider.contacts = this.provider.contacts || [];
+        this.resolver.organization = this.resolver.organization || {};
+        this.resolver.contacts = this.resolver.contacts || [];
         this.form.reset({
-            serviceProviderName: this.provider.serviceProviderName,
-            serviceEnabled: this.provider.serviceEnabled,
-            entityId: this.provider.entityId,
-            organization: this.provider.organization
+            serviceProviderName: this.resolver.serviceProviderName,
+            serviceEnabled: this.resolver.serviceEnabled,
+            entityId: this.resolver.entityId,
+            organization: this.resolver.organization
         });
-        this.setContacts(this.provider.contacts);
+        this.setContacts(this.resolver.contacts);
     }
 
     get contacts(): FormArray {

ui/src/app/metadata-provider/component/forms/assertion-form.component.ts → ui/src/app/metadata/domain/component/forms/assertion-form.component.ts

@@ -4,16 +4,15 @@ import { FormBuilder, FormGroup, FormControl, FormArray, AbstractControl, Valida
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, SsoService } from '../../../domain/model/metadata-provider';
-import * as patterns from '../../../shared/regex';
+import { SsoService, MetadataResolver } from '../../../domain/model/';
 
 @Component({
     selector: 'assertion-form',
     changeDetection: ChangeDetectionStrategy.OnPush,
     templateUrl: './assertion-form.component.html'
 })
 export class AssertionFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     form: FormGroup;
 
@@ -68,7 +67,7 @@ export class AssertionFormComponent extends ProviderFormFragmentComponent implem
     }
 
     ngOnChanges(): void {
-        this.provider.assertionConsumerServices = this.provider.assertionConsumerServices || [];
-        this.setEndpoints(this.provider.assertionConsumerServices);
+        this.resolver.assertionConsumerServices = this.resolver.assertionConsumerServices || [];
+        this.setEndpoints(this.resolver.assertionConsumerServices);
     }
 } /* istanbul ignore next */

ui/src/app/metadata-provider/component/forms/attribute-release-form.component.ts → ui/src/app/metadata/domain/component/forms/attribute-release-form.component.ts

@@ -1,11 +1,11 @@
 import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { last } from 'rxjs/operators';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
+import { MetadataResolver } from '../../../domain/model';
 import { ListValuesService } from '../../../domain/service/list-values.service';
 import { FormArray } from '@angular/forms/src/model';
 
@@ -16,7 +16,7 @@ import { FormArray } from '@angular/forms/src/model';
     templateUrl: './attribute-release-form.component.html'
 })
 export class AttributeReleaseFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     form: FormGroup;
     attributesToRelease: any[];
@@ -43,8 +43,8 @@ export class AttributeReleaseFormComponent extends ProviderFormFragmentComponent
     }
 
     ngOnChanges(): void {
-        this.provider.attributeRelease = this.provider.attributeRelease || [];
-        this.setAttributes(this.provider.attributeRelease);
+        this.resolver.attributeRelease = this.resolver.attributeRelease || [];
+        this.setAttributes(this.resolver.attributeRelease);
     }
 
     get attributeRelease(): FormArray {

ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.ts → ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.ts

@@ -1,11 +1,11 @@
-import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
+import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
 import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@angular/forms';
 import { Observable, of } from 'rxjs';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
+import { MetadataResolver } from '../../../domain/model';
 import { ListValuesService } from '../../../domain/service/list-values.service';
 
 @Component({
@@ -14,7 +14,7 @@ import { ListValuesService } from '../../../domain/service/list-values.service';
     templateUrl: './descriptor-info-form.component.html'
 })
 export class DescriptorInfoFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     form: FormGroup;
 
@@ -46,7 +46,7 @@ export class DescriptorInfoFormComponent extends ProviderFormFragmentComponent i
     }
 
     ngOnChanges(): void {
-        let descriptor = this.provider.serviceProviderSsoDescriptor;
+        let descriptor = this.resolver.serviceProviderSsoDescriptor;
         this.form.reset({
             serviceProviderSsoDescriptor: descriptor || {}
         });

ui/src/app/metadata-provider/component/forms/finish-form.component.ts → ui/src/app/metadata/domain/component/forms/finish-form.component.ts

@@ -1,9 +1,9 @@
-import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms';
+import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider';
+import { MetadataResolver } from '../../../domain/model';
 import { ListValuesService } from '../../../domain/service/list-values.service';
 
 @Component({
@@ -13,7 +13,7 @@ import { ListValuesService } from '../../../domain/service/list-values.service';
     styleUrls: ['./finish-form.component.scss']
 })
 export class FinishFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     form: FormGroup;
     attributesToRelease$: Observable<any[]>;
@@ -25,7 +25,7 @@ export class FinishFormComponent extends ProviderFormFragmentComponent implement
         private listValues: ListValuesService
     ) {
         super(fb, statusEmitter, valueEmitter);
-        this.attributesToRelease$ = listValues.attributesToRelease;
+        this.attributesToRelease$ = this.listValues.attributesToRelease;
     }
 
     createForm(): void {
@@ -36,7 +36,7 @@ export class FinishFormComponent extends ProviderFormFragmentComponent implement
 
     ngOnChanges(): void {
         this.form.reset({
-            serviceEnabled: !this.provider ? false : this.provider.serviceEnabled !== false ? true : false
+            serviceEnabled: !this.resolver ? false : this.resolver.serviceEnabled !== false ? true : false
         });
     }
 } /* istanbul ignore next */

ui/src/app/metadata-provider/component/forms/key-info-form.component.ts → ui/src/app/metadata/domain/component/forms/key-info-form.component.ts

@@ -1,19 +1,19 @@
-import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@angular/forms';
+import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
+import { FormBuilder, FormGroup, FormArray, Validators } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { distinctUntilChanged, map, takeUntil } from 'rxjs/operators';
 
 import { ProviderFormFragmentComponent } from './provider-form-fragment.component';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service';
-import { MetadataProvider, Certificate } from '../../../domain/model/metadata-provider';
+import { MetadataResolver, Certificate } from '../../../domain/model';
 
 @Component({
     selector: 'key-info-form',
     changeDetection: ChangeDetectionStrategy.OnPush,
     templateUrl: './key-info-form.component.html'
 })
 export class KeyInfoFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() provider: MetadataProvider;
+    @Input() resolver: MetadataResolver;
 
     hasCert$: Observable<boolean>;
 
@@ -97,14 +97,14 @@ export class KeyInfoFormComponent extends ProviderFormFragmentComponent implemen
 
     ngOnChanges(): void {
         this.form.reset({
-            securityInfo: this.provider.securityInfo || {
+            securityInfo: this.resolver.securityInfo || {
                 x509CertificateAvailable: false,
                 authenticationRequestsSigned: false,
                 wantAssertionsSigned: false
             }
         });
-        if (this.provider.securityInfo && this.provider.securityInfo.x509CertificateAvailable) {
-            this.setCertificates(this.provider.securityInfo.x509Certificates);
+        if (this.resolver.securityInfo && this.resolver.securityInfo.x509CertificateAvailable) {
+            this.setCertificates(this.resolver.securityInfo.x509Certificates);
         }
     }
 } /* istanbul ignore next */