@plusscommunities/pluss-core-web 1.4.34-auth.0 → 1.4.34

package/dist/index.cjs.js

@@ -6,12 +6,12 @@ var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
 var _ = require('lodash');
 var axios = require('axios');
+var awsAmplify = require('aws-amplify');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var moment = require('moment');
 var React = require('react');
 var $ = require('jquery');
 var Cookies = require('js-cookie');
-var awsAmplify = require('aws-amplify');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _inherits = require('@babel/runtime/helpers/inherits');
@@ -79,75 +79,7 @@ var CoreConfig = {
     defaultAllowComments: true,
     makeApiKey: '',
     logo: '',
-    clientName: '',
-    AuthStrategy: {
-      getAccessToken: function () {
-        var _getAccessToken = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-          return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  return _context.abrupt("return", null);
-
-                case 1:
-                case "end":
-                  return _context.stop();
-              }
-            }
-          }, _callee);
-        }));
-
-        function getAccessToken() {
-          return _getAccessToken.apply(this, arguments);
-        }
-
-        return getAccessToken;
-      }(),
-      getCurrentUserId: function () {
-        var _getCurrentUserId = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-          return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
-            while (1) {
-              switch (_context2.prev = _context2.next) {
-                case 0:
-                  return _context2.abrupt("return", null);
-
-                case 1:
-                case "end":
-                  return _context2.stop();
-              }
-            }
-          }, _callee2);
-        }));
-
-        function getCurrentUserId() {
-          return _getCurrentUserId.apply(this, arguments);
-        }
-
-        return getCurrentUserId;
-      }(),
-      hasActiveSession: function () {
-        var _hasActiveSession = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
-          return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
-            while (1) {
-              switch (_context3.prev = _context3.next) {
-                case 0:
-                  return _context3.abrupt("return", false);
-
-                case 1:
-                case "end":
-                  return _context3.stop();
-              }
-            }
-          }, _callee3);
-        }));
-
-        function hasActiveSession() {
-          return _hasActiveSession.apply(this, arguments);
-        }
-
-        return hasActiveSession;
-      }()
-    }
+    clientName: ''
   },
   init: function init(environment) {
     CoreConfig.env = environment;
@@ -156,28 +88,29 @@ var CoreConfig = {
 
 var getSessionTokenAWS = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(prefix) {
-    var token;
+    var data, token;
     return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return CoreConfig.env.AuthStrategy.getAccessToken();
+            return awsAmplify.Auth.currentSession();
 
           case 2:
-            token = _context.sent;
+            data = _context.sent;
+            token = data.getAccessToken().getJwtToken();
 
             if (!___default['default'].isUndefined(prefix)) {
-              _context.next = 5;
+              _context.next = 6;
               break;
             }
 
             return _context.abrupt("return", token);
 
-          case 5:
+          case 6:
             return _context.abrupt("return", "".concat(prefix, " ").concat(token));
 
-          case 6:
+          case 7:
           case "end":
             return _context.stop();
         }
@@ -237,28 +170,30 @@ var unauthedFunction = function unauthedFunction(request) {
 };
 var getCurrentUserSub = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
+    var user;
     return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
             _context3.prev = 0;
             _context3.next = 3;
-            return CoreConfig.env.AuthStrategy.getCurrentUserId();
+            return awsAmplify.Auth.currentUserInfo();
 
           case 3:
-            return _context3.abrupt("return", _context3.sent);
+            user = _context3.sent;
+            return _context3.abrupt("return", user.id);
 
-          case 6:
-            _context3.prev = 6;
+          case 7:
+            _context3.prev = 7;
             _context3.t0 = _context3["catch"](0);
             return _context3.abrupt("return", null);
 
-          case 9:
+          case 10:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3, null, [[0, 6]]);
+    }, _callee3, null, [[0, 7]]);
   }));
 
   return function getCurrentUserSub() {
@@ -267,19 +202,19 @@ var getCurrentUserSub = /*#__PURE__*/function () {
 }();
 var checkLoggedIn = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(self) {
-    var isLoggedIn;
+    var user;
     return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
             _context4.prev = 0;
             _context4.next = 3;
-            return CoreConfig.env.AuthStrategy.hasActiveSession();
+            return awsAmplify.Auth.currentAuthenticatedUser();
 
           case 3:
-            isLoggedIn = _context4.sent;
+            user = _context4.sent;
 
-            if (!isLoggedIn) {
+            if (___default['default'].isUndefined(user) || user == null || user.username == null) {
               console.log('redirecting to login');
               self.props.history.push('/login');
             }
@@ -798,11 +733,20 @@ var getExtension = function getExtension(url) {
   return fileSplit[fileSplit.length - 1].toLowerCase();
 };
 
+var isVideo = function isVideo(url) {
+  var extension = getExtension(url);
+  return ['mov', 'mp4'].includes(extension);
+};
+
 var get1400 = function get1400(url) {
   if (!url) {
     return url;
   }
 
+  if (isVideo(url)) {
+    return 'https://pluss60-demo-uploads.s3.ap-southeast-2.amazonaws.com/uploads/users/ap-southeast-2:97769b56-25ec-41c0-a73c-6c2c4140f629/public/9d0bbec64614b1ed654a03f7e7/movie.jpg';
+  }
+
   if (url.indexOf('https://plussprdstorage.blob.core.windows.net/') !== -1) {
     return url.replace('https://plussprdstorage.blob.core.windows.net/', 'https://plusscdn.azureedge.net/');
   }
@@ -858,6 +802,10 @@ var getThumb300 = function getThumb300(url) {
     return url;
   }
 
+  if (isVideo(url)) {
+    return 'https://pluss60-demo-uploads.s3.ap-southeast-2.amazonaws.com/uploads/users/ap-southeast-2:97769b56-25ec-41c0-a73c-6c2c4140f629/public/9d0bbec64614b1ed654a03f7e7/movie.jpg';
+  }
+
   if (url.indexOf('https://plussprdstorage.blob.core.windows.net/') !== -1) {
     return url.replace('https://plussprdstorage.blob.core.windows.net/', 'https://plusscdn.azureedge.net/');
   }
@@ -884,11 +832,6 @@ var getThumb300 = function getThumb300(url) {
   return url;
 };
 
-var isVideo = function isVideo(url) {
-  var extension = getExtension(url);
-  return ['mov', 'mp4'].includes(extension);
-};
-
 var getFirstName = function getFirstName(string) {
   if (___default['default'].isEmpty(string)) {
     return '';
@@ -1711,34 +1654,31 @@ function CanvasImageUploader(options) {
 var fileActions = {
   uploadMediaAsync: function () {
     var _uploadMediaAsync = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(file, filename) {
-      var newFilename, signedUrlRes, baseUploadsUrl;
+      var newFilename, userId, url, _Config$env, baseUploadsUrl, uploadBucket;
+
       return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               newFilename = filename.replace(/[^a-z0-9+.]+/gi, '').toLowerCase();
               _context.next = 3;
-              return authedFunction({
-                method: 'GET',
-                url: getUrl('media', 'get/presignedurl', {
-                  filename: newFilename
-                })
-              });
+              return getCurrentUserSub();
 
             case 3:
-              signedUrlRes = _context.sent;
-              _context.next = 6;
-              return axios__default['default'].put(signedUrlRes.data.url, file, {
-                headers: {
-                  'Content-Type': file.type
-                }
+              userId = _context.sent;
+              url = "uploads/users/".concat(userId, "/public/").concat(randomString(), "/").concat(newFilename);
+              _Config$env = CoreConfig.env, baseUploadsUrl = _Config$env.baseUploadsUrl, uploadBucket = _Config$env.uploadBucket;
+              _context.next = 8;
+              return awsAmplify.Storage.put(url, file, {
+                level: 'public',
+                bucket: uploadBucket
               });
 
-            case 6:
-              baseUploadsUrl = CoreConfig.env.baseUploadsUrl;
-              return _context.abrupt("return", "".concat(baseUploadsUrl).concat(signedUrlRes.data.key));
-
             case 8:
+              console.log('uploaded file', "".concat(baseUploadsUrl).concat(url));
+              return _context.abrupt("return", "".concat(baseUploadsUrl).concat(url));
+
+            case 10:
             case "end":
               return _context.stop();
           }
@@ -1752,15 +1692,6 @@ var fileActions = {
 
     return uploadMediaAsync;
   }(),
-  // uploadMediaAsync: async (file, filename) => {
-  //   const newFilename = filename.replace(/[^a-z0-9+.]+/gi, '').toLowerCase();
-  //   const userId = await getCurrentUserSub();
-  //   const url = `uploads/users/${userId}/public/${randomString()}/${newFilename}`;
-  //   const { baseUploadsUrl, uploadBucket } = Config.env;
-  //   await Storage.put(url, file, { level: 'public', bucket: uploadBucket });
-  //   console.log('uploaded file', `${baseUploadsUrl}${url}`);
-  //   return `${baseUploadsUrl}${url}`;
-  // },
   // readBase64: async (file) => {
   //   return new Promise((resolve, reject) => {
   //     var reader = new FileReader();
@@ -1774,14 +1705,6 @@ var fileActions = {
   //     };
   //   });
   // },
-  getPresignedUrl: function getPresignedUrl(filename) {
-    return authedFunction({
-      method: 'GET',
-      url: getUrl('media', 'get/presignedurl', {
-        filename: filename
-      })
-    });
-  },
   compressImage: function compressImage(file, maxSize, quality, noCompress) {
     return new Promise(function (resolve, reject) {
       if (noCompress) {
@@ -4228,6 +4151,26 @@ var Comment = /*#__PURE__*/function (_Component) {
   }
 
   _createClass__default['default'](Comment, [{
+    key: "renderImage",
+    value: function renderImage(image) {
+      if (___default['default'].isEmpty(image)) {
+        return null;
+      }
+
+      return /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "imageGrid"
+      }, /*#__PURE__*/React__default['default'].createElement("a", {
+        href: image,
+        target: "_blank",
+        rel: "noopener noreferrer"
+      }, /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "imageGrid_image",
+        style: {
+          backgroundImage: "url('".concat(get1400(image), "')")
+        }
+      })));
+    }
+  }, {
     key: "renderComment",
     value: function renderComment() {
       var comment = this.props.comment;
@@ -4236,7 +4179,7 @@ var Comment = /*#__PURE__*/function (_Component) {
         className: "comment"
       }, /*#__PURE__*/React__default['default'].createElement("p", {
         className: "comment_text"
-      }, toParagraphed(comment.Comment)), /*#__PURE__*/React__default['default'].createElement("div", {
+      }, toParagraphed(comment.Comment)), this.renderImage(comment.Image), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "comment_bottom"
       }, /*#__PURE__*/React__default['default'].createElement(ProfilePic, {
         className: "comment_profilePic",
@@ -5276,7 +5219,7 @@ var mapStateToProps$5 = function mapStateToProps() {
 };
 
 var FileInput = reactRedux.connect(mapStateToProps$5, {}, null, {
-  forwardRef: true
+  withRef: true
 })(FileInputComponent);
 
 function ownKeys$e(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
@@ -6985,6 +6928,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
     value: function renderLibraryImage(image, index, allowDelete) {
       var _this7 = this;
 
+      console.log(image);
       var classes = 'imageInput imageInput-hasImage imageInput-libraryImage';
 
       if (image.Selected) {
@@ -7383,7 +7327,7 @@ var mapStateToProps$2 = function mapStateToProps(state) {
 };
 
 var ImageInput = reactRedux.connect(mapStateToProps$2, {}, null, {
-  forwardRef: true
+  withRef: true
 })(ImageInputComponent);
 
 function _createSuper$m(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$m(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
@@ -9988,7 +9932,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
 var toExport = reactRedux.connect(null, {
   setAuth: setAuth
 }, null, {
-  forwardRef: true
+  withRef: true
 })(AudienceSelector);
 
 function _createSuper$5(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$5(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }