refactor: move src/types/api/auth to shared/types/form/form_auth (#2510)

opengovsg · Aug 4, 2021 · f428b93 · f428b93
1 parent 97eb1cc
commit f428b93
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/src/types/api/auth.ts → shared/types/form/form_auth.ts b/src/types/api/auth.ts → shared/types/form/form_auth.ts
diff --git a/shared/types/form/index.ts b/shared/types/form/index.ts
@@ -0,0 +1,5 @@
+export * from './form'
+export * from './form_auth'
+export * from './form_feedback'
+export * from './form_logic'
+export * from './form_logo'
diff --git a/src/public/services/EncryptionService.ts b/src/public/services/EncryptionService.ts
@@ -1,3 +1,4 @@
+import { BasicField } from '../../../shared/types/field'
 import {
   AttachmentResponse,
   CheckboxResponse,
@@ -19,7 +20,6 @@ import {
   UenResponse,
   YesNoResponse,
 } from '../../../shared/types/response'
-import { BasicField } from '../../types'
 
 import { FormSgSdk } from './FormSgSdkService'
 

diff --git a/src/public/services/PublicFormAuthService.ts b/src/public/services/PublicFormAuthService.ts
@@ -1,11 +1,11 @@
 import axios from 'axios'
 
-import { AuthType } from '../../types'
 import {
+  FormAuthType,
   PublicFormAuthLogoutDto,
   PublicFormAuthRedirectDto,
   PublicFormAuthValidateEsrvcIdDto,
-} from '../../types/api'
+} from '../../../shared/types/form'
 
 // Exported for testing
 export const PUBLIC_FORMS_ENDPOINT = '/api/v3/forms'
@@ -35,7 +35,7 @@ export const validateEsrvcId = (
 }
 
 export const logoutOfSpcpSession = (
-  authType: AuthType,
+  authType: FormAuthType,
 ): Promise<PublicFormAuthLogoutDto> => {
   return axios
     .get<PublicFormAuthLogoutDto>(

diff --git a/src/public/services/UpdateFormService.ts b/src/public/services/UpdateFormService.ts
@@ -8,18 +8,18 @@ import {
 import {
   AdminFormDto,
   AdminFormViewDto,
+  EndPageUpdateDto,
   FormSettings,
+  LogicDto,
+  PermissionsUpdateDto,
   SettingsUpdateDto,
-} from '../../../shared/types/form/form'
-import { LogicDto } from '../../../shared/types/form/form_logic'
+  StartPageUpdateDto,
+} from '../../../shared/types/form'
 import { SubmissionResponseDto } from '../../../shared/types/submission'
 import {
   EmailSubmissionDto,
   EncryptSubmissionDto,
-  EndPageUpdateDto,
   FormUpdateParams,
-  PermissionsUpdateDto,
-  StartPageUpdateDto,
 } from '../../types/api'
 import { createEmailSubmissionFormData } from '../utils/submission'
 

diff --git a/src/types/api/form_auth.ts b/src/types/api/form_auth.ts
@@ -0,0 +1 @@
+export * from '../../../shared/types/form/form_auth'
diff --git a/src/types/api/index.ts b/src/types/api/index.ts
@@ -1,5 +1,5 @@
 export * from './core'
-export * from './auth'
+export * from './form_auth'
 export * from './field'
 export * from './form'
 export * from './billing'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export * from '../../../shared/types/form/form_auth'