Merge pull request #6861 from opengovsg/release-al2

build: merge release v6.85.1 into develop

CHANGELOG.md

@@ -4,8 +4,29 @@ 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).
 
+#### [v6.85.1](https://github.com/opengovsg/FormSG/compare/v6.85.0...v6.85.1)
+
+- build: release v6.85.0 [`#6857`](https://github.com/opengovsg/FormSG/pull/6857)
+- fix: add validation check for SGID_MyInfo [`c5e6a70`](https://github.com/opengovsg/FormSG/commit/c5e6a70764d5229a36985b363cc4695e49dfad6d)
+
+#### [v6.85.0](https://github.com/opengovsg/FormSG/compare/v6.84.0...v6.85.0)
+
+> 30 October 2023
+
+- fix(workspaces): remove form from collab workspace [`#6843`](https://github.com/opengovsg/FormSG/pull/6843)
+- feat(workspaces): folders [`#6856`](https://github.com/opengovsg/FormSG/pull/6856)
+- fix: use secret to sign and verify sgid jwt [`#6845`](https://github.com/opengovsg/FormSG/pull/6845)
+- fix: conditionally render POCDEX login [`#6850`](https://github.com/opengovsg/FormSG/pull/6850)
+- chore(deps-dev): bump browserify-sign from 4.2.1 to 4.2.2 in /frontend [`#6853`](https://github.com/opengovsg/FormSG/pull/6853)
+- chore(deps-dev): bump browserify-sign from 4.2.1 to 4.2.2 [`#6851`](https://github.com/opengovsg/FormSG/pull/6851)
+- build: merge release v6.84.0 into develop [`#6847`](https://github.com/opengovsg/FormSG/pull/6847)
+- build: release v6.84.0 [`#6846`](https://github.com/opengovsg/FormSG/pull/6846)
+- chore: bump version to v6.85.0 [`80c1645`](https://github.com/opengovsg/FormSG/commit/80c1645309dfe0df0604d635b21c767f56088f25)
+
 #### [v6.84.0](https://github.com/opengovsg/FormSG/compare/v6.83.0...v6.84.0)
 
+> 26 October 2023
+
 - revert: "feat(workspaces): folders (#6639)" [`#6844`](https://github.com/opengovsg/FormSG/pull/6844)
 - fix: mobileno is always editable [`#6841`](https://github.com/opengovsg/FormSG/pull/6841)
 - feat(workspaces): folders [`#6639`](https://github.com/opengovsg/FormSG/pull/6639)
@@ -21,6 +42,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore(deps): [Snyk] Upgrade bson from 5.1.0 to 5.4.0 [`#6661`](https://github.com/opengovsg/FormSG/pull/6661)
 - chore(deps-dev): bump @babel/traverse from 7.22.5 to 7.23.2 [`#6811`](https://github.com/opengovsg/FormSG/pull/6811)
 - build: release v6.83.0 [`#6823`](https://github.com/opengovsg/FormSG/pull/6823)
+- chore: bump version to v6.84.0 [`916bf22`](https://github.com/opengovsg/FormSG/commit/916bf229916f774686707b3c46eae55735760314)
 
 #### [v6.83.0](https://github.com/opengovsg/FormSG/compare/v6.82.0...v6.83.0)
 

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.84.0",
+  "version": "6.85.0",
   "homepage": ".",
   "private": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "6.84.0",
+  "version": "6.85.1",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <[email protected]>"

src/app/models/form.server.model.ts

@@ -469,7 +469,7 @@ const compileFormModel = (db: Mongoose): IFormModel => {
           } else if (
             this.responseMode === FormResponseMode.Encrypt &&
             // MyInfo is not available for storage mode
-            v === FormAuthType.MyInfo
+            (v === FormAuthType.MyInfo || v === FormAuthType.SGID_MyInfo)
           ) {
             return FormAuthType.NIL
           } else {