merge branch develop into 336_handle_data_from_asset

Signed-off-by: Roy Scheeren <[email protected]>

apps/envited.ascs.digital/common/asset/validateAndCreateMetadata.ts

@@ -220,9 +220,9 @@ export const _validateAndCreateMetadata =
   }) =>
   async (byteArray: Uint8Array, asset: Asset) => {
     try {
-      console.log("2a")
+      console.log('2a')
       const { conforms, reports, data } = await getShaclSchemaAndValidate(byteArray)
-      console.log("2b")
+      console.log('2b')
       const assetCID = await createFilename(byteArray)
       const domainMetadataCID = await createFilename(data.domainMetadata)
 
@@ -231,18 +231,18 @@ export const _validateAndCreateMetadata =
       if (!user) {
         throw new Error('User not found')
       }
-      console.log("2c")
+      console.log('2c')
       const [issuer] = await connection.getUserWithProfileById(user.issuerId)
 
       if (!issuer) {
         throw new Error('Issuer not found')
       }
-      console.log("2d")
+      console.log('2d')
       const files = await getFilesAsPathAndByteArrayFromManifest(byteArray, data.manifest)
       const visualization = filter(propEq('visualization', 'type'))(files.publicUser) as ExtractedFile[]
       const visualizationFiles = await getAllFilenamesFromFiles(visualization)
       const displayUri = find(propEq('visualization', 'type'))(visualizationFiles) as ExtractedFileWithCID
-      console.log("2e")
+      console.log('2e')
       const modifiedManifest = createModifiedManifest({
         assetCID,
         domainMetadataCID,
@@ -262,7 +262,7 @@ export const _validateAndCreateMetadata =
         manifest: data.manifest,
         domainMetadata: data.domainMetadata,
       })
-      console.log("2f")
+      console.log('2f')
       return {
         conforms,
         reports,

apps/envited.ascs.digital/modules/UploadedAssets/UploadedAssets.actions.ts

@@ -1,8 +1,7 @@
 'use server'
 
-import { AssetStatus } from 'apps/envited.ascs.digital/common/types'
-
 import { getMintParams, updateAssetStatus, uploadTokenMetadata } from '../../common/serverActions'
+import { AssetStatus } from '../../common/types'
 import { internalServerErrorError } from '../../common/utils'
 
 export async function uploadAssetTokenMetadata(id: string) {

apps/envited.ascs.digital/stacks/Envited.ts

@@ -82,6 +82,16 @@ export default function Envited({ stack }: StackContext) {
   })
   metadataBucket.cdk.bucket.grantRead(oai)
 
+  const ipfsBucket = new Bucket(stack, 'ipfs', {
+    cdk: {
+      bucket: {
+        accessControl: aws_s3.BucketAccessControl.PRIVATE,
+      },
+    },
+    cors: [s3CorsRule],
+  })
+  ipfsBucket.cdk.bucket.grantRead(oai)
+
   const assetsBucket = new Bucket(stack, 'assets', {
     notifications: {
       processAssetUpload: {
@@ -90,8 +100,9 @@ export default function Envited({ stack }: StackContext) {
           environment: {
             RDS_SECRET_ARN: rdsCluster.secret?.secretArn || '',
             NEXT_PUBLIC_METADATA_BUCKET_NAME: metadataBucket.bucketName,
+            NEXT_PUBLIC_IPFS_BUCKET_NAME: ipfsBucket.bucketName,
           },
-          permissions: [metadataBucket, 'secretsmanager:GetSecretValue'],
+          permissions: [ipfsBucket, metadataBucket, 'secretsmanager:GetSecretValue'],
           copyFiles: [{ from: 'common/aws/handlers/processAssetUpload/schemas' }],
           securityGroups: [sg],
           vpc,
@@ -106,7 +117,7 @@ export default function Envited({ stack }: StackContext) {
     },
     cors: [s3CorsRule],
   })
-  assetsBucket.attachPermissions([assetsBucket, metadataBucket])
+  assetsBucket.attachPermissions([assetsBucket, ipfsBucket, metadataBucket])
   metadataBucket.attachPermissions([metadataBucket, assetsBucket])
   assetsBucket.cdk.bucket.grantRead(oai)
 
@@ -140,6 +151,21 @@ export default function Envited({ stack }: StackContext) {
     ],
   })
 
+  const ipfsDistribution = new aws_cloudfront.CloudFrontWebDistribution(stack, 'ipfsDistribution', {
+    originConfigs: [
+      {
+        s3OriginSource: {
+          s3BucketSource: ipfsBucket.cdk.bucket,
+          originAccessIdentity: oai,
+        },
+        behaviors: [
+          { isDefaultBehavior: true },
+          { pathPattern: '/*', allowedMethods: aws_cloudfront.CloudFrontAllowedMethods.GET_HEAD },
+        ],
+      },
+    ],
+  })
+
   // Create the Next.js site
   const site = new NextjsSite(stack, 'envited_ascs_digital', {
     path: './',
@@ -196,5 +222,7 @@ export default function Envited({ stack }: StackContext) {
     AssetsDistributionId: assetsDistribution.distributionId,
     MetadataDistribution: metadataDistribution.distributionDomainName,
     MetadataDistributionId: metadataDistribution.distributionId,
+    IpfsDistribution: ipfsDistribution.distributionDomainName,
+    IpfsDistributionId: ipfsDistribution.distributionId,
   })
 }