diff --git a/Mohem/package-lock.json b/Mohem/package-lock.json index 99358649..4b7308a7 100644 --- a/Mohem/package-lock.json +++ b/Mohem/package-lock.json @@ -6120,12 +6120,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6140,17 +6142,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6267,7 +6272,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6279,6 +6285,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6293,6 +6300,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6300,12 +6308,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -6324,6 +6334,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -6404,7 +6415,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -6416,6 +6428,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -6537,6 +6550,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index bfccc7a4..98caa60c 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -200,7 +200,7 @@ export class AuthenticationService { * @param result check activation code result */ public setAuthenticatedUser( - result: CheckActivationCodeResponse + result: SMSCheckResponse ): Observable { return Observable.create(observer => { this.loadAuthenticatedUser().subscribe( @@ -229,17 +229,17 @@ export class AuthenticationService { this.publishUserChangeEvent(); } - public setAuthenticatedMemberFamilyUser(result: CheckActivationCodeResponse) { - const authUser = new AuthenticatedUser(); - AuthenticationService.requireRelogin = false; - this.startIdleMonitoring(); - const user = this.updateAuthenticatedUser(result, authUser); + // public setAuthenticatedMemberFamilyUser(result: CheckActivationCodeResponse) { + // const authUser = new AuthenticatedUser(); + // AuthenticationService.requireRelogin = false; + // this.startIdleMonitoring(); + // const user = this.updateAuthenticatedUser(result, authUser); - // user["hello"]= "ok"; - /* we store in hd without token but with token in memory*/ - AuthenticationService.user = user; - this.publishFamilyMemeberUserChangeEvent(); - } + // // user["hello"]= "ok"; + // /* we store in hd without token but with token in memory*/ + // AuthenticationService.user = user; + // this.publishFamilyMemeberUserChangeEvent(); + // } public updateLoggedInUser(newUser: AuthenticatedUser): Observable { return Observable.create(observer => { @@ -296,7 +296,7 @@ export class AuthenticationService { *update new authenticated user from previously stored and loaded user */ private updateAuthenticatedUser( - result: CheckActivationCodeResponse, + result: SMSCheckResponse, loadedUser: AuthenticatedUser ): AuthenticatedUser { const user = result.MemberInformationList[0]; diff --git a/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.response.ts b/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.response.ts index f7718603..019139be 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.response.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.response.ts @@ -13,4 +13,6 @@ export class CheckActivationCodeResponse extends Response { CompanyImageURL: string; MemberInformationList:AuthenticatedUser[]; + CompanyImageDescription: string; + CompanyImageURL : string; } diff --git a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts index 1ba738fd..447ec734 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts @@ -13,4 +13,6 @@ export class SMSCheckResponse extends Response { public CompanyImageDescription:string; public CompanyImageURL:string; public EMPLOYEE_MOBILE_NUMBER:string; + CompanyImageDescription : string; + CompanyImageURL : string; }