Merged in task/reorg (pull request #35)

Reorganized models/entities into domain folder

Approved-by: Ryan Mathis <rmathis@unicon.net>

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';

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';

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({

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<ProviderItemComponent>;

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',

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', () => {

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';

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()

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()

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';

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[];

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 { }

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<MetadataFilter>) {
+        Object.assign(this, obj);
+    }
+}

ui/src/app/metadata-provider/model/entity-descriptor.spec.ts → 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 => {

ui/src/app/metadata-provider/model/entity-descriptor.ts → 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[];
 

ui/src/app/domain/model/certificate.ts

@@ -0,0 +1,5 @@
+export interface Certificate {
+    name: string;
+    type: string;
+    value: string;
+}

ui/src/app/domain/model/contact.ts

@@ -0,0 +1,5 @@
+export interface Contact {
+    type: string;
+    name: string;
+    emailAddress: string;
+}

ui/src/app/domain/model/logout-endpoint.ts

@@ -0,0 +1,4 @@
+export interface LogoutEndpoint {
+    url: string;
+    bindingType: string;
+}

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;
+}

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;
+}

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';

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';

ui/src/app/domain/model/organization.ts

@@ -0,0 +1,5 @@
+export interface Organization {
+    name?: string;
+    displayName?: string;
+    url?: string;
+}

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[];
+}

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[];
+}

ui/src/app/domain/model/sso-descriptor.ts

@@ -0,0 +1,4 @@
+export interface IdpSsoDescriptor {
+    protocolSupportEnum: string;
+    nameIdFormats: string[];
+}

ui/src/app/domain/model/sso-service.ts

@@ -0,0 +1,5 @@
+export interface SsoService {
+    binding: string;
+    locationUrl: string;
+    makeDefault: boolean;
+}

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';

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';

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({

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';

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({

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';

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';
 

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()