From d04d5930a78c91490afbaa96bae1fe6ee94a66a1 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 10 Nov 2020 19:18:01 +0530 Subject: [PATCH] Fairoj : Automatic Login feature implemented on Link PD --- ng6-seed/src/app/_guard/auth.guard.ts | 52 +++++++++++++++++-- .../list-pd/view-pd/view-pd.component.ts | 2 +- ng6-seed/src/environments/environment.prod.ts | 4 ++ .../src/environments/environment.stage.ts | 4 ++ ng6-seed/src/environments/environment.ts | 5 +- 5 files changed, 62 insertions(+), 5 deletions(-) diff --git a/ng6-seed/src/app/_guard/auth.guard.ts b/ng6-seed/src/app/_guard/auth.guard.ts index bb52d8e..166ba40 100755 --- a/ng6-seed/src/app/_guard/auth.guard.ts +++ b/ng6-seed/src/app/_guard/auth.guard.ts @@ -1,11 +1,14 @@ import { Injectable } from '@angular/core'; import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, CanActivateChild } from '@angular/router'; +import { AwsService } from 'app/AwsService/aws.service'; +import { DashboardService } from 'app/dashboard/dashboard.service'; import { PdTrigerService } from 'app/personal-discussion/pd-service/pd-triger.service'; +import { environment } from 'environments/environment'; import { CognitoService } from '../AwsService/cognito.service'; @Injectable() export class AuthGuard implements CanActivate, CanActivateChild { - constructor(private router: Router,public shared:CognitoService,private pdTriggerService:PdTrigerService) { } + constructor(private router: Router,public shared:CognitoService,private pdTriggerService:PdTrigerService,private aws : AwsService,private dashBoardService:DashboardService) { } canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { if (this.shared.getToken()) { @@ -20,7 +23,7 @@ export class AuthGuard implements CanActivate, CanActivateChild { } canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot,): boolean { - console.log(route.queryParams.str) + console.log(route.routeConfig.path,route.routeConfig.path.includes('viewpd')) let paramCheck = route.queryParams.str if(paramCheck) { paramCheck = paramCheck.split('/') @@ -40,7 +43,11 @@ export class AuthGuard implements CanActivate, CanActivateChild { // alert("if"); return true; - } else { + } else if(paramCheck &&( route.routeConfig.path.includes('viewpd') || route.routeConfig.path.includes('personal_discussion'))){ + console.log("Login Process started for Link user") + this.linkLogin() + } + else{ console.log(route); // debugger; // else { @@ -53,6 +60,45 @@ export class AuthGuard implements CanActivate, CanActivateChild { } } + linkLogin() { + let auth = { 'Username': environment.credential.uname, 'Password': environment.credential.pwd }; + this.aws.dologin(auth).subscribe(res => { + // console.log("do login",res); + if (res !== undefined) { + this.getCommonSettings().then(()=>{ + // local storage for validate user access + localStorage.setItem('user_role',res.idToken.payload["custom:role_id"]); + if(this.pdTriggerService.customer_url_data && this.pdTriggerService.customer_url_data.pdid && this.pdTriggerService.customer_url_data.rdmstr && this.pdTriggerService.customer_url_data.from == 'link') { + let data= this.pdTriggerService.customer_url_data + this.router.navigateByUrl('/personal_discussion/pdlist/viewpd?str='+data.pdid+'/'+data.rdmstr+'/link', {replaceUrl: true}); + + } + else{ + this.router.navigate(['/']) + } + }) + } + }, err => { + if (err.message == "New password is required.") { + alert("Please inform to administrator to set the password") + // this.newpassopen(); + } else { + + } + //alert(err.message); + }) + } + getCommonSettings(){ + return new Promise((resolve,reject)=>{ + return this.dashBoardService.getCommonSettingsConfig().subscribe(res=>{ + let commonDetails:any = res; + if(commonDetails.dataStatus == true){ + localStorage.setItem("commonSettings",JSON.stringify(commonDetails.records)); + resolve() + } + }) + }) + } // public getToken(): string { // return localStorage.getItem('token'); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index 5580995..0a602e5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -615,7 +615,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { data: {msg: msg,iscompleteenable: enable_complete,isCompleteAnywaydialog:true}, disableClose: true, minWidth: '30%', - maxWidth: '40%', + // maxWidth: '40%', }); dialogRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/environments/environment.prod.ts b/ng6-seed/src/environments/environment.prod.ts index 203902a..38f0689 100755 --- a/ng6-seed/src/environments/environment.prod.ts +++ b/ng6-seed/src/environments/environment.prod.ts @@ -27,6 +27,10 @@ export const environment = { storageBucket: "", messagingSenderId: "906855209078", appId: "1:906855209078:web:c1583378f1fb2c71" + }, + credential:{ + uname:"officerbot@sine.com", + pwd:"bot1234" } }; \ No newline at end of file diff --git a/ng6-seed/src/environments/environment.stage.ts b/ng6-seed/src/environments/environment.stage.ts index e03a8f3..fa98eba 100755 --- a/ng6-seed/src/environments/environment.stage.ts +++ b/ng6-seed/src/environments/environment.stage.ts @@ -74,6 +74,10 @@ export const environment = { s3_endpoint: '', accessToken:'', //apiUrl:'http://localhost/sparqapi/api/' + credential:{ + uname:"testofficerbot@sine.com", + pwd:"test1234" + } }; diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts index b351a92..a2d2856 100755 --- a/ng6-seed/src/environments/environment.ts +++ b/ng6-seed/src/environments/environment.ts @@ -73,5 +73,8 @@ export const environment = { s3_endpoint: '', accessToken:'', //apiUrl:'http://localhost/sparqapi/api/' - + credential:{ + uname:"testofficerbot@sine.com", + pwd:"test1234" + } };