replace eserviceid with formsg's if not supplied

Author: KenLSM

src/app/modules/form/public-form/public-form.controller.ts

@@ -31,7 +31,7 @@ import { MyInfoService } from '../../myinfo/myinfo.service'
 import {
   createMyInfoLoginCookie,
   extractAuthCode,
-  validateMyInfoForm,
+  getMyInfoEserviceIdInForm,
 } from '../../myinfo/myinfo.util'
 import { SGIDMyInfoData } from '../../sgid/sgid.adapter'
 import {
@@ -647,9 +647,9 @@ export const _handleFormAuthRedirect: ControllerHandler<
       formAuthType = form.authType
       switch (form.authType) {
         case FormAuthType.MyInfo:
-          return validateMyInfoForm(form).andThen((form) =>
+          return getMyInfoEserviceIdInForm(form).andThen(([form, eserviceId]) =>
             MyInfoService.createRedirectURL({
-              formEsrvcId: form.esrvcId,
+              formEsrvcId: eserviceId,
               formId,
               requestedAttributes: form.getUniqueMyInfoAttrs(),
               encodedQuery,

src/app/modules/myinfo/myinfo.controller.ts

@@ -18,7 +18,7 @@ import {
   MyInfoAuthCodeCookieState,
   MyInfoAuthCodeSuccessPayload,
 } from './myinfo.types'
-import { mapRedirectURLError, validateMyInfoForm } from './myinfo.util'
+import { getMyInfoEserviceIdInForm, mapRedirectURLError } from './myinfo.util'
 
 const logger = createLoggerWithLabel(module)
 
@@ -48,10 +48,10 @@ export const respondWithRedirectURL: ControllerHandler<
 > = async (req, res) => {
   const { formId, encodedQuery } = req.query
   return FormService.retrieveFormById(formId)
-    .andThen((form) => validateMyInfoForm(form))
-    .andThen((form) =>
+    .andThen((form) => getMyInfoEserviceIdInForm(form))
+    .andThen(([form, eserviceId]) =>
       MyInfoService.createRedirectURL({
-        formEsrvcId: form.esrvcId,
+        formEsrvcId: eserviceId,
         formId,
         requestedAttributes: form.getUniqueMyInfoAttrs(),
         encodedQuery,

src/app/modules/myinfo/myinfo.service.ts

@@ -61,12 +61,12 @@ import {
   createRelayState,
   getMyInfoAttr,
   getMyInfoAttributeConstantsList,
+  getMyInfoEserviceIdInForm,
   hashFieldValues,
   isMyInfoChildrenBirthRecords,
   isMyInfoLoginCookie,
   isMyInfoRelayState,
   logIfFieldValueNotInMyinfoList,
-  validateMyInfoForm,
 } from './myinfo.util'
 import getMyInfoHashModel from './myinfo_hash.model'
 
@@ -500,13 +500,13 @@ export class MyInfoServiceClass {
     | MyInfoFetchError
   > {
     const requestedAttributes = form.getUniqueMyInfoAttrs()
-    return validateMyInfoForm(form).asyncAndThen((form) =>
+    return getMyInfoEserviceIdInForm(form).asyncAndThen(([, eserviceId]) =>
       ResultAsync.fromPromise(
         this.#myInfoPersonBreaker
           .fire(
             accessToken,
             internalAttrListToScopes(requestedAttributes),
-            form.esrvcId,
+            eserviceId,
           )
           .then((response) => new MyInfoData(response)),
         (error) => {

src/app/modules/myinfo/myinfo.util.ts

@@ -314,26 +314,27 @@ export const createRelayState = (
   })
 
 /**
- * Validates that a form is a MyInfo form with an e-service ID
+ * returns form with an e-service ID if form is a MyInfo form
  * @param form Form to validate
  */
-export const validateMyInfoForm = <T extends IFormSchema>(
+export const getMyInfoEserviceIdInForm = <T extends IFormSchema>(
   form: T,
-): Result<MyInfoForm<T>, FormAuthNoEsrvcIdError | AuthTypeMismatchError> => {
-  if (!form.esrvcId) {
-    return err(new FormAuthNoEsrvcIdError(form._id))
-  }
-  if (isMyInfoFormWithEsrvcId(form)) {
-    return ok(form)
+): Result<
+  [MyInfoForm<T>, string],
+  FormAuthNoEsrvcIdError | AuthTypeMismatchError
+> => {
+  if (isMyInfoForm(form)) {
+    const esrvcId = form.esrvcId || spcpMyInfoConfig.spEsrvcId
+    return ok([form, esrvcId])
   }
   return err(new AuthTypeMismatchError(FormAuthType.MyInfo, form.authType))
 }
 
-// Typeguard to ensure that form has eserviceId and MyInfo authType
-const isMyInfoFormWithEsrvcId = <F extends IFormSchema>(
+// Typeguard to ensure that form is MyInfo authType
+const isMyInfoForm = <F extends IFormSchema>(
   form: F,
 ): form is MyInfoForm<F> => {
-  return form.authType === FormAuthType.MyInfo && !!form.esrvcId
+  return form.authType === FormAuthType.MyInfo
 }
 
 /**