@plusscommunities/pluss-core-app 6.0.1 → 6.0.3-auth.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-core-app",
-  "version": "6.0.1",
+  "version": "6.0.3-auth.0",
   "description": "Core extension package for Pluss Communities platform",
   "main": "dist/module/index.js",
   "module": "dist/module/index.js",
@@ -15,6 +15,9 @@
     "patch": "npm version patch",
     "betaupload": "npm run build && npm publish --access public --tag beta",
     "betaupload:p": "npm run betapatch && npm run betaupload",
+    "authpatch": "npm version prepatch --preid=auth",
+    "authupload": "npm i && npm i && npm publish --access public --tag auth",
+    "authupload:p": "npm run authpatch && npm run authupload",
     "upload": "npm run build && npm publish --access public",
     "upload:p": "npm run patch && npm run upload"
   },

package/src/apis/fileActions.js

@@ -1,41 +1,34 @@
-import mime from 'mime-types';
-import { Storage } from 'aws-amplify';
+import Axios from 'axios';
 import { getUrl, generateImageName, randomString } from '../helper';
 import { authedFunction } from '../session';
-import Config from '../config';
 
 export const fileActions = {
+  getPresignedUrl: async (filename, contentType) => {
+    // const newFilename = filename.replace(/[^a-z0-9+.]+/gi, '').toLowerCase();
+    const signedUrlRes = await authedFunction({
+      method: 'GET',
+      url: getUrl('media', 'get/presignedurl', { filename, contentType }),
+    });
+    return signedUrlRes.data;
+  },
   getUploadUrl: (userId, fileName) => {
     const newFilename = fileName.replace(/[^a-z0-9+.]+/gi, '').toLowerCase();
     return `uploads/users/${userId}/public/${randomString()}/${newFilename}`;
   },
-  uploadUserMediaWithProgress: async (imageUri, url, progressCallback = null) => {
-    const blob = await fileActions.imageToBlob(imageUri);
-    return fileActions.uploadBlobAWS(Config.env.awsUploadsBucket, url, blob, '', progressCallback);
+  uploadUserMediaWithProgress: async (blob, url, progressCallback = null) => {
+    return fileActions.uploadBlobAWS(url, blob, progressCallback);
   },
-  // uploadUserMedia: async (userId, image, fileName) => {
-  //   const blob = await fileActions.imageToBlob(image.uri);
-  //   const url = fileActions.getUploadUrl(userId, fileName);
-  //   return fileActions.uploadBlobAWS(Config.env.awsUploadsBucket, url, blob);
-  // },
-  // uploadSignatureImage: async (image, name) => {
-  //   const blob = await fileActions.imageToBlob(image);
-  //   const newImageName = generateImageName(name, 'signature.png');
-  //   return fileActions.uploadBlobAWS(Config.env.awsStorageBucket, newImageName, blob, 'images/');
-  // },
   imageToBlob: async imageUri => {
     const response = await fetch(imageUri);
     return response.blob();
   },
-  uploadBlobAWS: (bucket, uri, blob, prefix = '', progressCallback = null) => {
-    const imageName = prefix ? uri.replace(/^.*[\\/]/, '') : uri;
-    const fileType = mime.lookup(uri);
-    const access = {
-      level: 'public',
-      bucket,
-      contentType: fileType,
-      customPrefix: { public: '' },
-      progressCallback: progress =>
+  uploadBlobAWS: async (uri, blob, progressCallback = null) => {
+    return Axios.put(uri, blob, {
+      headers: {
+        'Content-Type': blob.type,
+      },
+      transformRequest: d => d,
+      onUploadProgress: progress =>
         progressCallback &&
         progressCallback({
           uri,
@@ -43,8 +36,7 @@ export const fileActions = {
           total: progress.total,
           percentage: `${Math.floor((progress.loaded / progress.total) * 100)}%`,
         }),
-    };
-    return Storage.put(`${prefix}${imageName}`, blob, access);
+    });
   },
   getStockPhotos: async () => {
     const response = await authedFunction({

package/src/components/ImageUploader.js

@@ -142,23 +142,25 @@ class ImageUploader extends Component {
     let uploadUri;
     try {
       const fileName = `${getValueOrDefault(this.props.fileName, DEFAULT_IMAGE_NAME)}.${DEFULAT_IMAGE_TYPE}`;
-      uploadUri = fileActions.getUploadUrl(this.props.userId, fileName);
 
-      this.props.onUploadStarted(uploadUri, imageUri);
       this.hideUploadMenu();
 
       const resized = await this.resizeImageAsync(imageUri);
+      const blob = await fileActions.imageToBlob(resized.uri);
+      const presignedUriRes = await fileActions.getPresignedUrl(_.last(resized.uri.split('/')), blob.type);
+      uploadUri = presignedUriRes.key;
+      this.props.onUploadStarted(uploadUri, imageUri);
       if (this.props.onlySelectImage) {
         this.props.onImageSelected(resized, fileName);
         return;
       }
 
-      const res = await fileActions.uploadUserMediaWithProgress(resized.uri, uploadUri, progress => {
+      const uploadResult = await fileActions.uploadUserMediaWithProgress(blob, presignedUriRes.url, progress => {
         if (this.props.onUploadProgress) this.props.onUploadProgress(progress);
       });
 
-      this.props.onUploadSuccess(Config.env.baseUploadsUrl + res.key, uploadUri);
-      console.log('upload success', Config.env.baseUploadsUrl + res.key);
+      this.props.onUploadSuccess(Config.env.baseUploadsUrl + uploadUri, uploadUri);
+      console.log('upload success', Config.env.baseUploadsUrl + uploadUri);
     } catch (e) {
       console.log('handleImagePicked error', e);
       this.props.onUploadFailed(uploadUri);
@@ -170,7 +172,6 @@ class ImageUploader extends Component {
     const imagesUploaded = imagesSelected.map(image => {
       const fileName = `${getValueOrDefault(this.props.fileName, DEFAULT_IMAGE_NAME)}.${DEFULAT_IMAGE_TYPE}`;
       const uploadUri = fileActions.getUploadUrl(this.props.userId, fileName);
-      if (!this.props.onlySelectImage) this.props.onUploadStarted(uploadUri, image.uri);
       return { imageUri: image.uri, uploadUri, fileName };
     });
     this.hideUploadMenu();
@@ -181,16 +182,21 @@ class ImageUploader extends Component {
       const { imageUri, uploadUri, fileName } = image;
       try {
         const resized = await this.resizeImageAsync(imageUri);
+        const blob = await fileActions.imageToBlob(resized.uri);
         if (this.props.onlySelectImage) {
           this.props.onImageSelected(resized, fileName);
           return;
         }
+        const presignedUriRes = await fileActions.getPresignedUrl(_.last(resized.uri.split('/')), blob.type);
+        const uploadUri = presignedUriRes.key;
+        if (!this.props.onlySelectImage) this.props.onUploadStarted(uploadUri, imageUri);
 
-        const res = await fileActions.uploadUserMediaWithProgress(resized.uri, uploadUri, progress => {
+        const uploadResult = await fileActions.uploadUserMediaWithProgress(blob, presignedUriRes.url, progress => {
           if (this.props.onUploadProgress) this.props.onUploadProgress(progress);
         });
-        this.props.onUploadSuccess(Config.env.baseUploadsUrl + res.key, uploadUri);
-        console.log('upload success', Config.env.baseUploadsUrl + res.key);
+
+        this.props.onUploadSuccess(Config.env.baseUploadsUrl + uploadUri, uploadUri);
+        console.log('upload success', Config.env.baseUploadsUrl + uploadUri);
       } catch (e) {
         console.log('handleMultiImagePicked error', e);
         this.props.onUploadFailed(uploadUri);
@@ -203,7 +209,7 @@ class ImageUploader extends Component {
     try {
       const fileType = uri.substring(uri.lastIndexOf('.') + 1);
       const fileName = `${getValueOrDefault(this.props.fileName, DEFAULT_VIDEO_NAME)}.${fileType}`;
-      uploadUri = fileActions.getUploadUrl(this.props.userId, fileName);
+      uploadUri = await fileActions.getPresignedUrl(fileName);
 
       this.props.onUploadStarted(uploadUri, uri);
       this.hideUploadMenu();
@@ -266,6 +272,7 @@ class ImageUploader extends Component {
   };
 
   isEditingEnabled = () => {
+    return false;
     return !this.props.multiple && !this.props.allowVideo && getValueOrDefault(this.props.allowsEditing, DEFAULT_ALLOWS_EDITING);
   };
 

package/src/config.js

@@ -18,6 +18,11 @@ const CoreConfig = {
     strings: {},
     newEventDefaults: '',
     defaultAllowComments: true,
+    AuthStrategy: {
+      getAccessToken: async () => null,
+      getCurrentUserId: async () => null,
+      hasActiveSession: async () => false,
+    },
   },
   init: (environment, navigation) => {
     CoreConfig.env = environment;

package/src/session.js

@@ -1,10 +1,10 @@
 import _ from 'lodash';
 import axios from 'axios';
 import { Auth } from 'aws-amplify';
+import Config from './config';
 
 export const getSessionTokenAWS = async prefix => {
-  const data = await Auth.currentSession();
-  const token = data.accessToken.jwtToken;
+  const token = await Config.env.AuthStrategy.getAccessToken();
   if (_.isUndefined(prefix)) return token;
   return `${prefix} ${token}`;
 };