diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 9a9260a..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: actions_on_main_branch -on: - pull_request_target: - types: - - opened - - synchronize - - reopened - branches: - - 'main' - -jobs: - job1: - name: check_adminA - runs-on: ubuntu-latest - env: - NAME_ADMIN: ashutoshspunyani99-tamu - steps: - - name: st1 - if: ${{ github.actor != env.NAME_ADMIN }} - run: | - echo "Actor is ${{ github.actor }}" - exit 1 - - name: st2 - if: ${{ github.actor == env.NAME_ADMIN }} - run: | - echo "Actor is ${{ github.actor }}" - echo "ok" diff --git a/packages/upload/package.json b/packages/upload/package.json index 9eab77a..0655b77 100644 --- a/packages/upload/package.json +++ b/packages/upload/package.json @@ -24,6 +24,7 @@ }, "dependencies": { "@aws-sdk/client-s3": "3.47.0", + "@fastify/cors": "^9.0.1", "@fastify/multipart": "^8.3.0", "@medihacks/prisma": "workspace:^", "fastify": "^4.28.1" diff --git a/packages/upload/src/filebase.ts b/packages/upload/src/filebase.ts index fdf021a..201fd3e 100644 --- a/packages/upload/src/filebase.ts +++ b/packages/upload/src/filebase.ts @@ -20,8 +20,7 @@ export const uploadFile = async ({ file, user }: { file: MultipartFile; user: Us Bucket: user.id, ContentType: file.mimetype }) - const out = await headObject({ fileName: file.filename, bucketName: user.id }) - return out + return headObject({ fileName: file.filename, bucketName: user.id }) } export const headObject = ({ bucketName, fileName }: { bucketName: string; fileName: string }) => diff --git a/packages/upload/src/server.ts b/packages/upload/src/server.ts index a2cd976..da79af1 100644 --- a/packages/upload/src/server.ts +++ b/packages/upload/src/server.ts @@ -4,11 +4,16 @@ import FastifyMultipart from '@fastify/multipart' import { isTokenValid } from './utils' import { uploadFile } from './filebase' import { prisma } from './prisma' +import FastifyCors from '@fastify/cors' const fastify = Fastify({ logger: true }) fastify.register(FastifyMultipart) +await fastify.register(FastifyCors, { + origin: true, + methods: ['POST'] +}) fastify.post('/upload', async (req, res) => { const token = (req.query as Record).token diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c2d17f4..9549213 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -133,6 +133,9 @@ importers: '@aws-sdk/client-s3': specifier: 3.47.0 version: 3.47.0(@aws-sdk/signature-v4-crt@3.609.0) + '@fastify/cors': + specifier: ^9.0.1 + version: 9.0.1 '@fastify/multipart': specifier: ^8.3.0 version: 8.3.0 @@ -2467,6 +2470,13 @@ packages: engines: {node: '>=14'} dev: false + /@fastify/cors@9.0.1: + resolution: {integrity: sha512-YY9Ho3ovI+QHIL2hW+9X4XqQjXLjJqsU+sMV/xFsxZkE8p3GNnYVFpoOxF7SsP5ZL76gwvbo3V9L+FIekBGU4Q==} + dependencies: + fastify-plugin: 4.5.1 + mnemonist: 0.39.6 + dev: false + /@fastify/deepmerge@1.3.0: resolution: {integrity: sha512-J8TOSBq3SoZbDhM9+R/u77hP93gz/rajSA+K2kGyijPpORPWUXHUpTaleoj+92As0S9uPRP7Oi8IqMf0u+ro6A==} dev: false @@ -6962,18 +6972,6 @@ packages: ms: 2.1.2 dev: true - /debug@4.3.5: - resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.2 - dev: false - /debug@4.3.5(supports-color@5.5.0): resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==} engines: {node: '>=6.0'} @@ -10854,6 +10852,12 @@ packages: ufo: 1.5.3 dev: false + /mnemonist@0.39.6: + resolution: {integrity: sha512-A/0v5Z59y63US00cRSLiloEIw3t5G+MiKz4BhX21FI+YBJXBOGW0ohFxTxO08dsOYlzxo87T7vGfZKYp2bcAWA==} + dependencies: + obliterator: 2.0.4 + dev: false + /modify-values@1.0.1: resolution: {integrity: sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==} engines: {node: '>=0.10.0'} @@ -10886,7 +10890,7 @@ packages: resolution: {integrity: sha512-ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA==} dependencies: bl: 4.1.0 - debug: 4.3.5 + debug: 4.3.5(supports-color@5.5.0) process-nextick-args: 2.0.1 transitivePeerDependencies: - supports-color @@ -10899,7 +10903,7 @@ packages: dependencies: commist: 1.1.0 concat-stream: 2.0.0 - debug: 4.3.5 + debug: 4.3.5(supports-color@5.5.0) duplexify: 4.1.3 help-me: 3.0.0 inherits: 2.0.4 @@ -11289,7 +11293,7 @@ packages: /number-allocator@1.0.14: resolution: {integrity: sha512-OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA==} dependencies: - debug: 4.3.5 + debug: 4.3.5(supports-color@5.5.0) js-sdsl: 4.3.0 transitivePeerDependencies: - supports-color @@ -11467,6 +11471,10 @@ packages: es-object-atoms: 1.0.0 dev: true + /obliterator@2.0.4: + resolution: {integrity: sha512-lgHwxlxV1qIg1Eap7LgIeoBWIMFibOjbrYPIPJZcI1mmGAI2m3lNYpK12Y+GBdPQ0U1hRwSord7GIaawz962qQ==} + dev: false + /oboe@2.1.5: resolution: {integrity: sha512-zRFWiF+FoicxEs3jNI/WYUrVEgA7DeET/InK0XQuudGHRg8iIob3cNPrJTKaz4004uaA9Pbe+Dwa8iluhjLZWA==} dependencies: