Sultan Khan 7 years ago
commit 9985a93701

@ -6120,12 +6120,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -6140,17 +6142,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
@ -6267,7 +6272,8 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
@ -6279,6 +6285,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
@ -6293,6 +6300,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
@ -6300,12 +6308,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
@ -6324,6 +6334,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
@ -6404,7 +6415,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
@ -6416,6 +6428,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
@ -6537,6 +6550,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",

@ -200,7 +200,7 @@ export class AuthenticationService {
* @param result check activation code result * @param result check activation code result
*/ */
public setAuthenticatedUser( public setAuthenticatedUser(
result: CheckActivationCodeResponse result: SMSCheckResponse
): Observable<boolean> { ): Observable<boolean> {
return Observable.create(observer => { return Observable.create(observer => {
this.loadAuthenticatedUser().subscribe( this.loadAuthenticatedUser().subscribe(
@ -229,17 +229,17 @@ export class AuthenticationService {
this.publishUserChangeEvent(); this.publishUserChangeEvent();
} }
public setAuthenticatedMemberFamilyUser(result: CheckActivationCodeResponse) { // public setAuthenticatedMemberFamilyUser(result: CheckActivationCodeResponse) {
const authUser = new AuthenticatedUser(); // const authUser = new AuthenticatedUser();
AuthenticationService.requireRelogin = false; // AuthenticationService.requireRelogin = false;
this.startIdleMonitoring(); // this.startIdleMonitoring();
const user = this.updateAuthenticatedUser(result, authUser); // const user = this.updateAuthenticatedUser(result, authUser);
// user["hello"]= "ok"; // // user["hello"]= "ok";
/* we store in hd without token but with token in memory*/ // /* we store in hd without token but with token in memory*/
AuthenticationService.user = user; // AuthenticationService.user = user;
this.publishFamilyMemeberUserChangeEvent(); // this.publishFamilyMemeberUserChangeEvent();
} // }
public updateLoggedInUser(newUser: AuthenticatedUser): Observable<boolean> { public updateLoggedInUser(newUser: AuthenticatedUser): Observable<boolean> {
return Observable.create(observer => { return Observable.create(observer => {
@ -296,7 +296,7 @@ export class AuthenticationService {
*update new authenticated user from previously stored and loaded user *update new authenticated user from previously stored and loaded user
*/ */
private updateAuthenticatedUser( private updateAuthenticatedUser(
result: CheckActivationCodeResponse, result: SMSCheckResponse,
loadedUser: AuthenticatedUser loadedUser: AuthenticatedUser
): AuthenticatedUser { ): AuthenticatedUser {
const user = result.MemberInformationList[0]; const user = result.MemberInformationList[0];

@ -13,4 +13,6 @@ export class CheckActivationCodeResponse extends Response {
CompanyImageURL: string; CompanyImageURL: string;
MemberInformationList:AuthenticatedUser[]; MemberInformationList:AuthenticatedUser[];
CompanyImageDescription: string;
CompanyImageURL : string;
} }

@ -13,4 +13,6 @@ export class SMSCheckResponse extends Response {
public CompanyImageDescription:string; public CompanyImageDescription:string;
public CompanyImageURL:string; public CompanyImageURL:string;
public EMPLOYEE_MOBILE_NUMBER:string; public EMPLOYEE_MOBILE_NUMBER:string;
CompanyImageDescription : string;
CompanyImageURL : string;
} }

Loading…
Cancel
Save