From 200fa802603af77a8a8dab7a5c3d957f7d4cb421 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 20 Apr 2019 21:29:13 -0400 Subject: [PATCH] centralize fillByOpid --- jslib | 2 +- src/services/autofill.service.ts | 38 ++++++++++++++------------------ 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/jslib b/jslib index bc43c68eb9..a0a1142f1f 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit bc43c68eb98799c8b9e30a1dd8f60431dc1236c6 +Subproject commit a0a1142f1f3152aea2abf3ca51feffa21e60e9a9 diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts index 95e1a00677..e1f39a20ef 100644 --- a/src/services/autofill.service.ts +++ b/src/services/autofill.service.ts @@ -263,9 +263,7 @@ export default class AutofillService implements AutofillServiceInterface { } filledFields[field.opid] = field; - fillScript.script.push(['click_on_opid', field.opid]); - fillScript.script.push(['focus_by_opid', field.opid]); - fillScript.script.push(['fill_by_opid', field.opid, val]); + this.fillByOpid(fillScript, field, val); } }); } @@ -379,9 +377,7 @@ export default class AutofillService implements AutofillServiceInterface { } filledFields[u.opid] = u; - fillScript.script.push(['click_on_opid', u.opid]); - fillScript.script.push(['focus_by_opid', u.opid]); - fillScript.script.push(['fill_by_opid', u.opid, login.username]); + this.fillByOpid(fillScript, u, login.username); }); passwords.forEach((p) => { @@ -390,10 +386,7 @@ export default class AutofillService implements AutofillServiceInterface { } filledFields[p.opid] = p; - fillScript.script.push(['click_on_opid', p.opid]); - fillScript.script.push(['focus_by_opid', p.opid]); - const passwordLength: number = p.maxLength && p.maxLength > 0 ? p.maxLength : login.password.length; - fillScript.script.push(['fill_by_opid', p.opid, login.password.substring(0, passwordLength)]); + this.fillByOpid(fillScript, p, login.password); }); fillScript = this.setFillScriptForFocus(filledFields, fillScript); @@ -507,9 +500,7 @@ export default class AutofillService implements AutofillServiceInterface { } filledFields[fillFields.expMonth.opid] = fillFields.expMonth; - fillScript.script.push(['click_on_opid', fillFields.expMonth.opid]); - fillScript.script.push(['focus_by_opid', fillFields.expMonth.opid]); - fillScript.script.push(['fill_by_opid', fillFields.expMonth.opid, expMonth]); + this.fillByOpid(fillScript, fillFields.expMonth, expMonth); } if (fillFields.expYear && this.hasValue(card.expYear)) { @@ -545,9 +536,7 @@ export default class AutofillService implements AutofillServiceInterface { } filledFields[fillFields.expYear.opid] = fillFields.expYear; - fillScript.script.push(['click_on_opid', fillFields.expYear.opid]); - fillScript.script.push(['focus_by_opid', fillFields.expYear.opid]); - fillScript.script.push(['fill_by_opid', fillFields.expYear.opid, expYear]); + this.fillByOpid(fillScript, fillFields.expYear, expYear); } if (fillFields.exp && this.hasValue(card.expMonth) && this.hasValue(card.expYear)) { @@ -852,9 +841,7 @@ export default class AutofillService implements AutofillServiceInterface { if (doFill) { filledFields[field.opid] = field; - fillScript.script.push(['click_on_opid', field.opid]); - fillScript.script.push(['focus_by_opid', field.opid]); - fillScript.script.push(['fill_by_opid', field.opid, dataValue]); + this.fillByOpid(fillScript, field, dataValue); } } @@ -864,8 +851,8 @@ export default class AutofillService implements AutofillServiceInterface { const isPassword = f.type === 'password'; const isLikePassword = () => f.type === 'text' && ((f.htmlID != null && f.htmlID.toLowerCase().indexOf('password') > 0) || - (f.htmlName != null && f.htmlName.toLowerCase().indexOf('password') > 0) || - (f.placeholder != null && f.placeholder.toLowerCase().indexOf('password') > 0)); + (f.htmlName != null && f.htmlName.toLowerCase().indexOf('password') > 0) || + (f.placeholder != null && f.placeholder.toLowerCase().indexOf('password') > 0)); if (!f.disabled && (canBeReadOnly || !f.readonly) && (isPassword || isLikePassword()) && (canBeHidden || f.viewable)) { arr.push(f); @@ -1050,4 +1037,13 @@ export default class AutofillService implements AutofillServiceInterface { return fillScript; } + + private fillByOpid(fillScript: AutofillScript, field: AutofillField, value: string): void { + if (field.maxLength && value.length > field.maxLength) { + value = value.substr(0, value.length); + } + fillScript.script.push(['click_on_opid', field.opid]); + fillScript.script.push(['focus_by_opid', field.opid]); + fillScript.script.push(['fill_by_opid', field.opid, value]); + } }