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

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');
             }
@@ -1719,35 +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,
-                  contentType: file.type
-                })
-              });
+              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();
           }
@@ -1761,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();
@@ -1783,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) {
@@ -4237,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;
@@ -4245,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",
@@ -5285,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; }
@@ -6994,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) {
@@ -7392,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); }; }
@@ -8431,7 +8366,8 @@ var UserListing = /*#__PURE__*/function (_Component) {
             marginRight: 8,
             backgroundSize: 'cover',
             backgroundPosition: 'center',
-            backgroundImage: "url(".concat(this.getImage(), ")")
+            backgroundImage: "url(".concat(this.getImage(), ")"),
+            backgroundColor: COLOUR_BRANDING_MAIN
           },
           alt: "".concat(this.getText(), " Image")
         });
@@ -9997,7 +9933,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); }; }

package/dist/index.esm.js

@@ -2,12 +2,12 @@ import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
 import _ from 'lodash';
 import axios from 'axios';
+import { Auth, Storage } from 'aws-amplify';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import moment from 'moment';
 import React, { Component, PureComponent } from 'react';
 import $ from 'jquery';
 import Cookies from 'js-cookie';
-import { Storage } from 'aws-amplify';
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _inherits from '@babel/runtime/helpers/inherits';
@@ -49,75 +49,7 @@ var CoreConfig = {
     defaultAllowComments: true,
     makeApiKey: '',
     logo: '',
-    clientName: '',
-    AuthStrategy: {
-      getAccessToken: function () {
-        var _getAccessToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-          return _regeneratorRuntime.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( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-          return _regeneratorRuntime.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( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-          return _regeneratorRuntime.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;
@@ -126,28 +58,29 @@ var CoreConfig = {
 
 var getSessionTokenAWS = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(prefix) {
-    var token;
+    var data, token;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return CoreConfig.env.AuthStrategy.getAccessToken();
+            return Auth.currentSession();
 
           case 2:
-            token = _context.sent;
+            data = _context.sent;
+            token = data.getAccessToken().getJwtToken();
 
             if (!_.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();
         }
@@ -207,28 +140,30 @@ var unauthedFunction = function unauthedFunction(request) {
 };
 var getCurrentUserSub = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    var user;
     return _regeneratorRuntime.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 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() {
@@ -237,19 +172,19 @@ var getCurrentUserSub = /*#__PURE__*/function () {
 }();
 var checkLoggedIn = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(self) {
-    var isLoggedIn;
+    var user;
     return _regeneratorRuntime.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 Auth.currentAuthenticatedUser();
 
           case 3:
-            isLoggedIn = _context4.sent;
+            user = _context4.sent;
 
-            if (!isLoggedIn) {
+            if (_.isUndefined(user) || user == null || user.username == null) {
               console.log('redirecting to login');
               self.props.history.push('/login');
             }
@@ -1689,35 +1624,31 @@ function CanvasImageUploader(options) {
 var fileActions = {
   uploadMediaAsync: function () {
     var _uploadMediaAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(file, filename) {
-      var newFilename, signedUrlRes, baseUploadsUrl;
+      var newFilename, userId, url, _Config$env, baseUploadsUrl, uploadBucket;
+
       return _regeneratorRuntime.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,
-                  contentType: file.type
-                })
-              });
+              return getCurrentUserSub();
 
             case 3:
-              signedUrlRes = _context.sent;
-              _context.next = 6;
-              return axios.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 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();
           }
@@ -1731,15 +1662,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();
@@ -1753,14 +1675,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) {
@@ -4207,6 +4121,26 @@ var Comment = /*#__PURE__*/function (_Component) {
   }
 
   _createClass(Comment, [{
+    key: "renderImage",
+    value: function renderImage(image) {
+      if (_.isEmpty(image)) {
+        return null;
+      }
+
+      return /*#__PURE__*/React.createElement("div", {
+        className: "imageGrid"
+      }, /*#__PURE__*/React.createElement("a", {
+        href: image,
+        target: "_blank",
+        rel: "noopener noreferrer"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "imageGrid_image",
+        style: {
+          backgroundImage: "url('".concat(get1400(image), "')")
+        }
+      })));
+    }
+  }, {
     key: "renderComment",
     value: function renderComment() {
       var comment = this.props.comment;
@@ -4215,7 +4149,7 @@ var Comment = /*#__PURE__*/function (_Component) {
         className: "comment"
       }, /*#__PURE__*/React.createElement("p", {
         className: "comment_text"
-      }, toParagraphed(comment.Comment)), /*#__PURE__*/React.createElement("div", {
+      }, toParagraphed(comment.Comment)), this.renderImage(comment.Image), /*#__PURE__*/React.createElement("div", {
         className: "comment_bottom"
       }, /*#__PURE__*/React.createElement(ProfilePic, {
         className: "comment_profilePic",
@@ -5255,7 +5189,7 @@ var mapStateToProps$5 = function mapStateToProps() {
 };
 
 var FileInput = 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; }
@@ -6964,6 +6898,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) {
@@ -7362,7 +7297,7 @@ var mapStateToProps$2 = function mapStateToProps(state) {
 };
 
 var ImageInput = connect(mapStateToProps$2, {}, null, {
-  forwardRef: true
+  withRef: true
 })(ImageInputComponent);
 
 function _createSuper$m(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$m(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -8401,7 +8336,8 @@ var UserListing = /*#__PURE__*/function (_Component) {
             marginRight: 8,
             backgroundSize: 'cover',
             backgroundPosition: 'center',
-            backgroundImage: "url(".concat(this.getImage(), ")")
+            backgroundImage: "url(".concat(this.getImage(), ")"),
+            backgroundColor: COLOUR_BRANDING_MAIN
           },
           alt: "".concat(this.getText(), " Image")
         });
@@ -9967,7 +9903,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
 var toExport = connect(null, {
   setAuth: setAuth
 }, null, {
-  forwardRef: true
+  withRef: true
 })(AudienceSelector);
 
 function _createSuper$5(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$5(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }

package/dist/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/runtime/helpers/asyncToGenerator'), require('@babel/runtime/regenerator'), require('lodash'), require('axios'), require('@babel/runtime/helpers/defineProperty'), require('moment'), require('react'), require('jquery'), require('js-cookie'), require('aws-amplify'), require('@babel/runtime/helpers/classCallCheck'), require('@babel/runtime/helpers/createClass'), require('@babel/runtime/helpers/inherits'), require('@babel/runtime/helpers/possibleConstructorReturn'), require('@babel/runtime/helpers/getPrototypeOf'), require('react-fontawesome'), require('@babel/runtime/helpers/extends'), require('@babel/runtime/helpers/assertThisInitialized'), require('react-redux'), require('react-textarea-autosize'), require('@babel/runtime/helpers/toConsumableArray'), require('@babel/runtime/helpers/typeof'), require('react-dropzone'), require('react-router'), require('react-bootstrap'), require('@fortawesome/react-fontawesome'), require('@crello/react-lottie'), require('react-csv'), require('@babel/runtime/helpers/objectWithoutProperties'), require('react-color'), require('tinycolor2'), require('react-router-dom'), require('@fortawesome/free-solid-svg-icons')) :
-  typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/regenerator', 'lodash', 'axios', '@babel/runtime/helpers/defineProperty', 'moment', 'react', 'jquery', 'js-cookie', 'aws-amplify', '@babel/runtime/helpers/classCallCheck', '@babel/runtime/helpers/createClass', '@babel/runtime/helpers/inherits', '@babel/runtime/helpers/possibleConstructorReturn', '@babel/runtime/helpers/getPrototypeOf', 'react-fontawesome', '@babel/runtime/helpers/extends', '@babel/runtime/helpers/assertThisInitialized', 'react-redux', 'react-textarea-autosize', '@babel/runtime/helpers/toConsumableArray', '@babel/runtime/helpers/typeof', 'react-dropzone', 'react-router', 'react-bootstrap', '@fortawesome/react-fontawesome', '@crello/react-lottie', 'react-csv', '@babel/runtime/helpers/objectWithoutProperties', 'react-color', 'tinycolor2', 'react-router-dom', '@fortawesome/free-solid-svg-icons'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global['@plusscommunities/pluss-core-web'] = {}, global._asyncToGenerator, global._regeneratorRuntime, global._, global.axios, global._defineProperty, global.moment, global.React, global.$, global.Cookies, global.awsAmplify, global._classCallCheck, global._createClass, global._inherits, global._possibleConstructorReturn, global._getPrototypeOf, global.FontAwesome, global._extends, global._assertThisInitialized, global.reactRedux, global.Textarea, global._toConsumableArray, global._typeof, global.Dropzone, global.reactRouter, global.reactBootstrap, global.reactFontawesome, global.reactLottie, global.reactCsv, global._objectWithoutProperties, global.reactColor, global.tinycolor, global.reactRouterDom, global.freeSolidSvgIcons));
-}(this, (function (exports, _asyncToGenerator, _regeneratorRuntime, _, axios, _defineProperty, moment, React, $, Cookies, awsAmplify, _classCallCheck, _createClass, _inherits, _possibleConstructorReturn, _getPrototypeOf, FontAwesome, _extends, _assertThisInitialized, reactRedux, Textarea, _toConsumableArray, _typeof, Dropzone, reactRouter, reactBootstrap, reactFontawesome, reactLottie, reactCsv, _objectWithoutProperties, reactColor, tinycolor, reactRouterDom, freeSolidSvgIcons) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/runtime/helpers/asyncToGenerator'), require('@babel/runtime/regenerator'), require('lodash'), require('axios'), require('aws-amplify'), require('@babel/runtime/helpers/defineProperty'), require('moment'), require('react'), require('jquery'), require('js-cookie'), require('@babel/runtime/helpers/classCallCheck'), require('@babel/runtime/helpers/createClass'), require('@babel/runtime/helpers/inherits'), require('@babel/runtime/helpers/possibleConstructorReturn'), require('@babel/runtime/helpers/getPrototypeOf'), require('react-fontawesome'), require('@babel/runtime/helpers/extends'), require('@babel/runtime/helpers/assertThisInitialized'), require('react-redux'), require('react-textarea-autosize'), require('@babel/runtime/helpers/toConsumableArray'), require('@babel/runtime/helpers/typeof'), require('react-dropzone'), require('react-router'), require('react-bootstrap'), require('@fortawesome/react-fontawesome'), require('@crello/react-lottie'), require('react-csv'), require('@babel/runtime/helpers/objectWithoutProperties'), require('react-color'), require('tinycolor2'), require('react-router-dom'), require('@fortawesome/free-solid-svg-icons')) :
+  typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/regenerator', 'lodash', 'axios', 'aws-amplify', '@babel/runtime/helpers/defineProperty', 'moment', 'react', 'jquery', 'js-cookie', '@babel/runtime/helpers/classCallCheck', '@babel/runtime/helpers/createClass', '@babel/runtime/helpers/inherits', '@babel/runtime/helpers/possibleConstructorReturn', '@babel/runtime/helpers/getPrototypeOf', 'react-fontawesome', '@babel/runtime/helpers/extends', '@babel/runtime/helpers/assertThisInitialized', 'react-redux', 'react-textarea-autosize', '@babel/runtime/helpers/toConsumableArray', '@babel/runtime/helpers/typeof', 'react-dropzone', 'react-router', 'react-bootstrap', '@fortawesome/react-fontawesome', '@crello/react-lottie', 'react-csv', '@babel/runtime/helpers/objectWithoutProperties', 'react-color', 'tinycolor2', 'react-router-dom', '@fortawesome/free-solid-svg-icons'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global['@plusscommunities/pluss-core-web'] = {}, global._asyncToGenerator, global._regeneratorRuntime, global._, global.axios, global.awsAmplify, global._defineProperty, global.moment, global.React, global.$, global.Cookies, global._classCallCheck, global._createClass, global._inherits, global._possibleConstructorReturn, global._getPrototypeOf, global.FontAwesome, global._extends, global._assertThisInitialized, global.reactRedux, global.Textarea, global._toConsumableArray, global._typeof, global.Dropzone, global.reactRouter, global.reactBootstrap, global.reactFontawesome, global.reactLottie, global.reactCsv, global._objectWithoutProperties, global.reactColor, global.tinycolor, global.reactRouterDom, global.freeSolidSvgIcons));
+}(this, (function (exports, _asyncToGenerator, _regeneratorRuntime, _, axios, awsAmplify, _defineProperty, moment, React, $, Cookies, _classCallCheck, _createClass, _inherits, _possibleConstructorReturn, _getPrototypeOf, FontAwesome, _extends, _assertThisInitialized, reactRedux, Textarea, _toConsumableArray, _typeof, Dropzone, reactRouter, reactBootstrap, reactFontawesome, reactLottie, reactCsv, _objectWithoutProperties, reactColor, tinycolor, reactRouterDom, freeSolidSvgIcons) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -47,75 +47,7 @@
       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;
@@ -124,28 +56,29 @@
 
   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();
           }
@@ -205,28 +138,30 @@
   };
   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() {
@@ -235,19 +170,19 @@
   }();
   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');
               }
@@ -1687,35 +1622,31 @@
   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,
-                    contentType: file.type
-                  })
-                });
+                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();
             }
@@ -1729,15 +1660,6 @@
 
       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();
@@ -1751,14 +1673,6 @@
     //     };
     //   });
     // },
-    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) {
@@ -4205,6 +4119,26 @@
     }
 
     _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;
@@ -4213,7 +4147,7 @@
           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",
@@ -5253,7 +5187,7 @@
   };
 
   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; }
@@ -6962,6 +6896,7 @@
       value: function renderLibraryImage(image, index, allowDelete) {
         var _this7 = this;
 
+        console.log(image);
         var classes = 'imageInput imageInput-hasImage imageInput-libraryImage';
 
         if (image.Selected) {
@@ -7360,7 +7295,7 @@
   };
 
   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); }; }
@@ -8399,7 +8334,8 @@
               marginRight: 8,
               backgroundSize: 'cover',
               backgroundPosition: 'center',
-              backgroundImage: "url(".concat(this.getImage(), ")")
+              backgroundImage: "url(".concat(this.getImage(), ")"),
+              backgroundColor: COLOUR_BRANDING_MAIN
             },
             alt: "".concat(this.getText(), " Image")
           });
@@ -9965,7 +9901,7 @@
   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); }; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-core-web",
-  "version": "1.4.36-auth.0",
+  "version": "1.4.36",
   "description": "Core extension package for Pluss Communities platform",
   "main": "dist/index.cjs.js",
   "scripts": {
@@ -9,9 +9,6 @@
     "patch": "npm version patch",
     "betaupload": "npm run build && npm publish --access public --tag beta && rm -rf node_modules",
     "betaupload:p": "npm run betapatch && npm run betaupload",
-    "authpatch": "npm version prepatch --preid=auth",
-    "authupload": "npm run build && npm publish --access public --tag auth && rm -rf node_modules",
-    "authupload:p": "npm run authpatch && npm run authupload",
     "upload": "npm run build && npm publish --access public && rm -rf node_modules",
     "upload:p": "npm run patch && npm run upload"
   },
@@ -31,9 +28,7 @@
     "rollup-plugin-styles": "^3.14.1"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.0"
-  },
-  "peerDependencies": {
+    "@babel/runtime": "^7.14.0",
     "@fortawesome/fontawesome-svg-core": "^6.4.0",
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/react-fontawesome": "^0.2.0",
@@ -44,7 +39,7 @@
     "react": "^16.14.0",
     "react-dropzone": "^14.2.3",
     "react-fontawesome": "^1.6.1",
-    "react-redux": "^7.2.9",
+    "react-redux": "^5.0.6",
     "react-router-dom": "^4.2.2",
     "react-textarea-autosize": "^7.1.0-1"
   },

package/src/apis/fileActions.js

@@ -4,33 +4,18 @@ import { Storage } from 'aws-amplify';
 import CanvasImageUploader from '../helper/files/canvasImageUploader';
 import $ from 'jquery';
 import { generateImageName, randomString, getUrl } from '../helper';
-import Axios from 'axios';
 
 export const fileActions = {
   uploadMediaAsync: async (file, filename) => {
     const newFilename = filename.replace(/[^a-z0-9+.]+/gi, '').toLowerCase();
-    const signedUrlRes = await authedFunction({
-      method: 'GET',
-      url: getUrl('media', 'get/presignedurl', { filename: newFilename, contentType: file.type }),
-    });
-    await Axios.put(signedUrlRes.data.url, file, {
-      headers: {
-        'Content-Type': file.type,
-      },
-    });
-    const { baseUploadsUrl } = Config.env;
-    return `${baseUploadsUrl}${signedUrlRes.data.key}`;
-  },
-  // 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 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}`;
-  // },
+    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) => {
@@ -45,12 +30,6 @@ export const fileActions = {
   //     };
   //   });
   // },
-  getPresignedUrl: (filename) => {
-    return authedFunction({
-      method: 'GET',
-      url: getUrl('media', 'get/presignedurl', { filename }),
-    });
-  },
   compressImage: (file, maxSize, quality, noCompress) => {
     return new Promise((resolve, reject) => {
       if (noCompress) {

package/src/components/AudienceSelector.js

@@ -647,6 +647,6 @@ class AudienceSelector extends Component {
   }
 }
 
-const toExport = connect(null, { setAuth }, null, { forwardRef: true })(AudienceSelector);
+const toExport = connect(null, { setAuth }, null, { withRef: true })(AudienceSelector);
 
 export { toExport as AudienceSelector };

package/src/components/Comment.js

@@ -1,14 +1,29 @@
 import React, { Component } from 'react';
 import moment from 'moment';
-import { toParagraphed } from '../helper';
+import { get1400, toParagraphed } from '../helper';
 import { ProfilePic } from './ProfilePic';
+import _ from 'lodash';
 
 class Comment extends Component {
+  renderImage(image) {
+    if (_.isEmpty(image)) {
+      return null;
+    }
+    return (
+      <div className="imageGrid">
+        <a href={image} target="_blank" rel="noopener noreferrer">
+          <div className="imageGrid_image" style={{ backgroundImage: `url('${get1400(image)}')` }}></div>
+        </a>
+      </div>
+    );
+  }
+
   renderComment() {
     const { comment } = this.props;
     return (
       <div key={comment.Id} className="comment">
         <p className="comment_text">{toParagraphed(comment.Comment)}</p>
+        {this.renderImage(comment.Image)}
         <div className="comment_bottom">
           <ProfilePic className="comment_profilePic" size={25} image={comment.User.profilePic} />
           <p className="comment_name">{comment.User.displayName}</p>

package/src/components/FileInput.js

@@ -329,5 +329,5 @@ const mapStateToProps = () => {
   return {};
 };
 
-const FileInput = connect(mapStateToProps, {}, null, { forwardRef: true })(FileInputComponent);
+const FileInput = connect(mapStateToProps, {}, null, { withRef: true })(FileInputComponent);
 export { FileInput };

package/src/components/ImageInput.js

@@ -626,6 +626,7 @@ class ImageInputComponent extends Component {
   }
 
   renderLibraryImage(image, index, allowDelete) {
+    console.log(image);
     let classes = 'imageInput imageInput-hasImage imageInput-libraryImage';
     if (image.Selected) {
       classes += ' imageInput-librarySelected';
@@ -983,5 +984,5 @@ const mapStateToProps = (state) => {
   };
 };
 
-const ImageInput = connect(mapStateToProps, {}, null, { forwardRef: true })(ImageInputComponent);
+const ImageInput = connect(mapStateToProps, {}, null, { withRef: true })(ImageInputComponent);
 export { ImageInput };

package/src/components/UserListing.js

@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import { Text } from './Text';
 import { ProfilePic } from './ProfilePic';
+import { COLOUR_BRANDING_MAIN } from '../colours';
 
 class UserListing extends Component {
   getSize() {
@@ -71,10 +72,12 @@ class UserListing extends Component {
             backgroundSize: 'cover',
             backgroundPosition: 'center',
             backgroundImage: `url(${this.getImage()})`,
+            backgroundColor: COLOUR_BRANDING_MAIN,
           }}
           alt={`${this.getText()} Image`}
         />
       );
+      p;
     }
     return <ProfilePic size={this.getSize()} className="userListing_profilePic" image={this.getImage()} />;
   }

package/src/config.js

@@ -17,11 +17,6 @@ const CoreConfig = {
     makeApiKey: '',
     logo: '',
     clientName: '',
-    AuthStrategy: {
-      getAccessToken: async () => null,
-      getCurrentUserId: async () => null,
-      hasActiveSession: async () => false,
-    },
   },
   init: (environment) => {
     CoreConfig.env = environment;

package/src/session.js

@@ -1,12 +1,14 @@
 import _ from 'lodash';
 import axios from 'axios';
-import Config from './config';
+import { Auth } from 'aws-amplify';
 
 export const getSessionTokenAWS = async (prefix) => {
-  const token = await Config.env.AuthStrategy.getAccessToken();
+  const data = await Auth.currentSession();
+  const token = data.getAccessToken().getJwtToken();
   if (_.isUndefined(prefix)) return token;
   return `${prefix} ${token}`;
 };
+
 // export const getRefreshTokenAWS = async () => {
 //   const data = await Auth.currentSession();
 //   return data.getRefreshToken().token;
@@ -32,7 +34,8 @@ export const unauthedFunction = (request) => {
 
 export const getCurrentUserSub = async () => {
   try {
-    return await Config.env.AuthStrategy.getCurrentUserId();
+    const user = await Auth.currentUserInfo();
+    return user.id;
   } catch (error) {
     return null;
   }
@@ -40,8 +43,8 @@ export const getCurrentUserSub = async () => {
 
 export const checkLoggedIn = async (self) => {
   try {
-    const isLoggedIn = await Config.env.AuthStrategy.hasActiveSession();
-    if (!isLoggedIn) {
+    const user = await Auth.currentAuthenticatedUser();
+    if (_.isUndefined(user) || user == null || user.username == null) {
       console.log('redirecting to login');
       self.props.history.push('/login');
     }