attempt to fix file upload for Post

Author: tima101

Diff for: api/server/api/public.ts

@@ -6,7 +6,7 @@ import Invitation from '../models/Invitation';
 const router = express.Router();
 
 router.get('/get-user', (req, res) => {
-  console.log(`req.user inside Express route: ${req.user}`);
+  console.log(`req.user ${req.user}`);
   res.json({ user: req.user || null });
 });
 

Diff for: api/server/server.ts

@@ -32,7 +32,11 @@ mongoose.connect(dev ? process.env.MONGO_URL_TEST : process.env.MONGO_URL, optio
 const server = express();
 
 server.use(
-  cors({ origin: dev ? process.env.URL_APP : process.env.PRODUCTION_URL_APP, credentials: true }),
+  cors({
+    origin: dev ? process.env.URL_APP : process.env.PRODUCTION_URL_APP,
+    credentials: true,
+    methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',
+  }),
 );
 
 server.use(helmet());

Diff for: app/components/posts/PostEditor.tsx

@@ -48,9 +48,8 @@ type State = { htmlContent: string };
 
 class PostEditor extends React.Component<Props, State> {
   public state = {
-      htmlContent: '',
-    };
-  
+    htmlContent: '',
+  };
 
   public render() {
     const { htmlContent } = this.state;
@@ -97,11 +96,7 @@ class PostEditor extends React.Component<Props, State> {
             id="upload-file"
             type="file"
             style={{ display: 'none' }}
-            onChange={(event) => {
-              const file = event.target.files[0];
-              event.target.value = '';
-              this.uploadFile(file);
-            }}
+            onChange={this.uploadFile}
           />
         </div>
         <br />
@@ -228,14 +223,17 @@ class PostEditor extends React.Component<Props, State> {
     this.setState({ htmlContent });
   };
 
-  private uploadFile = async (file: File) => {
+  private uploadFile = async () => {
+    const fileElement = document.getElementById('upload-file') as HTMLFormElement;
+    const file = fileElement.files[0];
+
     if (!file) {
       notify('No file selected.');
       return;
     }
 
     if (!file.type || (!file.type.startsWith('image/') && file.type !== 'application/pdf')) {
-      notify('Wrong file.');
+      notify('Wrong file type.');
       return;
     }
 
@@ -245,10 +243,12 @@ class PostEditor extends React.Component<Props, State> {
     NProgress.start();
 
     const bucket = process.env.BUCKET_FOR_POSTS;
-    const prefix = `${currentTeam.slug}`;
+    const prefix = `team-${currentTeam.slug}`;
     const fileName = file.name;
     const fileType = file.type;
 
+    console.log(bucket);
+
     try {
       const responseFromApiServerForUpload = await getSignedRequestForUploadApiMethod({
         fileName,
@@ -267,6 +267,7 @@ class PostEditor extends React.Component<Props, State> {
         await uploadFileUsingSignedPutRequestApiMethod(
           resizedFile,
           responseFromApiServerForUpload.signedRequest,
+          { 'Cache-Control': 'max-age=2592000' },
         );
 
         fileUrl = responseFromApiServerForUpload.url;
@@ -280,7 +281,10 @@ class PostEditor extends React.Component<Props, State> {
             <img style="max-width: ${finalWidth}; width:100%" src="${fileUrl}" alt="Async" class="s3-image" />
           </div>`;
       } else {
-        await uploadFileUsingSignedPutRequestApiMethod(file, responseFromApiServerForUpload.signedRequest);
+        await uploadFileUsingSignedPutRequestApiMethod(
+          file,
+          responseFromApiServerForUpload.signedRequest,
+        );
 
         fileUrl = responseFromApiServerForUpload.url;
         imageMarkdown = `[${file.name}](${fileUrl})`;

Diff for: app/pages/your-settings.tsx

@@ -52,11 +52,7 @@ class YourSettings extends React.Component<Props, State> {
           <h3>Your Settings</h3>
           <h4 style={{ marginTop: '40px' }}>Your account</h4>
           <div>
-            <i
-              className="material-icons"
-              color="action"
-              style={{ verticalAlign: 'text-bottom' }}
-            >
+            <i className="material-icons" color="action" style={{ verticalAlign: 'text-bottom' }}>
               done
             </i>{' '}
             {currentUser.isSignedupViaGoogle
@@ -132,7 +128,7 @@ class YourSettings extends React.Component<Props, State> {
     if (redirectMessage) {
       notify(redirectMessage);
     }
-  };
+  }
 
   private onSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault();

Diff for: lambda/handler.ts

@@ -77,10 +77,10 @@ export const sendEmailForNewPost = async (event) => {
   const response = {
     statusCode: 200,
     headers: {
-      "Access-Control-Allow-Headers" : "Content-Type",
-      "Access-Control-Allow-Origin": dev ? process.env.URL_APP : process.env.PRODUCTION_URL_APP,
-      "Access-Control-Allow-Methods": "OPTIONS,POST,GET",
-      "Access-Control-Allow-Credentials": "true",
+      'Access-Control-Allow-Headers': 'Content-Type',
+      'Access-Control-Allow-Origin': dev ? process.env.URL_APP : process.env.PRODUCTION_URL_APP,
+      'Access-Control-Allow-Methods': 'OPTIONS,POST,GET',
+      'Access-Control-Allow-Credentials': 'true',
     },
     body: JSON.stringify({
       message: 'Email notification was sent!',