ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix :: 메일 카운트 URL 파라미터에 '+' 값이 유입될 경우에 대한 처리.

Browse Source
This commit is contained in:
leejinho 2020-03-24 10:00:50 +09:00
parent 2b4846d865
commit 67b04ef850
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts
View File

@ -543,7 +543,10 @@ export class ProfileDialogComponent implements OnInit, OnDestroy {
);
let elephantUrl = links[0].url
.replace(/(\(%USER_PASS%\))/g, appUserInfo.loginPw) // exchange USER_PASS params
.replace(
/(\(%USER_PASS%\))/g,
encodeURIComponent(appUserInfo.loginPw)
) // exchange USER_PASS params
.replace('kind%3D3', 'kind%3D2'); // change value of 'kind'
elephantUrl += '%26empno%3D' + this.userInfo.employeeNum + ','; // add parameter of 'empno'

21
projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
View File

@ -258,9 +258,9 @@ export class TopBarComponent implements OnInit, OnDestroy {
);
const WebLinkMailCnt = link[0];
const loginPw = appUserInfo.loginPw;
const loginPw = encodeURIComponent(appUserInfo.loginPw);
const loginPw2 = this.loginInfo.loginPw;
const loginId = this.loginInfo.loginId;
const loginId = encodeURIComponent(this.loginInfo.loginId);
const token = loginRes.tokenString;
const url = WebLinkMailCnt.url
@ -268,6 +268,15 @@ export class TopBarComponent implements OnInit, OnDestroy {
.replace(/(\(%USER_ID%\))/g, loginId)
.replace(/(\(%USER_PASS%\))/g, loginPw);
this.daesangApiService
.retrieveMailCount(url)
.pipe(
take(1),
map(res => (this.webLinkBadgeMail = res.count)),
catchError(error => of(this.logger.log(error)))
)
.subscribe();
// interval
if (!this.webLinkbadgeEmailCountInterval) {
this.webLinkbadgeEmailCountInterval = setInterval(() => {
this.daesangApiService
@ -294,9 +303,9 @@ export class TopBarComponent implements OnInit, OnDestroy {
);
const WebLinkPaymentCnt = link[0];
const loginPw = appUserInfo.loginPw;
const loginPw = encodeURIComponent(appUserInfo.loginPw);
const loginPw2 = this.loginInfo.loginPw;
const loginId = this.loginInfo.loginId;
const loginId = encodeURIComponent(this.loginInfo.loginId);
const token = loginRes.tokenString;
const url = WebLinkPaymentCnt.url
@ -422,9 +431,9 @@ export class TopBarComponent implements OnInit, OnDestroy {
environment.customConfig.appKey
);
const loginPw = appUserInfo.loginPw;
const loginPw = encodeURIComponent(appUserInfo.loginPw);
const loginPw2 = this.loginInfo.loginPw;
const loginId = this.loginInfo.loginId;
const loginId = encodeURIComponent(this.loginInfo.loginId);
const token = this.loginRes.tokenString;
const erpPw = this.daesangCipherService.encryptForSapErp(
'aes256-daesang-key!!',