#14: made some refactorings. Added signalr notifications.

Author: ismcagdas

angular/.angular-cli.json

@@ -1,16 +1,21 @@
-{
+{
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "project": {
     "version": "1.0.0-beta.31",
-    "name": "abp-project-name-template"
+    "name": "abp-project-name-template"    
   },
   "apps": [
     {
       "root": "src",
       "outDir": "dist",
       "assets": [
         "assets",
-        "favicon.ico"
+        "favicon.ico",
+        {
+          "glob": "abp.signalr.js",
+          "input": "../node_modules/abp-web-resources/Abp/Framework/scripts/libs/",
+          "output": "./assets/abp/"
+        }
       ],
       "index": "index.html",
       "main": "main.ts",
@@ -43,12 +48,12 @@
 
         "../node_modules/signalr/jquery.signalR.js",
 
-
         "../node_modules/toastr/toastr.js",
         "../node_modules/sweetalert/dist/sweetalert-dev.js",
         "../node_modules/block-ui/jquery.blockUI.js",
         "../node_modules/spin.js/spin.min.js",
         "../node_modules/spin.js/jquery.spin.js",
+        "../node_modules/push.js/push.min.js",
 
         "../node_modules/abp-web-resources/Abp/Framework/scripts/abp.js",
         "../node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js",

angular/npm-shrinkwrap.json

@@ -45,6 +45,7 @@
     "moment": "^2.15.1",
     "moment-timezone": "^0.5.7",
     "ng2-bootstrap": "^1.3.3",
+    "push.js": "0.0.12",
     "rxjs": "^5.0.3",
     "signalr": "^2.2.1",
     "simple-line-icons": "^2.4.1",

angular/package.json

@@ -18,10 +18,8 @@ export class AccountComponent implements OnInit {
     currentYear: number = moment().year();
 
     public constructor(
-        private _loginService: LoginService,
-        viewContainerRef: ViewContainerRef
+        private _loginService: LoginService
     ) {
-        this.viewContainerRef = viewContainerRef; // We need this small hack in order to catch application root view container ref for modals
     }
 
     showTenantChange(): boolean {

angular/src/account/account.component.ts

@@ -1,4 +1,4 @@
-import * as ngCommon from '@angular/common';
+import { CommonModule } from '@angular/common';
 import { NgModule, APP_INITIALIZER } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { HttpModule, JsonpModule } from '@angular/http';
@@ -23,7 +23,7 @@ import { LoginService } from './login/login.service';
 
 @NgModule({
     imports: [
-        ngCommon.CommonModule,
+        CommonModule,
         FormsModule,
         HttpModule,
         JsonpModule,

angular/src/account/account.module.ts

@@ -2,7 +2,7 @@
 import { Router } from '@angular/router';
 import { Http, Headers } from '@angular/http';
 import { TokenAuthServiceProxy, AuthenticateModel, AuthenticateResultModel } from '@shared/service-proxies/service-proxies';
-import { AppComponentBase } from '@shared/common/app-component-base';
+import { AppComponentBase } from '@shared/app-component-base';
 import { AppConsts } from '@shared/AppConsts';
 import { LoginService, ExternalLoginProvider } from './login.service';
 import { accountModuleAnimation } from '@shared/animations/routerTransition';

angular/src/account/login/login.component.ts

@@ -93,7 +93,7 @@ export class LoginService {
 
         if (authenticateResult.accessToken) {
             //Successfully logged in
-            this.login(authenticateResult.accessToken, authenticateResult.expireInSeconds, this.rememberMe);
+            this.login(authenticateResult.accessToken, authenticateResult.encryptedAccessToken, authenticateResult.expireInSeconds, this.rememberMe);
 
         } else {
             //Unexpected result!
@@ -103,7 +103,7 @@ export class LoginService {
         }
     }
 
-    private login(accessToken: string, expireInSeconds: number, rememberMe?: boolean): void {
+    private login(accessToken: string, encryptedAccessToken: string, expireInSeconds: number, rememberMe?: boolean): void {
 
         var tokenExpireDate = rememberMe ? (new Date(new Date().getTime() + 1000 * expireInSeconds)) : undefined;
 
@@ -112,11 +112,18 @@ export class LoginService {
             tokenExpireDate
         );
 
+        this._utilsService.setCookieValue(
+            AppConsts.authorization.encrptedAuthTokenName,
+            encryptedAccessToken,
+            tokenExpireDate,
+            abp.appPath
+        );
+
         var initialUrl = UrlHelper.initialUrl;
         if (initialUrl.indexOf('/login') > 0) {
             initialUrl = AppConsts.appBaseUrl;
         }
-        
+
         location.href = initialUrl;
     }
 
@@ -189,7 +196,7 @@ export class LoginService {
                         return;
                     }
 
-                    this.login(result.accessToken, result.expireInSeconds);
+                    this.login(result.accessToken, result.encryptedAccessToken, result.expireInSeconds);
                 });
         }
     }
@@ -207,7 +214,7 @@ export class LoginService {
                         return;
                     }
 
-                    this.login(result.accessToken, result.expireInSeconds);
+                    this.login(result.accessToken, result.encryptedAccessToken, result.expireInSeconds);
                 });
         }
     }

angular/src/account/login/login.service.ts

@@ -1,7 +1,7 @@
 import { Component, Injector, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { AccountServiceProxy, RegisterInput } from '@shared/service-proxies/service-proxies'
-import { AppComponentBase } from '@shared/common/app-component-base';
+import { AppComponentBase } from '@shared/app-component-base';
 import { LoginService } from '../login/login.service';
 import { accountModuleAnimation } from '@shared/animations/routerTransition';
 

angular/src/account/register/register.component.ts

@@ -16,8 +16,8 @@ <h4 class="modal-title">
 
                 <div class="modal-body">
                     <div class="form-group form-md-line-input form-md-floating-label no-hint">
-                        <input #tenancyNameInput type="text" name="TenancyName" class="form-control" [ngClass]="{'edited':tenancyName}" [(ngModel)]="tenancyName" maxlength="64">
-                        <label>{{l("TenancyName")}}</label>
+                      <label>{{l("TenancyName")}}</label>  
+                      <input #tenancyNameInput type="text" name="TenancyName" class="form-control" [ngClass]="{'edited':tenancyName}" [(ngModel)]="tenancyName" maxlength="64">
                         <span class="help-block">{{l("LeaveEmptyToSwitchToHost")}}</span>
                     </div>
                 </div>

angular/src/account/tenant/tenant-change-modal.component.html

@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild, Injector, ElementRef } from '@angular/core';
-import { AppComponentBase } from '@shared/common/app-component-base';
+import { AppComponentBase } from '@shared/app-component-base';
 import { AccountServiceProxy } from '@shared/service-proxies/service-proxies';
 import { IsTenantAvailableInput } from '@shared/service-proxies/service-proxies';
 import { AppTenantAvailabilityState } from '@shared/AppEnums';