From 484e1ea8c18a10efdaf4e838e393cf3eeb4e63a9 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Fri, 30 Mar 2018 16:03:14 +0000 Subject: [PATCH] Merged in task/reorg (pull request #35) Reorganized models/entities into domain folder Approved-by: Ryan Mathis --- .../app/dashboard/action/dashboard.action.ts | 2 +- ui/src/app/dashboard/action/search.action.ts | 2 +- .../component/delete-dialog.component.ts | 2 +- .../component/provider-item.component.spec.ts | 2 +- .../component/provider-item.component.ts | 2 +- .../container/dashboard.component.spec.ts | 2 +- .../container/dashboard.component.ts | 2 +- .../app/dashboard/effect/dashboard.effect.ts | 2 +- ui/src/app/dashboard/effect/search.effects.ts | 2 +- .../dashboard/reducer/dashboard.reducer.ts | 2 +- .../app/dashboard/reducer/search.reducer.ts | 2 +- ui/src/app/domain/domain.module.ts | 22 +++++ ui/src/app/domain/entity/filter.ts | 22 +++++ .../entity/provider.spec.ts} | 9 +- .../entity/provider.ts} | 15 ++-- ui/src/app/domain/model/certificate.ts | 5 ++ ui/src/app/domain/model/contact.ts | 5 ++ ui/src/app/domain/model/logout-endpoint.ts | 4 + ui/src/app/domain/model/mdui.ts | 9 ++ ui/src/app/domain/model/metadata-base.ts | 13 +++ ui/src/app/domain/model/metadata-filter.ts | 12 +++ ui/src/app/domain/model/metadata-provider.ts | 36 ++++++++ ui/src/app/domain/model/organization.ts | 5 ++ .../domain/model/relying-party-overrides.ts | 11 +++ ui/src/app/domain/model/security-info.ts | 8 ++ ui/src/app/domain/model/sso-descriptor.ts | 4 + ui/src/app/domain/model/sso-service.ts | 5 ++ .../app/edit-provider/action/editor.action.ts | 2 +- .../component/unsaved-dialog.component.ts | 2 +- .../container/draft.component.ts | 2 +- .../container/editor.component.ts | 2 +- .../container/provider.component.ts | 2 +- .../container/wizard.component.ts | 2 +- .../app/edit-provider/effect/editor.effect.ts | 2 +- .../app/edit-provider/effect/wizard.effect.ts | 2 +- .../reducer/editor.reducer.spec.ts | 3 +- .../edit-provider/reducer/editor.reducer.ts | 2 +- .../metadata-filter/action/filter.action.ts | 2 +- .../component/filter-form.component.ts | 2 +- .../component/preview-filter.component.ts | 2 +- .../container/new-filter.component.ts | 2 +- .../metadata-filter/effect/filter.effect.ts | 2 +- .../reducer/collection.reducer.ts | 2 +- .../metadata-filter/reducer/filter.reducer.ts | 2 +- .../metadata-filter/service/filter.service.ts | 2 +- .../metadata-provider/action/draft.action.ts | 2 +- .../action/provider.action.ts | 2 +- .../forms/advanced-info-form.component.ts | 2 +- .../forms/assertion-form.component.ts | 2 +- .../forms/attribute-release-form.component.ts | 2 +- .../descriptor-info-form.component.spec.ts | 4 +- .../forms/descriptor-info-form.component.ts | 2 +- .../component/forms/finish-form.component.ts | 2 +- .../forms/key-info-form.component.ts | 2 +- .../component/forms/logout-form.component.ts | 2 +- .../forms/metadata-ui-form.component.ts | 2 +- .../forms/organization-info-form.component.ts | 2 +- .../forms/provider-form-fragment.component.ts | 2 +- .../forms/relying-party-form.component.ts | 2 +- .../preview-provider-dialog.component.ts | 2 +- .../container/blank-provider.component.ts | 2 - .../container/new-provider.component.ts | 6 +- .../container/upload-provider.component.ts | 2 - .../metadata-provider/effect/draft.effects.ts | 2 +- .../effect/provider.effects.ts | 2 +- .../model/metadata-provider.ts | 83 ------------------- .../reducer/draft.reducer.spec.ts | 2 +- .../reducer/draft.reducer.ts | 2 +- .../reducer/provider.reducer.spec.ts | 2 +- .../reducer/provider.reducer.ts | 2 +- .../service/entity-descriptor.service.ts | 3 +- .../service/entity-draft.service.ts | 2 +- 72 files changed, 230 insertions(+), 156 deletions(-) create mode 100644 ui/src/app/domain/domain.module.ts create mode 100644 ui/src/app/domain/entity/filter.ts rename ui/src/app/{metadata-provider/model/entity-descriptor.spec.ts => domain/entity/provider.spec.ts} (92%) rename ui/src/app/{metadata-provider/model/entity-descriptor.ts => domain/entity/provider.ts} (86%) create mode 100644 ui/src/app/domain/model/certificate.ts create mode 100644 ui/src/app/domain/model/contact.ts create mode 100644 ui/src/app/domain/model/logout-endpoint.ts create mode 100644 ui/src/app/domain/model/mdui.ts create mode 100644 ui/src/app/domain/model/metadata-base.ts create mode 100644 ui/src/app/domain/model/metadata-filter.ts create mode 100644 ui/src/app/domain/model/metadata-provider.ts create mode 100644 ui/src/app/domain/model/organization.ts create mode 100644 ui/src/app/domain/model/relying-party-overrides.ts create mode 100644 ui/src/app/domain/model/security-info.ts create mode 100644 ui/src/app/domain/model/sso-descriptor.ts create mode 100644 ui/src/app/domain/model/sso-service.ts delete mode 100644 ui/src/app/metadata-provider/model/metadata-provider.ts diff --git a/ui/src/app/dashboard/action/dashboard.action.ts b/ui/src/app/dashboard/action/dashboard.action.ts index d9c3d01f5..addffb8a6 100644 --- a/ui/src/app/dashboard/action/dashboard.action.ts +++ b/ui/src/app/dashboard/action/dashboard.action.ts @@ -1,5 +1,5 @@ import { Action } from '@ngrx/store'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; export const TOGGLE_PROVIDER_DISPLAY = '[Dashboard] Display Provider'; export const PREVIEW_PROVIDER = '[Dashboard] Preview Provider'; diff --git a/ui/src/app/dashboard/action/search.action.ts b/ui/src/app/dashboard/action/search.action.ts index afe1b590f..54dac102b 100644 --- a/ui/src/app/dashboard/action/search.action.ts +++ b/ui/src/app/dashboard/action/search.action.ts @@ -1,5 +1,5 @@ import { Action } from '@ngrx/store'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; export const PROVIDER_SEARCH = '[Metadata Provider Search] Provider Search'; export const PROVIDER_SEARCH_COMPLETE = '[Metadata Provider Search] Provider Search COMPLETE'; diff --git a/ui/src/app/dashboard/component/delete-dialog.component.ts b/ui/src/app/dashboard/component/delete-dialog.component.ts index 6fb44dd28..765b36b7c 100644 --- a/ui/src/app/dashboard/component/delete-dialog.component.ts +++ b/ui/src/app/dashboard/component/delete-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, ChangeDetectionStrategy, Input, Output, EventEmitter } from '@angular/core'; import { Observable } from 'rxjs/Observable'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'; @Component({ diff --git a/ui/src/app/dashboard/component/provider-item.component.spec.ts b/ui/src/app/dashboard/component/provider-item.component.spec.ts index 1fd07a8b6..1761022b7 100644 --- a/ui/src/app/dashboard/component/provider-item.component.spec.ts +++ b/ui/src/app/dashboard/component/provider-item.component.spec.ts @@ -1,7 +1,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ProviderItemComponent } from './provider-item.component'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; describe('Provider List item', () => { let fixture: ComponentFixture; diff --git a/ui/src/app/dashboard/component/provider-item.component.ts b/ui/src/app/dashboard/component/provider-item.component.ts index bcad29156..37ea5a2ae 100644 --- a/ui/src/app/dashboard/component/provider-item.component.ts +++ b/ui/src/app/dashboard/component/provider-item.component.ts @@ -1,7 +1,7 @@ import { Component, ChangeDetectionStrategy, Input, Output, EventEmitter } from '@angular/core'; import { Observable } from 'rxjs/Observable'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; @Component({ selector: 'provider-item', diff --git a/ui/src/app/dashboard/container/dashboard.component.spec.ts b/ui/src/app/dashboard/container/dashboard.component.spec.ts index 3058f6e19..5450e676a 100644 --- a/ui/src/app/dashboard/container/dashboard.component.spec.ts +++ b/ui/src/app/dashboard/container/dashboard.component.spec.ts @@ -12,7 +12,7 @@ import { ProviderItemComponent } from '../component/provider-item.component'; import { DeleteDialogComponent } from '../component/delete-dialog.component'; import { RouterStub } from '../../../testing/router.stub'; import { NgbModalStub } from '../../../testing/modal.stub'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; describe('Dashboard Page', () => { diff --git a/ui/src/app/dashboard/container/dashboard.component.ts b/ui/src/app/dashboard/container/dashboard.component.ts index 4e4331494..50db138f3 100644 --- a/ui/src/app/dashboard/container/dashboard.component.ts +++ b/ui/src/app/dashboard/container/dashboard.component.ts @@ -4,7 +4,7 @@ import { Router } from '@angular/router'; import { Observable } from 'rxjs/Observable'; import { Store } from '@ngrx/store'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import * as searchActions from '../action/search.action'; import * as providerActions from '../../metadata-provider/action/provider.action'; import * as draftActions from '../../metadata-provider/action/draft.action'; diff --git a/ui/src/app/dashboard/effect/dashboard.effect.ts b/ui/src/app/dashboard/effect/dashboard.effect.ts index d201f8e01..57df5d2de 100644 --- a/ui/src/app/dashboard/effect/dashboard.effect.ts +++ b/ui/src/app/dashboard/effect/dashboard.effect.ts @@ -3,7 +3,7 @@ import { Effect, Actions } from '@ngrx/effects'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import * as dashboardActions from '../action/dashboard.action'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import { PreviewProviderDialogComponent } from '../../metadata-provider/component/preview-provider-dialog.component'; @Injectable() diff --git a/ui/src/app/dashboard/effect/search.effects.ts b/ui/src/app/dashboard/effect/search.effects.ts index 8b6770ac5..f4bdf3028 100644 --- a/ui/src/app/dashboard/effect/search.effects.ts +++ b/ui/src/app/dashboard/effect/search.effects.ts @@ -4,7 +4,7 @@ import { Store } from '@ngrx/store'; import * as providerSearch from '../action/search.action'; import * as fromProviders from '../../metadata-provider/reducer'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import { EntityDescriptorService } from '../../metadata-provider/service/entity-descriptor.service'; @Injectable() diff --git a/ui/src/app/dashboard/reducer/dashboard.reducer.ts b/ui/src/app/dashboard/reducer/dashboard.reducer.ts index d77423a50..6eb43b77b 100644 --- a/ui/src/app/dashboard/reducer/dashboard.reducer.ts +++ b/ui/src/app/dashboard/reducer/dashboard.reducer.ts @@ -1,5 +1,5 @@ import { createSelector, createFeatureSelector } from '@ngrx/store'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import * as dashboard from '../action/dashboard.action'; import * as provider from '../../metadata-provider/action/provider.action'; import * as fromRoot from '../../core/reducer'; diff --git a/ui/src/app/dashboard/reducer/search.reducer.ts b/ui/src/app/dashboard/reducer/search.reducer.ts index df10345b3..a2c23ed9b 100644 --- a/ui/src/app/dashboard/reducer/search.reducer.ts +++ b/ui/src/app/dashboard/reducer/search.reducer.ts @@ -1,5 +1,5 @@ import * as searchActions from '../action/search.action'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; export interface SearchState { entities: MetadataProvider[]; diff --git a/ui/src/app/domain/domain.module.ts b/ui/src/app/domain/domain.module.ts new file mode 100644 index 000000000..b082a4295 --- /dev/null +++ b/ui/src/app/domain/domain.module.ts @@ -0,0 +1,22 @@ +import { NgModule, ModuleWithProviders } from '@angular/core'; + +@NgModule({ + declarations: [], + entryComponents: [], + imports: [], + exports: [], + providers: [] +}) +export class DomainModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: RootDomainModule, + providers: [] + }; + } +} + +@NgModule({ + imports: [], +}) +export class RootDomainModule { } diff --git a/ui/src/app/domain/entity/filter.ts b/ui/src/app/domain/entity/filter.ts new file mode 100644 index 000000000..f645bb243 --- /dev/null +++ b/ui/src/app/domain/entity/filter.ts @@ -0,0 +1,22 @@ +import { MetadataFilter, RelyingPartyOverrides } from '../model/metadata-filter'; + +export class Filter implements MetadataFilter { + id = ''; + createdDate?: string; + modifiedDate?: string; + + entityId = ''; + filterName = ''; + filterEnabled = false; + + relyingPartyOverrides = { + nameIdFormats: [] as string[], + authenticationMethods: [] as string[] + } as RelyingPartyOverrides; + + attributeRelease = [] as string[]; + + constructor(obj?: Partial) { + Object.assign(this, obj); + } +} diff --git a/ui/src/app/metadata-provider/model/entity-descriptor.spec.ts b/ui/src/app/domain/entity/provider.spec.ts similarity index 92% rename from ui/src/app/metadata-provider/model/entity-descriptor.spec.ts rename to ui/src/app/domain/entity/provider.spec.ts index 445a72f4a..ac1139014 100644 --- a/ui/src/app/metadata-provider/model/entity-descriptor.spec.ts +++ b/ui/src/app/domain/entity/provider.spec.ts @@ -1,6 +1,7 @@ -import { EntityDescriptor } from './entity-descriptor'; -import { MetadataProvider } from './metadata-provider'; -describe('Entity Desctiptor construct', () => { +import { Provider } from './provider'; +import { MetadataProvider } from '../model/metadata-provider'; + +describe('Provider construct', () => { const config: MetadataProvider = { id: 'foo', @@ -83,7 +84,7 @@ describe('Entity Desctiptor construct', () => { 'mail' ] }; - const entity = new EntityDescriptor(config); + const entity = new Provider(config); it('should populate its own values', () => { Object.keys(config).forEach(key => { diff --git a/ui/src/app/metadata-provider/model/entity-descriptor.ts b/ui/src/app/domain/entity/provider.ts similarity index 86% rename from ui/src/app/metadata-provider/model/entity-descriptor.ts rename to ui/src/app/domain/entity/provider.ts index 74d3193a4..25d0c12fb 100644 --- a/ui/src/app/metadata-provider/model/entity-descriptor.ts +++ b/ui/src/app/domain/entity/provider.ts @@ -7,11 +7,15 @@ import { SecurityInfo, Certificate, SsoService, - IdpSsoDescriptor -} from './metadata-provider'; + IdpSsoDescriptor, + RelyingPartyOverrides +} from '../model/metadata-provider'; -export class EntityDescriptor implements MetadataProvider { +export class Provider implements MetadataProvider { id = ''; + createdDate?: string; + modifiedDate?: string; + entityId = ''; serviceProviderName = ''; organization = {} as Organization; @@ -34,13 +38,10 @@ export class EntityDescriptor implements MetadataProvider { serviceEnabled = false; - createdDate?: string; - modifiedDate?: string; - relyingPartyOverrides = { nameIdFormats: [] as string[], authenticationMethods: [] as string[] - }; + } as RelyingPartyOverrides; attributeRelease = [] as string[]; diff --git a/ui/src/app/domain/model/certificate.ts b/ui/src/app/domain/model/certificate.ts new file mode 100644 index 000000000..e46be4e38 --- /dev/null +++ b/ui/src/app/domain/model/certificate.ts @@ -0,0 +1,5 @@ +export interface Certificate { + name: string; + type: string; + value: string; +} \ No newline at end of file diff --git a/ui/src/app/domain/model/contact.ts b/ui/src/app/domain/model/contact.ts new file mode 100644 index 000000000..1485522d5 --- /dev/null +++ b/ui/src/app/domain/model/contact.ts @@ -0,0 +1,5 @@ +export interface Contact { + type: string; + name: string; + emailAddress: string; +} \ No newline at end of file diff --git a/ui/src/app/domain/model/logout-endpoint.ts b/ui/src/app/domain/model/logout-endpoint.ts new file mode 100644 index 000000000..9f149b4d2 --- /dev/null +++ b/ui/src/app/domain/model/logout-endpoint.ts @@ -0,0 +1,4 @@ +export interface LogoutEndpoint { + url: string; + bindingType: string; +} \ No newline at end of file diff --git a/ui/src/app/domain/model/mdui.ts b/ui/src/app/domain/model/mdui.ts new file mode 100644 index 000000000..d31287b56 --- /dev/null +++ b/ui/src/app/domain/model/mdui.ts @@ -0,0 +1,9 @@ +export interface MDUI { + displayName?: string; + informationUrl?: string; + privacyStatementUrl?: string; + logoUrl?: string; + logoHeight?: number; + logoWidth?: number; + description?: string; +} \ No newline at end of file diff --git a/ui/src/app/domain/model/metadata-base.ts b/ui/src/app/domain/model/metadata-base.ts new file mode 100644 index 000000000..e53669ecc --- /dev/null +++ b/ui/src/app/domain/model/metadata-base.ts @@ -0,0 +1,13 @@ +import { Organization } from './organization'; +import { MDUI } from './mdui'; +import { Contact } from './contact'; +import { SecurityInfo } from './security-info'; +import { SsoService, LogoutEndpoint } from '../../domain/model/metadata-provider'; +import { IdpSsoDescriptor } from './sso-descriptor'; +import { RelyingPartyOverrides } from './relying-party-overrides'; + +export interface MetadataBase { + id?: string; + createdDate?: string; + modifiedDate?: string; +} diff --git a/ui/src/app/domain/model/metadata-filter.ts b/ui/src/app/domain/model/metadata-filter.ts new file mode 100644 index 000000000..82d0310ec --- /dev/null +++ b/ui/src/app/domain/model/metadata-filter.ts @@ -0,0 +1,12 @@ +import { RelyingPartyOverrides } from './relying-party-overrides'; +import { MetadataBase } from './metadata-base'; + +export interface MetadataFilter extends MetadataBase { + entityId: string; + filterName: string; + filterEnabled?: boolean; + relyingPartyOverrides: RelyingPartyOverrides; + attributeRelease: string[]; +} + +export * from './relying-party-overrides'; diff --git a/ui/src/app/domain/model/metadata-provider.ts b/ui/src/app/domain/model/metadata-provider.ts new file mode 100644 index 000000000..c01b9ce3a --- /dev/null +++ b/ui/src/app/domain/model/metadata-provider.ts @@ -0,0 +1,36 @@ +import { Organization } from './organization'; +import { MDUI } from './mdui'; +import { Contact } from './contact'; +import { SecurityInfo } from './security-info'; +import { SsoService } from './sso-service'; +import { LogoutEndpoint } from './logout-endpoint'; +import { IdpSsoDescriptor } from './sso-descriptor'; +import { RelyingPartyOverrides } from './relying-party-overrides'; +import { Certificate } from './certificate'; + +import { MetadataBase } from './metadata-base'; + +export interface MetadataProvider extends MetadataBase { + entityId: string; + serviceProviderName: string; + organization?: Organization; + contacts?: Contact[]; + mdui?: MDUI; + securityInfo?: SecurityInfo; + assertionConsumerServices?: SsoService[]; + serviceProviderSsoDescriptor?: IdpSsoDescriptor; + logoutEndpoints?: LogoutEndpoint[]; + serviceEnabled?: boolean; + relyingPartyOverrides: RelyingPartyOverrides; + attributeRelease: string[]; +} + +export * from './organization'; +export * from './mdui'; +export * from './contact'; +export * from './security-info'; +export * from './sso-service'; +export * from './logout-endpoint'; +export * from './sso-descriptor'; +export * from './relying-party-overrides'; +export * from './certificate'; diff --git a/ui/src/app/domain/model/organization.ts b/ui/src/app/domain/model/organization.ts new file mode 100644 index 000000000..6b5e6f266 --- /dev/null +++ b/ui/src/app/domain/model/organization.ts @@ -0,0 +1,5 @@ +export interface Organization { + name?: string; + displayName?: string; + url?: string; +} \ No newline at end of file diff --git a/ui/src/app/domain/model/relying-party-overrides.ts b/ui/src/app/domain/model/relying-party-overrides.ts new file mode 100644 index 000000000..b720992ab --- /dev/null +++ b/ui/src/app/domain/model/relying-party-overrides.ts @@ -0,0 +1,11 @@ +export interface RelyingPartyOverrides { + signAssertion?: boolean; + dontSignResponse?: boolean; + turnOffEncryption?: boolean; + useSha?: boolean; + ignoreAuthenticationMethod?: boolean; + omitNotBefore?: boolean; + responderId?: string; + nameIdFormats: string[]; + authenticationMethods: string[]; +} diff --git a/ui/src/app/domain/model/security-info.ts b/ui/src/app/domain/model/security-info.ts new file mode 100644 index 000000000..efa79867b --- /dev/null +++ b/ui/src/app/domain/model/security-info.ts @@ -0,0 +1,8 @@ +import { Certificate } from './certificate'; + +export interface SecurityInfo { + x509CertificateAvailable?: boolean; + authenticationRequestsSigned?: boolean; + wantAssertionsSigned?: boolean; + x509Certificates: Certificate[]; +} diff --git a/ui/src/app/domain/model/sso-descriptor.ts b/ui/src/app/domain/model/sso-descriptor.ts new file mode 100644 index 000000000..3b742e946 --- /dev/null +++ b/ui/src/app/domain/model/sso-descriptor.ts @@ -0,0 +1,4 @@ +export interface IdpSsoDescriptor { + protocolSupportEnum: string; + nameIdFormats: string[]; +} diff --git a/ui/src/app/domain/model/sso-service.ts b/ui/src/app/domain/model/sso-service.ts new file mode 100644 index 000000000..67784599d --- /dev/null +++ b/ui/src/app/domain/model/sso-service.ts @@ -0,0 +1,5 @@ +export interface SsoService { + binding: string; + locationUrl: string; + makeDefault: boolean; +} \ No newline at end of file diff --git a/ui/src/app/edit-provider/action/editor.action.ts b/ui/src/app/edit-provider/action/editor.action.ts index 99b641d10..6e8744d61 100644 --- a/ui/src/app/edit-provider/action/editor.action.ts +++ b/ui/src/app/edit-provider/action/editor.action.ts @@ -1,5 +1,5 @@ import { Action } from '@ngrx/store'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; export const UPDATE_STATUS = '[Editor] Update Status'; export const UPDATE_SAVED = '[Editor] Update Saved'; diff --git a/ui/src/app/edit-provider/component/unsaved-dialog.component.ts b/ui/src/app/edit-provider/component/unsaved-dialog.component.ts index 82d87fdc8..684784eee 100644 --- a/ui/src/app/edit-provider/component/unsaved-dialog.component.ts +++ b/ui/src/app/edit-provider/component/unsaved-dialog.component.ts @@ -4,7 +4,7 @@ import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Store, Action } from '@ngrx/store'; import { Subject } from 'rxjs/Subject'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import * as fromEditor from '../reducer'; import { UpdateDraftRequest } from '../../metadata-provider/action/draft.action'; import { EntityDescriptorService } from '../../metadata-provider/service/entity-descriptor.service'; diff --git a/ui/src/app/edit-provider/container/draft.component.ts b/ui/src/app/edit-provider/container/draft.component.ts index 7a0b9e0fe..4b86f2ac2 100644 --- a/ui/src/app/edit-provider/container/draft.component.ts +++ b/ui/src/app/edit-provider/container/draft.component.ts @@ -6,7 +6,7 @@ import { Subscription } from 'rxjs/Subscription'; import { Store } from '@ngrx/store'; import { NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import { SelectDraft } from '../../metadata-provider/action/draft.action'; import * as fromProviders from '../../metadata-provider/reducer'; @Component({ diff --git a/ui/src/app/edit-provider/container/editor.component.ts b/ui/src/app/edit-provider/container/editor.component.ts index 24608b81a..549a90570 100644 --- a/ui/src/app/edit-provider/container/editor.component.ts +++ b/ui/src/app/edit-provider/container/editor.component.ts @@ -24,7 +24,7 @@ import 'rxjs/add/operator/withLatestFrom'; import 'rxjs/add/operator/combineLatest'; import 'rxjs/add/operator/distinctUntilChanged'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import * as fromProviders from '../../metadata-provider/reducer'; import { UpdateProviderRequest } from '../../metadata-provider/action/provider.action'; import * as fromEditor from '../reducer'; diff --git a/ui/src/app/edit-provider/container/provider.component.ts b/ui/src/app/edit-provider/container/provider.component.ts index e2145ed55..030efdc9c 100644 --- a/ui/src/app/edit-provider/container/provider.component.ts +++ b/ui/src/app/edit-provider/container/provider.component.ts @@ -6,7 +6,7 @@ import { Subscription } from 'rxjs/Subscription'; import { Store } from '@ngrx/store'; import { NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import { SelectProvider } from '../../metadata-provider/action/provider.action'; import * as fromProviders from '../../metadata-provider/reducer'; @Component({ diff --git a/ui/src/app/edit-provider/container/wizard.component.ts b/ui/src/app/edit-provider/container/wizard.component.ts index 716b2e848..e47bcd586 100644 --- a/ui/src/app/edit-provider/container/wizard.component.ts +++ b/ui/src/app/edit-provider/container/wizard.component.ts @@ -23,7 +23,7 @@ import 'rxjs/add/operator/withLatestFrom'; import 'rxjs/add/operator/takeLast'; import 'rxjs/add/operator/skipWhile'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import * as fromProviders from '../../metadata-provider/reducer'; import * as draftActions from '../../metadata-provider/action/draft.action'; import { AddProviderRequest, RemoveProviderRequest } from '../../metadata-provider/action/provider.action'; diff --git a/ui/src/app/edit-provider/effect/editor.effect.ts b/ui/src/app/edit-provider/effect/editor.effect.ts index 3d83f31ca..3b1383107 100644 --- a/ui/src/app/edit-provider/effect/editor.effect.ts +++ b/ui/src/app/edit-provider/effect/editor.effect.ts @@ -3,7 +3,7 @@ import { Effect, Actions } from '@ngrx/effects'; import * as editor from '../action/editor.action'; import * as provider from '../../metadata-provider/action/provider.action'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import { EntityDescriptorService } from '../../metadata-provider/service/entity-descriptor.service'; import { Router } from '@angular/router'; diff --git a/ui/src/app/edit-provider/effect/wizard.effect.ts b/ui/src/app/edit-provider/effect/wizard.effect.ts index aacba412c..1a1d0119d 100644 --- a/ui/src/app/edit-provider/effect/wizard.effect.ts +++ b/ui/src/app/edit-provider/effect/wizard.effect.ts @@ -4,7 +4,7 @@ import { Effect, Actions } from '@ngrx/effects'; import * as editorActions from '../action/editor.action'; import * as draft from '../../metadata-provider/action/draft.action'; import * as provider from '../../metadata-provider/action/provider.action'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import { EntityDraftService } from '../../metadata-provider/service/entity-draft.service'; @Injectable() diff --git a/ui/src/app/edit-provider/reducer/editor.reducer.spec.ts b/ui/src/app/edit-provider/reducer/editor.reducer.spec.ts index 673cad397..cd4b72968 100644 --- a/ui/src/app/edit-provider/reducer/editor.reducer.spec.ts +++ b/ui/src/app/edit-provider/reducer/editor.reducer.spec.ts @@ -2,8 +2,7 @@ import { reducer } from './editor.reducer'; import * as fromEditor from './editor.reducer'; import * as actions from '../action/editor.action'; import * as providerActions from '../../metadata-provider/action/provider.action'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; -import { EntityDescriptor } from '../../metadata-provider/model/entity-descriptor'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; describe('Editor Reducer', () => { const initialState: fromEditor.EditorState = { diff --git a/ui/src/app/edit-provider/reducer/editor.reducer.ts b/ui/src/app/edit-provider/reducer/editor.reducer.ts index 7cd83eec8..2da77e0e0 100644 --- a/ui/src/app/edit-provider/reducer/editor.reducer.ts +++ b/ui/src/app/edit-provider/reducer/editor.reducer.ts @@ -1,5 +1,5 @@ import { createSelector, createFeatureSelector } from '@ngrx/store'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import * as editor from '../action/editor.action'; import * as provider from '../../metadata-provider/action/provider.action'; import * as fromRoot from '../../core/reducer'; diff --git a/ui/src/app/metadata-filter/action/filter.action.ts b/ui/src/app/metadata-filter/action/filter.action.ts index f1fa4afde..dd0fc73a1 100644 --- a/ui/src/app/metadata-filter/action/filter.action.ts +++ b/ui/src/app/metadata-filter/action/filter.action.ts @@ -1,7 +1,7 @@ import { Action } from '@ngrx/store'; import { QueryParams } from '../../core/model/query'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; export const QUERY_ENTITY_IDS = '[Filter] Query Entity Ids'; export const VIEW_MORE_IDS = '[Filter] View More Ids Modal'; diff --git a/ui/src/app/metadata-filter/component/filter-form.component.ts b/ui/src/app/metadata-filter/component/filter-form.component.ts index d00213d74..2c776fdf9 100644 --- a/ui/src/app/metadata-filter/component/filter-form.component.ts +++ b/ui/src/app/metadata-filter/component/filter-form.component.ts @@ -12,7 +12,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { SearchDialogComponent } from '../component/search-dialog.component'; import { ViewMoreIds, CancelCreateFilter, QueryEntityIds } from '../action/filter.action'; import { EntityValidators } from '../../metadata-provider/service/entity-validators.service'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; @Component({ selector: 'filter-form', diff --git a/ui/src/app/metadata-filter/component/preview-filter.component.ts b/ui/src/app/metadata-filter/component/preview-filter.component.ts index 560321a9c..480e00fb9 100644 --- a/ui/src/app/metadata-filter/component/preview-filter.component.ts +++ b/ui/src/app/metadata-filter/component/preview-filter.component.ts @@ -6,7 +6,7 @@ import { Store } from '@ngrx/store'; import * as fromFilter from '../reducer'; import { QueryEntityIds } from '../action/filter.action'; import { FormBuilder, FormGroup } from '@angular/forms'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; @Component({ selector: 'preview-filter', diff --git a/ui/src/app/metadata-filter/container/new-filter.component.ts b/ui/src/app/metadata-filter/container/new-filter.component.ts index ad4ec547b..91691b745 100644 --- a/ui/src/app/metadata-filter/container/new-filter.component.ts +++ b/ui/src/app/metadata-filter/container/new-filter.component.ts @@ -13,7 +13,7 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { SearchDialogComponent } from '../component/search-dialog.component'; import { ViewMoreIds, CancelCreateFilter, QueryEntityIds, CreateFilter, UpdateFilter, SaveFilter } from '../action/filter.action'; import { EntityValidators } from '../../metadata-provider/service/entity-validators.service'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import { PreviewFilterComponent } from '../component/preview-filter.component'; diff --git a/ui/src/app/metadata-filter/effect/filter.effect.ts b/ui/src/app/metadata-filter/effect/filter.effect.ts index 8eb70ba88..892f20359 100644 --- a/ui/src/app/metadata-filter/effect/filter.effect.ts +++ b/ui/src/app/metadata-filter/effect/filter.effect.ts @@ -17,7 +17,7 @@ import * as fromFilter from '../reducer'; import { SearchDialogComponent } from '../component/search-dialog.component'; import { EntityIdService } from '../../metadata-provider/service/entity-id.service'; import { MetadataFilterService } from '../service/filter.service'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; @Injectable() export class FilterEffects { diff --git a/ui/src/app/metadata-filter/reducer/collection.reducer.ts b/ui/src/app/metadata-filter/reducer/collection.reducer.ts index b7301da83..c3294d8f0 100644 --- a/ui/src/app/metadata-filter/reducer/collection.reducer.ts +++ b/ui/src/app/metadata-filter/reducer/collection.reducer.ts @@ -1,5 +1,5 @@ import { createSelector, createFeatureSelector } from '@ngrx/store'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import * as filter from '../action/filter.action'; import * as fromRoot from '../../core/reducer'; diff --git a/ui/src/app/metadata-filter/reducer/filter.reducer.ts b/ui/src/app/metadata-filter/reducer/filter.reducer.ts index e21d1a945..87817644a 100644 --- a/ui/src/app/metadata-filter/reducer/filter.reducer.ts +++ b/ui/src/app/metadata-filter/reducer/filter.reducer.ts @@ -1,5 +1,5 @@ import { createSelector, createFeatureSelector } from '@ngrx/store'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import * as filter from '../action/filter.action'; import * as fromRoot from '../../core/reducer'; diff --git a/ui/src/app/metadata-filter/service/filter.service.ts b/ui/src/app/metadata-filter/service/filter.service.ts index 468003ff3..690a127ae 100644 --- a/ui/src/app/metadata-filter/service/filter.service.ts +++ b/ui/src/app/metadata-filter/service/filter.service.ts @@ -3,7 +3,7 @@ import 'rxjs/add/operator/concat'; import { Injectable } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Observable } from 'rxjs/Observable'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; @Injectable() export class MetadataFilterService { diff --git a/ui/src/app/metadata-provider/action/draft.action.ts b/ui/src/app/metadata-provider/action/draft.action.ts index ede97cd2c..41a4d7b7c 100644 --- a/ui/src/app/metadata-provider/action/draft.action.ts +++ b/ui/src/app/metadata-provider/action/draft.action.ts @@ -1,5 +1,5 @@ import { Action } from '@ngrx/store'; -import { MetadataProvider } from '../model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; export const FIND = '[Metadata Draft] Find'; export const SELECT = '[Metadata Draft] Select'; diff --git a/ui/src/app/metadata-provider/action/provider.action.ts b/ui/src/app/metadata-provider/action/provider.action.ts index 5c8720080..969f37b0f 100644 --- a/ui/src/app/metadata-provider/action/provider.action.ts +++ b/ui/src/app/metadata-provider/action/provider.action.ts @@ -1,5 +1,5 @@ import { Action } from '@ngrx/store'; -import { MetadataProvider } from '../model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; export const FIND = '[Metadata Provider] Find'; export const SELECT = '[Metadata Provider] Select'; diff --git a/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.ts b/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.ts index dc6a16a87..655075a3e 100644 --- a/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.ts +++ b/ui/src/app/metadata-provider/component/forms/advanced-info-form.component.ts @@ -10,7 +10,7 @@ import 'rxjs/add/operator/startWith'; import * as fromProviders from '../../reducer'; import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service'; -import { MetadataProvider, Organization, Contact } from '../../model/metadata-provider'; +import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider'; import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; import { EntityValidators } from '../../service/entity-validators.service'; import * as patterns from '../../../shared/regex'; diff --git a/ui/src/app/metadata-provider/component/forms/assertion-form.component.ts b/ui/src/app/metadata-provider/component/forms/assertion-form.component.ts index 32922c084..3d55536ce 100644 --- a/ui/src/app/metadata-provider/component/forms/assertion-form.component.ts +++ b/ui/src/app/metadata-provider/component/forms/assertion-form.component.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs/Observable'; import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service'; -import { MetadataProvider, SsoService } from '../../model/metadata-provider'; +import { MetadataProvider, SsoService } from '../../../domain/model/metadata-provider'; import * as patterns from '../../../shared/regex'; @Component({ diff --git a/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.ts b/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.ts index 0e085941e..a068a963d 100644 --- a/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.ts +++ b/ui/src/app/metadata-provider/component/forms/attribute-release-form.component.ts @@ -5,7 +5,7 @@ import 'rxjs/add/operator/last'; import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service'; -import { MetadataProvider, Organization, Contact } from '../../model/metadata-provider'; +import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider'; import { ListValuesService } from '../../service/list-values.service'; import { FormArray } from '@angular/forms/src/model'; diff --git a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts b/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts index 7edbd112e..fc636ae01 100644 --- a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts +++ b/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.spec.ts @@ -7,7 +7,7 @@ import { ProviderValueEmitter, ProviderStatusEmitter } from '../../service/provi import * as fromProviders from '../../reducer'; import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap/popover/popover.module'; import { ListValuesService } from '../../service/list-values.service'; -import { EntityDescriptor } from '../../model/entity-descriptor'; +import { Provider } from '../../../domain/entity/Provider'; import { DescriptorInfoFormComponent } from './descriptor-info-form.component'; import * as stubs from '../../../../testing/provider.stub'; @@ -17,7 +17,7 @@ import { SharedModule } from '../../../shared/shared.module'; template: `` }) class TestHostComponent { - provider = new EntityDescriptor({ + provider = new Provider({ ...stubs.provider, serviceProviderSsoDescriptor: { protocolSupportEnum: 'foo', diff --git a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.ts b/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.ts index 4eb64ab2a..f1c6b8df6 100644 --- a/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.ts +++ b/ui/src/app/metadata-provider/component/forms/descriptor-info-form.component.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs/Observable'; import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service'; -import { MetadataProvider, Organization, Contact } from '../../model/metadata-provider'; +import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider'; import { ListValuesService } from '../../service/list-values.service'; @Component({ diff --git a/ui/src/app/metadata-provider/component/forms/finish-form.component.ts b/ui/src/app/metadata-provider/component/forms/finish-form.component.ts index 26790b677..42cfbdbd0 100644 --- a/ui/src/app/metadata-provider/component/forms/finish-form.component.ts +++ b/ui/src/app/metadata-provider/component/forms/finish-form.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms' import { Observable } from 'rxjs/Observable'; import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service'; -import { MetadataProvider, Organization, Contact } from '../../model/metadata-provider'; +import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider'; import { ListValuesService } from '../../service/list-values.service'; @Component({ diff --git a/ui/src/app/metadata-provider/component/forms/key-info-form.component.ts b/ui/src/app/metadata-provider/component/forms/key-info-form.component.ts index afcf57868..93988fb3e 100644 --- a/ui/src/app/metadata-provider/component/forms/key-info-form.component.ts +++ b/ui/src/app/metadata-provider/component/forms/key-info-form.component.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs/Observable'; import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service'; -import { MetadataProvider, Certificate } from '../../model/metadata-provider'; +import { MetadataProvider, Certificate } from '../../../domain/model/metadata-provider'; @Component({ selector: 'key-info-form', diff --git a/ui/src/app/metadata-provider/component/forms/logout-form.component.ts b/ui/src/app/metadata-provider/component/forms/logout-form.component.ts index ffcfd760c..4e71c7184 100644 --- a/ui/src/app/metadata-provider/component/forms/logout-form.component.ts +++ b/ui/src/app/metadata-provider/component/forms/logout-form.component.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs/Observable'; import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service'; -import { MetadataProvider, LogoutEndpoint } from '../../model/metadata-provider'; +import { MetadataProvider, LogoutEndpoint } from '../../../domain/model/metadata-provider'; import * as patterns from '../../../shared/regex'; @Component({ diff --git a/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.ts b/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.ts index 582085b3e..16e53d315 100644 --- a/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.ts +++ b/ui/src/app/metadata-provider/component/forms/metadata-ui-form.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms' import { Observable } from 'rxjs/Observable'; import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service'; -import { MetadataProvider, Organization, Contact } from '../../model/metadata-provider'; +import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider'; import * as patterns from '../../../shared/regex'; @Component({ diff --git a/ui/src/app/metadata-provider/component/forms/organization-info-form.component.ts b/ui/src/app/metadata-provider/component/forms/organization-info-form.component.ts index 956bd81c1..94f3e04ab 100644 --- a/ui/src/app/metadata-provider/component/forms/organization-info-form.component.ts +++ b/ui/src/app/metadata-provider/component/forms/organization-info-form.component.ts @@ -5,7 +5,7 @@ import { Subscription } from 'rxjs/Subscription'; import 'rxjs/add/operator/startWith'; import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service'; -import { MetadataProvider, Organization, Contact } from '../../model/metadata-provider'; +import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider'; import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; import { EntityValidators } from '../../service/entity-validators.service'; import * as patterns from '../../../shared/regex'; diff --git a/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.ts b/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.ts index 97f335770..f89325345 100644 --- a/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.ts +++ b/ui/src/app/metadata-provider/component/forms/provider-form-fragment.component.ts @@ -9,7 +9,7 @@ import 'rxjs/add/operator/takeUntil'; import 'rxjs/add/operator/startWith'; import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service'; -import { MetadataProvider, Organization, Contact } from '../../model/metadata-provider'; +import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider'; import * as fromProviders from '../../reducer'; import * as constants from '../../../shared/constant'; diff --git a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.ts b/ui/src/app/metadata-provider/component/forms/relying-party-form.component.ts index a03f89cc8..af7536c64 100644 --- a/ui/src/app/metadata-provider/component/forms/relying-party-form.component.ts +++ b/ui/src/app/metadata-provider/component/forms/relying-party-form.component.ts @@ -6,7 +6,7 @@ import { ProviderFormFragmentComponent } from './provider-form-fragment.componen import { ProviderStatusEmitter, ProviderValueEmitter } from '../../service/provider-change-emitter.service'; import { ListValuesService } from '../../service/list-values.service'; -import { MetadataProvider, Organization, Contact } from '../../model/metadata-provider'; +import { MetadataProvider, Organization, Contact } from '../../../domain/model/metadata-provider'; import { URL_REGEX } from '../../../shared/regex'; diff --git a/ui/src/app/metadata-provider/component/preview-provider-dialog.component.ts b/ui/src/app/metadata-provider/component/preview-provider-dialog.component.ts index 5614f1a03..e736b767c 100644 --- a/ui/src/app/metadata-provider/component/preview-provider-dialog.component.ts +++ b/ui/src/app/metadata-provider/component/preview-provider-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit, OnDestroy } from '@angular/core'; import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Observable } from 'rxjs/Observable'; -import { MetadataProvider } from '../../metadata-provider/model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import { EntityDescriptorService } from '../service/entity-descriptor.service'; import * as FileSaver from 'file-saver'; import { Subscription } from 'rxjs/Subscription'; diff --git a/ui/src/app/metadata-provider/container/blank-provider.component.ts b/ui/src/app/metadata-provider/container/blank-provider.component.ts index 95871aafd..b4def73c0 100644 --- a/ui/src/app/metadata-provider/container/blank-provider.component.ts +++ b/ui/src/app/metadata-provider/container/blank-provider.component.ts @@ -14,8 +14,6 @@ import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; import { Store } from '@ngrx/store'; -import { MetadataProvider } from '../model/metadata-provider'; -import { EntityDescriptor } from '../model/entity-descriptor'; import { AddDraftRequest } from '../action/draft.action'; import { AddProviderRequest, UploadProviderRequest } from '../action/provider.action'; import * as fromProviders from '../reducer'; diff --git a/ui/src/app/metadata-provider/container/new-provider.component.ts b/ui/src/app/metadata-provider/container/new-provider.component.ts index c29d98d12..1e2e9f5dd 100644 --- a/ui/src/app/metadata-provider/container/new-provider.component.ts +++ b/ui/src/app/metadata-provider/container/new-provider.component.ts @@ -16,8 +16,8 @@ import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; import { Store } from '@ngrx/store'; -import { MetadataProvider } from '../model/metadata-provider'; -import { EntityDescriptor } from '../model/entity-descriptor'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; +import { Provider } from '../../domain/entity/provider'; import { AddDraftRequest } from '../action/draft.action'; import { AddProviderRequest, UploadProviderRequest, CreateProviderFromUrlRequest } from '../action/provider.action'; import * as fromProviders from '../reducer'; @@ -56,7 +56,7 @@ export class NewProviderComponent implements OnInit { } next(provider: { entityId: string, serviceProviderName: string }): void { - const val: MetadataProvider = new EntityDescriptor(provider); + const val: MetadataProvider = new Provider(provider); this.store.dispatch(new AddDraftRequest(val)); } } /* istanbul ignore next */ diff --git a/ui/src/app/metadata-provider/container/upload-provider.component.ts b/ui/src/app/metadata-provider/container/upload-provider.component.ts index d3d6ce7d0..e22bde17a 100644 --- a/ui/src/app/metadata-provider/container/upload-provider.component.ts +++ b/ui/src/app/metadata-provider/container/upload-provider.component.ts @@ -7,8 +7,6 @@ import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/operator/take'; import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; -import { MetadataProvider } from '../model/metadata-provider'; -import { EntityDescriptor } from '../model/entity-descriptor'; import { EntityValidators } from '../service/entity-validators.service'; import { FileService } from '../../core/service/file.service'; diff --git a/ui/src/app/metadata-provider/effect/draft.effects.ts b/ui/src/app/metadata-provider/effect/draft.effects.ts index 993e35ad0..9895c12f1 100644 --- a/ui/src/app/metadata-provider/effect/draft.effects.ts +++ b/ui/src/app/metadata-provider/effect/draft.effects.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs/Observable'; import { Router } from '@angular/router'; import * as draftActions from '../action/draft.action'; -import { MetadataProvider } from '../model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import { EntityDraftService } from '../service/entity-draft.service'; @Injectable() diff --git a/ui/src/app/metadata-provider/effect/provider.effects.ts b/ui/src/app/metadata-provider/effect/provider.effects.ts index e559e7517..0f1d6f781 100644 --- a/ui/src/app/metadata-provider/effect/provider.effects.ts +++ b/ui/src/app/metadata-provider/effect/provider.effects.ts @@ -6,7 +6,7 @@ import { Router } from '@angular/router'; import * as providerActions from '../action/provider.action'; import * as draftActions from '../action/draft.action'; -import { MetadataProvider } from '../model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import { EntityDescriptorService } from '../service/entity-descriptor.service'; @Injectable() diff --git a/ui/src/app/metadata-provider/model/metadata-provider.ts b/ui/src/app/metadata-provider/model/metadata-provider.ts deleted file mode 100644 index 5ebe2b56e..000000000 --- a/ui/src/app/metadata-provider/model/metadata-provider.ts +++ /dev/null @@ -1,83 +0,0 @@ -export interface MetadataProvider { - id?: string; - entityId: string; - serviceProviderName: string; - organization?: Organization; - contacts?: Contact[]; - mdui?: MDUI; - securityInfo?: SecurityInfo; - assertionConsumerServices?: SsoService[]; - serviceProviderSsoDescriptor?: IdpSsoDescriptor; - - logoutEndpoints?: LogoutEndpoint[]; - - serviceEnabled?: boolean; - - createdDate?: string; - modifiedDate?: string; - - relyingPartyOverrides: { - signAssertion?: boolean; - dontSignResponse?: boolean; - turnOffEncryption?: boolean; - useSha?: boolean; - ignoreAuthenticationMethod?: boolean; - omitNotBefore?: boolean; - responderId?: string; - nameIdFormats: string[]; - authenticationMethods: string[]; - }; - - attributeRelease: string[]; -} - -export interface Organization { - name?: string; - displayName?: string; - url?: string; -} - -export interface Contact { - type: string; - name: string; - emailAddress: string; -} - -export interface MDUI { - displayName?: string; - informationUrl?: string; - privacyStatementUrl?: string; - logoUrl?: string; - logoHeight?: number; - logoWidth?: number; - description?: string; -} - -export interface LogoutEndpoint { - url: string; - bindingType: string; -} - -export interface SecurityInfo { - x509CertificateAvailable?: boolean; - authenticationRequestsSigned?: boolean; - wantAssertionsSigned?: boolean; - x509Certificates: Certificate[]; -} - -export interface Certificate { - name: string; - type: string; - value: string; -} - -export interface SsoService { - binding: string; - locationUrl: string; - makeDefault: boolean; -} - -export interface IdpSsoDescriptor { - protocolSupportEnum: string; - nameIdFormats: string[]; -} diff --git a/ui/src/app/metadata-provider/reducer/draft.reducer.spec.ts b/ui/src/app/metadata-provider/reducer/draft.reducer.spec.ts index 6cd8f807a..21ec93b86 100644 --- a/ui/src/app/metadata-provider/reducer/draft.reducer.spec.ts +++ b/ui/src/app/metadata-provider/reducer/draft.reducer.spec.ts @@ -1,7 +1,7 @@ import { reducer } from './draft.reducer'; import * as fromDrafts from './draft.reducer'; import * as draftActions from '../action/draft.action'; -import { MetadataProvider } from '../model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; let drafts: MetadataProvider[] = [ { entityId: 'foo', serviceProviderName: 'bar' } as MetadataProvider, diff --git a/ui/src/app/metadata-provider/reducer/draft.reducer.ts b/ui/src/app/metadata-provider/reducer/draft.reducer.ts index 9dc61835a..5db09e04a 100644 --- a/ui/src/app/metadata-provider/reducer/draft.reducer.ts +++ b/ui/src/app/metadata-provider/reducer/draft.reducer.ts @@ -1,5 +1,5 @@ import { createSelector } from '@ngrx/store'; -import { MetadataProvider } from '../model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import * as providerAction from '../action/provider.action'; import * as draftAction from '../action/draft.action'; diff --git a/ui/src/app/metadata-provider/reducer/provider.reducer.spec.ts b/ui/src/app/metadata-provider/reducer/provider.reducer.spec.ts index c0330582a..71239137a 100644 --- a/ui/src/app/metadata-provider/reducer/provider.reducer.spec.ts +++ b/ui/src/app/metadata-provider/reducer/provider.reducer.spec.ts @@ -1,7 +1,7 @@ import { reducer } from './provider.reducer'; import * as fromProvider from './provider.reducer'; import * as providerActions from '../action/provider.action'; -import { MetadataProvider } from '../model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; let providers: MetadataProvider[] = [ { id: '1', entityId: 'foo', serviceProviderName: 'bar' } as MetadataProvider, diff --git a/ui/src/app/metadata-provider/reducer/provider.reducer.ts b/ui/src/app/metadata-provider/reducer/provider.reducer.ts index b99e22967..0dd8f10f6 100644 --- a/ui/src/app/metadata-provider/reducer/provider.reducer.ts +++ b/ui/src/app/metadata-provider/reducer/provider.reducer.ts @@ -1,5 +1,5 @@ import { createSelector } from '@ngrx/store'; -import { MetadataProvider } from '../model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import * as provider from '../action/provider.action'; export interface ProviderState { diff --git a/ui/src/app/metadata-provider/service/entity-descriptor.service.ts b/ui/src/app/metadata-provider/service/entity-descriptor.service.ts index 68e6336e6..f01128df9 100644 --- a/ui/src/app/metadata-provider/service/entity-descriptor.service.ts +++ b/ui/src/app/metadata-provider/service/entity-descriptor.service.ts @@ -3,8 +3,7 @@ import 'rxjs/add/operator/concat'; import { Injectable } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Observable } from 'rxjs/Observable'; -import { MetadataProvider } from '../model/metadata-provider'; -import { EntityDescriptor } from '../model/entity-descriptor'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import { MOCK_DESCRIPTORS } from '../../../data/descriptors.mock'; import { Storage } from '../../shared/storage'; import { environment } from '../../../environments/environment'; diff --git a/ui/src/app/metadata-provider/service/entity-draft.service.ts b/ui/src/app/metadata-provider/service/entity-draft.service.ts index 3c38f96e6..86f5227fa 100644 --- a/ui/src/app/metadata-provider/service/entity-draft.service.ts +++ b/ui/src/app/metadata-provider/service/entity-draft.service.ts @@ -4,7 +4,7 @@ import 'rxjs/add/operator/switchMap'; import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs/Observable'; -import { MetadataProvider } from '../model/metadata-provider'; +import { MetadataProvider } from '../../domain/model/metadata-provider'; import { MOCK_DESCRIPTORS } from '../../../data/descriptors.mock'; import { Storage } from '../../shared/storage';