Allow Url along with Uri on the API

Author: HugoGresse

functions/src/api/routes/file/downloadAndReuploadFilePOST.ts

@@ -3,7 +3,7 @@ import { Static, Type } from '@sinclair/typebox'
 import { uploadBufferToStorage } from './utils/uploadBufferToStorage'
 
 export const DownloadReuploadSchema = Type.Object({
-    url: Type.String({ format: 'uri' }),
+    url: Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' })]),
     filename: Type.Optional(Type.String()),
 })
 

functions/src/api/routes/sessionsSpeakers/sessionsSpeakers.ts

@@ -54,21 +54,21 @@ export const SpeakersSessionsType = Type.Object({
                     maxLength: MAX_STRING_LENGTH,
                 })
             ),
-            companyLogoUrl: Type.Optional(Type.String({ format: 'uri' })),
+            companyLogoUrl: Type.Optional(Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' })])),
             geolocation: Type.Optional(
                 Type.String({
                     maxLength: MAX_STRING_LENGTH,
                 })
             ),
-            photoUrl: Type.Optional(Type.String({ format: 'uri' })),
+            photoUrl: Type.Optional(Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' })])),
             socials: Type.Optional(
                 Type.Array(
                     Type.Object({
                         name: Type.String({
                             maxLength: MAX_STRING_LENGTH,
                         }),
                         icon: Type.Optional(Type.String()),
-                        link: Type.String({ format: 'uri' }),
+                        link: Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' })]),
                     })
                 )
             ),
@@ -119,9 +119,15 @@ export const SpeakersSessionsType = Type.Object({
                     maxLength: MAX_STRING_LENGTH,
                 })
             ),
-            presentationLink: Type.Optional(Type.Union([Type.String({ format: 'uri' }), Type.Null()])),
-            videoLink: Type.Optional(Type.Union([Type.String({ format: 'uri' }), Type.Null()])),
-            imageUrl: Type.Optional(Type.Union([Type.String({ format: 'uri' }), Type.Null()])),
+            presentationLink: Type.Optional(
+                Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' }), Type.Null()])
+            ),
+            videoLink: Type.Optional(
+                Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' }), Type.Null()])
+            ),
+            imageUrl: Type.Optional(
+                Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' }), Type.Null()])
+            ),
             tags: Type.Optional(
                 Type.Array(
                     Type.String({
@@ -153,8 +159,8 @@ export const SpeakersSessionsType = Type.Object({
             showInFeedback: Type.Optional(Type.Boolean()),
             hideTrackTitle: Type.Optional(Type.Boolean()),
             note: Type.Optional(Type.String()),
-            teaserVideoUrl: Type.Optional(Type.String({ format: 'uri' })),
-            teaserImageUrl: Type.Optional(Type.String({ format: 'uri' })),
+            teaserVideoUrl: Type.Optional(Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' })])),
+            teaserImageUrl: Type.Optional(Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' })])),
             teasingHidden: Type.Optional(Type.Boolean()),
         })
     ),

functions/src/api/routes/sponsors/addJobPostPOST.ts

@@ -10,7 +10,7 @@ export const TypeBoxJobPost = Type.Object({
     title: Type.String(),
     description: Type.String(),
     location: Type.String(),
-    externalLink: Type.String({ format: 'uri' }),
+    externalLink: Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' })]),
     category: Type.String({ enum: JOB_CATEGORIES }),
     salary: Type.Optional(Type.String()),
     requirements: Type.Optional(Type.Array(Type.String())),
@@ -23,7 +23,7 @@ export const TypeBoxSponsorJobPost = Type.Object({
     title: Type.String(),
     description: Type.String(),
     location: Type.String(),
-    externalLink: Type.String({ format: 'uri' }),
+    externalLink: Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' })]),
     category: Type.String({ enum: JOB_CATEGORIES }),
     salary: Type.Optional(Type.String()),
     requirements: Type.Optional(Type.Array(Type.String())),

functions/src/api/routes/sponsors/addSponsorsPOST.ts

@@ -8,8 +8,8 @@ export const TypeBoxSponsor = Type.Object({
     name: Type.String(),
     categoryId: Type.String(),
     categoryName: Type.String(),
-    website: Type.Optional(Type.String({ format: 'uri' })),
-    logoUrl: Type.Optional(Type.String({ format: 'uri' })),
+    website: Type.Optional(Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' })])),
+    logoUrl: Type.Optional(Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' })])),
 })
 
 export type SponsorType = Static<typeof TypeBoxSponsor>

functions/src/api/routes/sponsors/updateJobPostPUT.ts

@@ -8,7 +8,7 @@ export const TypeBoxUpdateJobPost = Type.Object({
     title: Type.String(),
     description: Type.String(),
     location: Type.String(),
-    externalLink: Type.String({ format: 'uri' }),
+    externalLink: Type.Union([Type.String({ format: 'uri' }), Type.String({ format: 'url' })]),
     category: Type.String({ enum: JOB_CATEGORIES }),
     salary: Type.Optional(Type.String()),
     requirements: Type.Optional(Type.Array(Type.String())),