Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge release v5.5.1 back to develop #1612

Merged
merged 2 commits into from
Apr 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [v5.5.1](https://github.com/opengovsg/FormSG/compare/v5.5.0...v5.5.1)

- refactor(corppass-ui): make ui changes for corppass [`#1533`](https://github.com/opengovsg/FormSG/pull/1533)

#### [v5.5.0](https://github.com/opengovsg/FormSG/compare/v5.4.0...v5.5.0)

> 6 April 2021
- [Snyk] Security upgrade mongoose from 5.11.10 to 5.12.3 [`#1538`](https://github.com/opengovsg/FormSG/pull/1538)
- ref(auth-api): duplicate auth endpoints to new /api/v3 router [`#1551`](https://github.com/opengovsg/FormSG/pull/1551)
- chore: add createReqMeta to verification module logging [`#1562`](https://github.com/opengovsg/FormSG/pull/1562)
Expand Down Expand Up @@ -46,6 +52,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- build: release 5.1.0 [`#1337`](https://github.com/opengovsg/FormSG/pull/1337)
- build: release 5.0.4 - undefined checks for MyInfo address fields [`#1249`](https://github.com/opengovsg/FormSG/pull/1249)
- build: Release v5.0.3 - protect against registered address field type bug [`#1247`](https://github.com/opengovsg/FormSG/pull/1247)
- chore: bump version to 5.5.0 [`a6ce485`](https://github.com/opengovsg/FormSG/commit/a6ce4855df4aa9d4a59848f78631c69c954c3206)
- build: release 5.4.1 - server to respond with status code if storage mode form is archived [`7fb57ad`](https://github.com/opengovsg/FormSG/commit/7fb57ad56629862daa2fb2d0a490bbed4b6e139e)
- fix: server to respond with status code if storage mode form is archived [`91551a9`](https://github.com/opengovsg/FormSG/commit/91551a936de5c09b3193689b65929697ae2e6108)

Expand Down Expand Up @@ -308,15 +315,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

> 23 February 2021
- fix: add _id key in permissionList object for updateForm validator [`#1224`](https://github.com/opengovsg/FormSG/pull/1224)
- feat: remove updateFormValidator [`92f3f75`](https://github.com/opengovsg/FormSG/commit/92f3f75bc760f32bdb495e27eb880d53f1562093)
- chore: bump version to v4.59.0 [`21bee76`](https://github.com/opengovsg/FormSG/commit/21bee768bb40e9eae57fe25b8a3c7b2ea3ccc130)
- chore: bump version to v4.59.1 [`a712594`](https://github.com/opengovsg/FormSG/commit/a712594146e294a01cea13e429e4ed03109a1f70)

#### [v4.59.0](https://github.com/opengovsg/FormSG/compare/v4.58.2...v4.59.0)

> 23 February 2021
- fix: add _id key in permissionList object for updateForm validator [`#1224`](https://github.com/opengovsg/FormSG/pull/1224)
- chore: use formsg-sdk beta release [`#1219`](https://github.com/opengovsg/FormSG/pull/1219)
- chore(deps-dev): bump csv-parse from 4.15.1 to 4.15.3 [`#1213`](https://github.com/opengovsg/FormSG/pull/1213)
- refactor: move addLogin method to Billing module [`#1195`](https://github.com/opengovsg/FormSG/pull/1195)
Expand Down Expand Up @@ -373,7 +379,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- fix(deps): bump nodemailer from 6.4.17 to 6.4.18 [`#1143`](https://github.com/opengovsg/FormSG/pull/1143)
- fix(deps): bump @sentry/integrations from 5.30.0 to 6.1.0 [`#1142`](https://github.com/opengovsg/FormSG/pull/1142)
- fix(deps): bump libphonenumber-js from 1.9.8 to 1.9.11 [`#1138`](https://github.com/opengovsg/FormSG/pull/1138)
- chore: bump version to v4.59.0 [`53bd033`](https://github.com/opengovsg/FormSG/commit/53bd03318be09e83dc549d93515830e3b7efc365)
- chore: bump version to v4.59.0 [`21bee76`](https://github.com/opengovsg/FormSG/commit/21bee768bb40e9eae57fe25b8a3c7b2ea3ccc130)

#### [v4.58.2](https://github.com/opengovsg/FormSG/compare/v4.58.1...v4.58.2)

Expand Down Expand Up @@ -683,16 +689,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- build: Release 4.30.1 - Fix field creation on old clients [`#74`](https://github.com/opengovsg/FormSG/pull/74)
- Release 4.30.0 - acknowledgement for secret key backup, TypeScript migrations [`#67`](https://github.com/opengovsg/FormSG/pull/67)
- build: empty commit to trigger PR build [`d0c6583`](https://github.com/opengovsg/FormSG/commit/d0c65838efa6731a0f10e89ff954c132b9f8b854)
- feat: update table field styling to not rely on multiple divs [`db03da3`](https://github.com/opengovsg/FormSG/commit/db03da33eca2fc0a6174ca58d7dd8b3cfadadcea)
- fix: return 401 for missing JWT [`e6c1947`](https://github.com/opengovsg/FormSG/commit/e6c19477b05fc4aed90b2db42916220aea2a263c)
- test: add tests for extractJwt [`16191a9`](https://github.com/opengovsg/FormSG/commit/16191a957be0dc7f63dc4221569fac2794b7d063)

#### [v4.50.2](https://github.com/opengovsg/FormSG/compare/v4.50.1...v4.50.2)

> 16 December 2020
- feat: update table field styling to not rely on multiple divs [`e857aed`](https://github.com/opengovsg/FormSG/commit/e857aed667145441758f09f311c2b9f16f57645b)
- feat: update table field styling to not rely on multiple divs [`db03da3`](https://github.com/opengovsg/FormSG/commit/db03da33eca2fc0a6174ca58d7dd8b3cfadadcea)
- fix: email format validation should allow 126/163.com, align frontend and backend validation [`be35522`](https://github.com/opengovsg/FormSG/commit/be35522e15d20521f58fada7ed3164e6c0c0894d)
- chore: bump version to v4.50.2 [`fad62ec`](https://github.com/opengovsg/FormSG/commit/fad62ec5730412201e208332a91286fd53e2b36a)
- chore: bump version to v4.50.2 [`1ac7be6`](https://github.com/opengovsg/FormSG/commit/1ac7be6cb69553d186ec194682ae25bd98318a8b)

#### [v4.50.1](https://github.com/opengovsg/FormSG/compare/v4.50.0...v4.50.1)

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "FormSG",
"description": "Form Manager for Government",
"version": "5.5.0",
"version": "5.5.1",
"homepage": "https://form.gov.sg",
"authors": [
"FormSG <[email protected]>"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,14 @@
class="radiomark"
ng-class="tempForm.authType === type.val ? 'blue-border' : ''"
></span>
<i
class="glyphicon glyphicon-question-sign"
uib-tooltip="Corppass no longer has its own login page, and now uses
Singpass to authenticate corporate users. You will still need a
separate Corppass e-service ID."
tooltip-trigger="'click mouseenter'"
ng-if="type.val === 'CP'"
></i>
</label>
</div>
<div
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,17 +171,17 @@ function settingsFormDirective(
},
{
val: 'SP',
name: 'SingPass',
name: 'Singpass',
isEnabledInStorageMode: true,
},
{
val: 'MyInfo',
name: 'SingPass (MyInfo)',
name: 'Singpass (MyInfo)',
isEnabledInStorageMode: false,
},
{
val: 'CP',
name: 'CorpPass',
name: 'Singpass (Corporate)',
isEnabledInStorageMode: true,
},
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
<div class="field-description">
<span ng-if="vm.esrvcIdError.errorCode">
{{ (['SP', 'MyInfo'].includes(vm.esrvcIdError.authType) ?
'SingPass' : 'CorpPass') + ' returns the error code ' }}
'Singpass' : 'Corppass') + ' returns the error code ' }}
<b>{{vm.esrvcIdError.errorCode}}</b>
{{' for the e-service ID ' }} <b>{{vm.esrvcIdError.esrvcId}}</b>
</span>
<span ng-if="!vm.esrvcIdError.errorCode">
{{ 'Could not connect to ' + (vm.esrvcIdError.authType === 'CP' ?
'CorpPass' : 'SingPass') + ' to check the e-service id '}}
'Corppass' : 'Singpass') + ' to check the e-service id '}}
<b>{{vm.esrvcIdError.esrvcId}}</b>
</span>
</div>
Expand All @@ -48,7 +48,7 @@
</div>
<!-- Since CorpPass eservice id cannot be validated, remind user to check-->
<div ng-if="vm.esrvcIdSuccess.authType === 'CP'">
<div class="field-title">This form uses CorpPass.</div>
<div class="field-title">This form uses Corppass.</div>
<div class="field-description">
Please make sure <b>{{vm.esrvcIdSuccess.esrvcId}}</b> is the correct
e-service ID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ <h2 class="modal-title">
<a
translate-attr="{ href: 'LINKS.SINGPASS_ELIGIBILITY_FAQ' }"
target="_blank"
>SingPass</a
>Singpass</a
>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/public/modules/forms/base/componentViews/end-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h2 id="end-page-title">{{ vm.title }}</h2>
<p ng-bind-html="vm.paragraph | linky:'_blank'"></p>
</div>
<div class="end-page-follow-up" ng-if="vm.authType === 'MyInfo'">
<p>You will be automatically logged out of SingPass.</p>
<p>You will be automatically logged out of Singpass.</p>
</div>

<div id="end-page-btn-link">
Expand Down
21 changes: 14 additions & 7 deletions src/public/modules/forms/base/componentViews/start-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@ <h1>{{ vm.formTitle }}</h1>
ng-if="['SP', 'MyInfo'].includes(vm.authType) && !vm.userName && !vm.isTemplate"
ng-disabled="vm.isAdminPreview"
>
<span>Log in with SingPass</span>
<span>Login with Singpass</span>
<span class="hidden-xs">
<i class="bx bx-log-in"></i>
</span>
</button>
<button
type="button"
class="start-page-btn {{ vm.colorTheme }}-font"
class="start-page-btn {{ vm.colorTheme }}-font start-page-multiline-btn"
ng-click="vm.formLogin({ authType: 'CP', rememberMe: false })"
ng-if="vm.authType==='CP' && !vm.userName && !vm.isTemplate"
ng-disabled="vm.isAdminPreview"
>
<span>Log in with CorpPass</span>
<span class="hidden-xs">
<span>Login with Singpass (Corporate)</span>
<span class="hidden-xs start-page-multiline-btn-decorator">
<i class="bx bx-log-in"></i>
</span>
</button>
Expand Down Expand Up @@ -100,14 +100,21 @@ <h1>{{ vm.formTitle }}</h1>
ng-if="['SP', 'MyInfo'].includes(vm.authType)"
class="form-locked-msg padded-view"
>
Login with SingPass to access this form. Your SingPass ID will be
Login with Singpass to access this form. Your Singpass ID will be
included with your form submission.
</div>
<div ng-if="vm.authType==='CP'" class="form-locked-msg padded-view">
Login with CorpPass to access this form. Your Entity ID and
CorpPass ID will be included with your form submission.
Corporate entity login is required for this form. Your Singpass ID
and corporate Entity ID will be included with your form
submission.
</div>
</div>
<div
ng-if="vm.authType==='CP' && (vm.userName || vm.isTemplate)"
class="form-locked-msg padded-view"
>
<div>Logged in as corporate user</div>
</div>
<label
class="remember-me-btn"
ng-if="(vm.authType==='SP') && !vm.userName && !vm.isTemplate"
Expand Down
11 changes: 11 additions & 0 deletions src/public/modules/forms/base/css/start-end-page.css
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,17 @@
width: 100%;
}

#start-page-main-container .start-page-multiline-btn {
height: auto;
max-width: max-content;
padding: 17px 30px;
}

#start-page-main-container .start-page-multiline-btn-decorator {
display: flex;
align-items: center;
}

#start-page-main-container .start-page-btn {
margin: 39px auto 0 auto;
}
Expand Down
10 changes: 5 additions & 5 deletions src/public/translations/en-SG/landing.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@
"SUBSECTION_3": {
"HEADER": "Integrated with government systems",
"POINT_1": {
"TITLE": "SingPass",
"TEXT": "With the push of a button you can authenticate citizens filling in your form with SingPass Login"
"TITLE": "Singpass",
"TEXT": "With the push of a button you can authenticate citizens filling in your form with Singpass Login"
},
"POINT_2": {
"TITLE": "CorpPass",
"TEXT": "With the push of a button you can enable CorpPass Login on your form to authenticate companies"
"TITLE": "Corppass",
"TEXT": "With the push of a button you can enable Corppass Login on your form to authenticate companies"
},
"POINT_3": {
"TITLE": "MyInfo",
"TEXT": "Select which MyInfo fields you want to collect. These fields will be pre-filled once citizens log in through SingPass"
"TEXT": "Select which MyInfo fields you want to collect. These fields will be pre-filled once citizens log in through Singpass"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion tests/end-to-end/helpers/selectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ const formPage = {
},
submitBtn: Selector('#form-submit button'),
spcpLoginBtn: Selector('#start-page-btn-container button span').withText(
'LOG IN',
'LOGIN',
),
spcpLogoutBtn: Selector('#start-page-btn-container button span').withText(
'LOG OUT',
Expand Down
6 changes: 3 additions & 3 deletions tests/end-to-end/helpers/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,7 @@ const expectSpcpLogin = async (t, authType, authData) => {
case 'MyInfo':
await t
.expect(formPage.spcpLoginBtn.textContent)
.contains(`Log in with SingPass`)
.contains(`Login with Singpass`)
.click(formPage.spcpLoginBtn)
.click(mockpass.loginBtn)
.click(mockpass.nricDropdownBtn)
Expand All @@ -1143,7 +1143,7 @@ const expectSpcpLogin = async (t, authType, authData) => {
case 'SP':
await t
.expect(formPage.spcpLoginBtn.textContent)
.contains(`Log in with SingPass`)
.contains(`Login with Singpass`)
.click(formPage.spcpLoginBtn)
.click(mockpass.loginBtn)
.click(mockpass.nricDropdownBtn)
Expand All @@ -1154,7 +1154,7 @@ const expectSpcpLogin = async (t, authType, authData) => {
case 'CP':
await t
.expect(formPage.spcpLoginBtn.textContent)
.contains(`Log in with CorpPass`)
.contains(`Login with Singpass (Corporate)`)
.click(formPage.spcpLoginBtn)
.click(mockpass.loginBtn)
.click(mockpass.nricDropdownBtn)
Expand Down