Attempting to fix build after #1389 was merged without it being updat…

…ed to the latest from main

* Some cleaning of PSA_ALLOW references too

README.md

@@ -144,9 +144,7 @@ DAG_CARGO_PASSWORD=<db-password>
 
 
 
-# Pinning services api, requires a PSA allow list for authoritzation
-# this is the user id in the database
-PSA_ALLOW=1
+# Pinning services api, requires a user to have the HasPsaAccess user_tag.
 ```
 
 Production vars should be set in Github Actions secrets.

packages/api/README.md

@@ -51,7 +51,6 @@ wrangler secret put CLUSTER_BASIC_AUTH_TOKEN --env production # Get from nft.sto
 wrangler secret put CLUSTER_SERVICE --env production # Which cluster should be used. Options 'IpfsCluster' / 'IpfsCluster2' / 'IpfsCluster3'
 wrangler secret put MAILCHIMP_API_KEY --env production # Get from mailchimp
 wrangler secret put LOGTAIL_TOKEN --env production # Get from Logtail
-wrangler secret put PSA_ALLOW --env production # CSV user ID list, get from 1password vault
 wrangler secret put METAPLEX_AUTH_TOKEN --env production # User ID meteplex endpoint should use (not required for dev)
 wrangler secret put S3_REGION --env production # e.g us-east-2 (not required for dev)
 wrangler secret put S3_ACCESS_KEY_ID --env production # Get from Amazon S3 (not required for dev)

packages/api/src/bindings.d.ts

@@ -24,7 +24,6 @@ declare global {
   const COMMITHASH: string
   const MAINTENANCE_MODE: Mode
   const METAPLEX_AUTH_TOKEN: string
-  const PSA_ALLOW: string
   const S3_ENDPOINT: string
   const S3_REGION: string
   const S3_ACCESS_KEY_ID: string

packages/api/src/middleware/psa.js

@@ -55,6 +55,8 @@ export function withPinningAuthorized(handler) {
     // TODO: we need withAuth middleware so we don't have to do this twice
     const { user } = await validate(event, ctx)
 
+    console.error('test user', JSON.stringify(user, null, 2))
+
     const authorized =
       hasTag(user, 'HasPsaAccess', 'true') &&
       !hasTag(user, 'HasAccountRestriction', 'true')

packages/api/test/scripts/helpers.js

@@ -102,15 +102,15 @@ export async function createTestUserWithFixedToken({
     tag: 'HasPsaAccess',
     value: 'true',
     reason: '',
-    inserted_at: '2/22/2022',
+    inserted_at: new Date().toISOString(),
   })
 
   await createUserTag({
     user_id: user.id,
     tag: 'HasAccountRestriction',
     value: 'false',
     reason: '',
-    inserted_at: '2/22/2022',
+    inserted_at: new Date().toISOString(),
   })
   return { token, userId: user.id, githubId: user.github_id }
 }