Refactor Cognito User management classes so that each service class in in its own file. Not only does this follow the style guide, it sets the stage to avoid circular dependency problems.

Author: dpantke

src/app/app.component.ts

@@ -7,7 +7,8 @@
  */
 import {Component, OnInit} from "@angular/core";
 import {AwsUtil} from "./service/aws.service";
-import {UserLoginService, CognitoUtil, LoggedInCallback} from "./service/cognito.service";
+import {UserLoginService} from "./service/user-login.service";
+import {CognitoUtil, LoggedInCallback} from "./service/cognito.service";
 
 @Component({
  selector: 'app-root',

src/app/app.module.ts

@@ -3,7 +3,10 @@ import {NgModule} from "@angular/core";
 import {FormsModule} from "@angular/forms";
 import {HttpModule} from "@angular/http";
 import {AppComponent} from "./app.component";
-import {UserRegistrationService, UserLoginService, UserParametersService, CognitoUtil} from "./service/cognito.service";
+import {UserRegistrationService} from "./service/user-registration.service";
+import {UserParametersService} from "./service/user-parameters.service";
+import {UserLoginService} from "./service/user-login.service";
+import {CognitoUtil} from "./service/cognito.service";
 import {routing} from "./app.routes";
 import {HomeComponent, AboutComponent, HomeLandingComponent} from "./public/home.component";
 import {AwsUtil} from "./service/aws.service";

src/app/public/auth/confirm/confirmRegistration.component.ts

@@ -1,6 +1,8 @@
 import {Component, OnInit, OnDestroy} from "@angular/core";
 import {Router, ActivatedRoute} from "@angular/router";
-import {UserRegistrationService, UserLoginService, LoggedInCallback} from "../../../service/cognito.service";
+import {UserRegistrationService} from "../../../service/user-registration.service";
+import {UserLoginService} from "../../../service/user-login.service";
+import {LoggedInCallback} from "../../../service/cognito.service";
 
 @Component({
  selector: 'awscognito-angular2-app',

src/app/public/auth/forgot/forgotPassword.component.ts

@@ -1,6 +1,7 @@
 import {Component, OnInit, OnDestroy} from "@angular/core";
 import {Router, ActivatedRoute} from "@angular/router";
-import {CognitoCallback, UserLoginService} from "../../../service/cognito.service";
+import {UserLoginService} from "../../../service/user-login.service";
+import {CognitoCallback} from "../../../service/cognito.service";
 
 @Component({
  selector: 'awscognito-angular2-app',

src/app/public/auth/login/login.component.ts

@@ -1,6 +1,7 @@
 import {Component, OnInit} from "@angular/core";
 import {Router} from "@angular/router";
-import {CognitoCallback, UserLoginService, LoggedInCallback} from "../../../service/cognito.service";
+import {UserLoginService} from "../../../service/user-login.service";
+import {CognitoCallback, LoggedInCallback} from "../../../service/cognito.service";
 import {DynamoDBService} from "../../../service/ddb.service";
 
 @Component({

src/app/public/auth/newpassword/newpassword.component.ts

@@ -1,6 +1,8 @@
 import {Component} from "@angular/core";
 import {Router} from "@angular/router";
-import {UserRegistrationService, UserLoginService, CognitoCallback} from "../../../service/cognito.service";
+import {UserRegistrationService} from "../../../service/user-registration.service";
+import {UserLoginService} from "../../../service/user-login.service";
+import {CognitoCallback} from "../../../service/cognito.service";
 
 export class NewPasswordUser {
  username: string;

src/app/public/auth/register/registration.component.ts

@@ -1,6 +1,7 @@
 import {Component} from "@angular/core";
 import {Router} from "@angular/router";
-import {UserRegistrationService, CognitoCallback} from "../../../service/cognito.service";
+import {UserRegistrationService} from "../../../service/user-registration.service";
+import {CognitoCallback} from "../../../service/cognito.service";
 
 export class RegistrationUser {
  name: string;

src/app/public/auth/resend/resendCode.component.ts

@@ -1,5 +1,6 @@
 import {Component} from "@angular/core";
-import {CognitoCallback, UserRegistrationService} from "../../../service/cognito.service";
+import {UserRegistrationService} from "../../../service/user-registration.service";
+import {CognitoCallback} from "../../../service/cognito.service";
 import {Router} from "@angular/router";
 @Component({
  selector: 'awscognito-angular2-app',

src/app/secure/jwttokens/jwt.component.ts

@@ -1,5 +1,6 @@
 import {Component} from "@angular/core";
-import {LoggedInCallback, UserLoginService, CognitoUtil, Callback} from "../../service/cognito.service";
+import {UserLoginService} from "../../service/user-login.service";
+import {LoggedInCallback, CognitoUtil, Callback} from "../../service/cognito.service";
 import {Router} from "@angular/router";
 
 

src/app/secure/landing/securehome.component.ts

@@ -1,6 +1,7 @@
 import {Component, OnInit} from "@angular/core";
 import {Router} from "@angular/router";
-import {LoggedInCallback, UserLoginService} from "../../service/cognito.service";
+import {UserLoginService} from "../../service/user-login.service";
+import {LoggedInCallback} from "../../service/cognito.service";
 
 @Component({
  selector: 'awscognito-angular2-app',