Merge branch 'master' into pr/191

Author: ismcagdas

angular/nswag/service.config.nswag

@@ -11,9 +11,10 @@
       "className": "{controller}ServiceProxy",
       "moduleName": "",
       "namespace": "",
-      "typeScriptVersion": 1.8,
+      "typeScriptVersion": 2.0,
       "template": "Angular",
       "promiseType": "Promise",
+	  "httpClass": "HttpClient",
       "dateTimeType": "MomentJS",
       "nullValue": "Undefined",
       "generateClientClasses": true,

angular/package.json

@@ -13,15 +13,15 @@
     },
     "private": true,
     "dependencies": {
-        "@angular/animations": "^5.0.3",
-        "@angular/common": "^5.0.3",
-        "@angular/compiler": "^5.0.3",
-        "@angular/core": "^5.0.3",
-        "@angular/forms": "^5.0.3",
-        "@angular/http": "^5.0.3",
-        "@angular/platform-browser": "^5.0.3",
-        "@angular/platform-browser-dynamic": "^5.0.3",
-        "@angular/router": "^5.0.3",
+        "@angular/animations": "^5.2.5",
+        "@angular/common": "^5.2.5",
+        "@angular/compiler": "^5.2.5",
+        "@angular/core": "^5.2.5",
+        "@angular/forms": "^5.2.5",
+        "@angular/http": "^5.2.5",
+        "@angular/platform-browser": "^5.2.5",
+        "@angular/platform-browser-dynamic": "^5.2.5",
+        "@angular/router": "^5.2.5",
         "@aspnet/signalr": "1.0.0-preview1-28189",
         "@types/bootstrap": "^3.3.33",
         "@types/jquery": "^3.2.12",
@@ -32,7 +32,7 @@
         "@types/moment-timezone": "^0.2.34",
         "@types/signalr": "^2.2.33",
         "@types/toastr": "^2.1.33",
-        "abp-ng2-module": "^1.3.0",
+        "abp-ng2-module": "^2.0.0",
         "abp-web-resources": "^3.3.0",
         "animate.css": "^3.5.2",
         "block-ui": "^2.70.1",
@@ -69,8 +69,8 @@
         "zone.js": "0.8.18"
     },
     "devDependencies": {
-        "@angular/cli": "^1.5.4",
-        "@angular/compiler-cli": "^5.0.3",
+        "@angular/cli": "^1.6.8",
+        "@angular/compiler-cli": "^5.2.5",
         "@angularclass/hmr": "^2.1.3",
         "@types/jasmine": "^2.5.38",
         "@types/node": "^8.0.27",

angular/src/account/account.module.ts

@@ -1,7 +1,9 @@
-import { CommonModule } from '@angular/common';
+import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { HttpModule, JsonpModule } from '@angular/http';
+import { JsonpModule } from '@angular/http';
+import { HttpClientModule } from '@angular/common/http';
+
 import { ModalModule } from 'ngx-bootstrap';
 
 import { AbpModule } from '@abp/abp.module';
@@ -25,7 +27,7 @@ import { LoginService } from './login/login.service';
     imports: [
         CommonModule,
         FormsModule,
-        HttpModule,
+        HttpClientModule,
         JsonpModule,
         AbpModule,
         SharedModule,

angular/src/account/layout/account-languages.component.ts

@@ -23,7 +23,6 @@ export class AccountLanguagesComponent extends AppComponentBase implements OnIni
 
     ngOnInit() {
         this.languages = _.filter(this.localization.languages, l => !l.isDisabled);
-        this.languages = this.localization.languages;
         this.currentLanguage = this.localization.currentLanguage;
     }
 

angular/src/app/app.module.ts

@@ -1,7 +1,8 @@
-import { NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
-import { HttpModule, JsonpModule } from '@angular/http';
+import { JsonpModule } from '@angular/http';
+import { HttpClientModule, HttpResponse } from '@angular/common/http';
 
 import { ModalModule } from 'ngx-bootstrap';
 import { NgxPaginationModule } from 'ngx-pagination';
@@ -58,7 +59,7 @@ import { MaterialInput } from '@shared/directives/material-input.directive';
     imports: [
         CommonModule,
         FormsModule,
-        HttpModule,
+        HttpClientModule,
         JsonpModule,
         ModalModule.forRoot(),
         AbpModule,

angular/src/root.module.ts

@@ -2,7 +2,9 @@ import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NgModule, Injector, APP_INITIALIZER, LOCALE_ID } from '@angular/core';
 
-import { AbpModule, ABP_HTTP_PROVIDER } from '@abp/abp.module';
+import { AbpModule } from '@abp/abp.module';
+import { AbpHttpInterceptor } from '@abp/abpHttpInterceptor';
+import { HTTP_INTERCEPTORS } from '@angular/common/http';
 
 import { SharedModule } from '@shared/shared.module';
 import { ServiceProxyModule } from '@shared/service-proxies/service-proxy.module';
@@ -15,7 +17,7 @@ import { API_BASE_URL } from '@shared/service-proxies/service-proxies';
 import { RootComponent } from './root.component';
 import { AppPreBootstrap } from './AppPreBootstrap';
 import { ModalModule } from 'ngx-bootstrap';
-
+import { HttpClientModule, HttpResponse } from '@angular/common/http';
 
 export function appInitializerFactory(injector: Injector) {
   return () => {
@@ -55,13 +57,14 @@ export function getCurrentLanguage(): string {
     ModalModule.forRoot(),
     AbpModule,
     ServiceProxyModule,
-    RootRoutingModule
+    RootRoutingModule,
+    HttpClientModule
   ],
   declarations: [
     RootComponent
   ],
   providers: [
-    ABP_HTTP_PROVIDER,
+    { provide: HTTP_INTERCEPTORS, useClass: AbpHttpInterceptor, multi: true },
     { provide: API_BASE_URL, useFactory: getRemoteServiceBaseUrl },
     {
       provide: APP_INITIALIZER,