cleanup

pom.xml

@@ -20,8 +20,8 @@
 		<module>spring-security-oauth-resource</module>
 		<module>spring-security-oauth-ui-implicit</module>
 		<module>spring-security-oauth-ui-password</module>
-		<module>spring-security-oauth-ui-implicit-angular2</module>
-		<module>spring-security-oauth-ui-password-angular2</module>
+<!-- 		<module>spring-security-oauth-ui-implicit-angular2</module>
+		<module>spring-security-oauth-ui-password-angular2</module> -->
 	</modules>
 
 	<build>

spring-security-oauth-ui-implicit-angular2/src/main/resources/.angular-cli.json

@@ -8,13 +8,11 @@
       "root": "src",
       "outDir": "../../../target/resources",
       "assets": [
-        "assets",
-        "favicon.ico"
+        "assets"
       ],
       "index": "index.html",
       "main": "main.ts",
       "polyfills": "polyfills.ts",
-      "test": "test.ts",
       "tsconfig": "tsconfig.app.json",
       "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
@@ -27,11 +25,6 @@
       }
     }
   ],
-  "e2e": {
-    "protractor": {
-      "config": "./protractor.conf.js"
-    }
-  },
   "lint": [
     {
       "project": "src/tsconfig.app.json"
@@ -43,11 +36,6 @@
       "project": "e2e/tsconfig.e2e.json"
     }
   ],
-  "test": {
-    "karma": {
-      "config": "./karma.conf.js"
-    }
-  },
   "defaults": {
     "styleExt": "css",
     "component": {}

spring-security-oauth-ui-implicit-angular2/src/main/resources/package.json

@@ -4,7 +4,7 @@
   "license": "MIT",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve",
+    "start": "ng serve --port 8086",
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",
@@ -22,23 +22,14 @@
     "@angular/router": "^4.0.0",
     "core-js": "^2.4.1",
     "rxjs": "^5.1.0",
-    "zone.js": "^0.8.4"
+    "zone.js": "^0.8.4",
+    "angular-oauth2-oidc":">=1.0.20"
   },
   "devDependencies": {
     "@angular/cli": "1.0.1",
     "@angular/compiler-cli": "^4.0.0",
-    "@types/jasmine": "2.5.38",
     "@types/node": "~6.0.60",
     "codelyzer": "~2.0.0",
-    "jasmine-core": "~2.5.2",
-    "jasmine-spec-reporter": "~3.2.0",
-    "karma": "~1.4.1",
-    "karma-chrome-launcher": "~2.0.0",
-    "karma-cli": "~1.0.1",
-    "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "karma-coverage-istanbul-reporter": "^0.2.0",
-    "protractor": "~5.1.0",
     "ts-node": "~2.0.0",
     "tslint": "~4.5.0",
     "typescript": "~2.2.0"

spring-security-oauth-ui-implicit-angular2/src/main/resources/src/app/app.service.ts

@@ -19,7 +19,7 @@ export class AppService {
   constructor(
     private _router: Router, private _http: Http, private oauthService: OAuthService){
         this.oauthService.loginUrl = 'http://localhost:8081/spring-security-oauth-server/oauth/authorize'; 
-        this.oauthService.redirectUri = 'http://localhost:4200/';
+        this.oauthService.redirectUri = 'http://localhost:8086/';
         this.oauthService.clientId = "sampleClientId";
         this.oauthService.scope = "read write foo bar";    
         this.oauthService.setStorage(sessionStorage);

spring-security-oauth-ui-password-angular2/src/main/resources/.angular-cli.json

@@ -6,21 +6,17 @@
   "apps": [
     {
       "root": "src",
-      "outDir": "../../../target/baeldung",
+      "outDir": "../../../target/resources",
       "assets": [
-        "assets",
-        "favicon.ico"
+        "assets"
       ],
       "index": "index.html",
       "main": "main.ts",
       "polyfills": "polyfills.ts",
-      "test": "test.ts",
       "tsconfig": "tsconfig.app.json",
       "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
-      "styles": [
-        "styles.css"
-      ],
+      "styles": [],
       "scripts": [],
       "environmentSource": "environments/environment.ts",
       "environments": {
@@ -29,11 +25,6 @@
       }
     }
   ],
-  "e2e": {
-    "protractor": {
-      "config": "./protractor.conf.js"
-    }
-  },
   "lint": [
     {
       "project": "src/tsconfig.app.json"
@@ -45,11 +36,6 @@
       "project": "e2e/tsconfig.e2e.json"
     }
   ],
-  "test": {
-    "karma": {
-      "config": "./karma.conf.js"
-    }
-  },
   "defaults": {
     "styleExt": "css",
     "component": {}

spring-security-oauth-ui-password-angular2/src/main/resources/package.json

@@ -4,7 +4,7 @@
   "license": "MIT",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve",
+    "start": "ng serve --port 8085",
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",
@@ -15,30 +15,21 @@
     "@angular/common": "^4.0.0",
     "@angular/compiler": "^4.0.0",
     "@angular/core": "^4.0.0",
-    "@angular/forms": "^4.0.0",
+    "@angular/forms": "^4.0.0",    
     "@angular/http": "^4.0.0",
     "@angular/platform-browser": "^4.0.0",
     "@angular/platform-browser-dynamic": "^4.0.0",
     "@angular/router": "^4.0.0",
     "core-js": "^2.4.1",
     "rxjs": "^5.1.0",
-    "zone.js": "^0.8.4"
+    "zone.js": "^0.8.4",
+    "ng2-cookies": ">=1.0.12"
   },
   "devDependencies": {
     "@angular/cli": "1.0.1",
     "@angular/compiler-cli": "^4.0.0",
-    "@types/jasmine": "2.5.38",
     "@types/node": "~6.0.60",
     "codelyzer": "~2.0.0",
-    "jasmine-core": "~2.5.2",
-    "jasmine-spec-reporter": "~3.2.0",
-    "karma": "~1.4.1",
-    "karma-chrome-launcher": "~2.0.0",
-    "karma-cli": "~1.0.1",
-    "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "karma-coverage-istanbul-reporter": "^0.2.0",
-    "protractor": "~5.1.0",
     "ts-node": "~2.0.0",
     "tslint": "~4.5.0",
     "typescript": "~2.2.0"