@plusscommunities/pluss-core-app 8.0.0 → 8.0.1-auth.0

package/src/index.js

@@ -1,13 +1,25 @@
-import Config from './config';
-import Styles from './styles';
-import * as Session from './session';
-import * as Helper from './helper';
-import * as Colours from './colours';
-import * as Actions from './actions';
-import * as ActionTypes from './actions/types';
-import * as Apis from './apis';
-import * as Components from './components';
-import * as Fonts from './fonts';
-import * as Constants from './constants';
+import Config from "./config";
+import Styles from "./styles";
+import * as Session from "./session";
+import * as Helper from "./helper";
+import * as Colours from "./colours";
+import * as Actions from "./actions";
+import * as ActionTypes from "./actions/types";
+import * as Apis from "./apis";
+import * as Components from "./components";
+import * as Constants from "./constants";
+import { withNavigationFocus } from "./withNavigationFocus";
 
-export { Config, Styles, Session, Helper, Colours, Actions, ActionTypes, Apis, Components, Fonts, Constants };
+export {
+	Config,
+	Styles,
+	Session,
+	Helper,
+	Colours,
+	Actions,
+	ActionTypes,
+	Apis,
+	Components,
+	Constants,
+	withNavigationFocus,
+};

package/src/js/images/detectFaces.js

@@ -1,34 +1,41 @@
-import { stringActions } from '../../apis';
-import moment from 'moment';
-import * as FileSystem from 'expo-file-system';
+import { stringActions } from "../../apis";
+import moment from "moment";
+import { File, Paths } from "expo-file-system";
 // import * as FaceDetector from 'expo-face-detector';
 
-const detectFaces = async remoteUrl => {
-  // deprecated
+const detectFaces = async (remoteUrl) => {
+	// deprecated
 
-  const parts = remoteUrl.split('/').splice(-2);
-  const mediaId = parts[0];
-  const extension = parts[1].split('.').splice(-1)[0];
+	const parts = remoteUrl.split("/").splice(-2);
+	const mediaId = parts[0];
+	const extension = parts[1]?.split(".").splice(-1)[0] || "jpg";
 
-  const downloadPath = `${FileSystem.cacheDirectory}${mediaId}.${extension}`;
+	const file = await File.downloadFileAsync(
+		remoteUrl,
+		new File(Paths.cache, `${mediaId}.${extension}`),
+		{ idempotent: true },
+	);
+	const localUrl = file.uri;
 
-  const { uri: localUrl } = await FileSystem.downloadAsync(remoteUrl, downloadPath);
+	// const faces = await FaceDetector.detectFacesAsync(localUrl, {
+	//   mode: FaceDetector.FaceDetectorMode.accurate,
+	// });
 
-  // const faces = await FaceDetector.detectFacesAsync(localUrl, {
-  //   mode: FaceDetector.FaceDetectorMode.accurate,
-  // });
+	const faces = null;
 
-  const faces = null;
+	if (faces && faces.image && faces.image.uri) {
+		delete faces.image.uri;
+	}
 
-  if (faces && faces.image && faces.image.uri) {
-    delete faces.image.uri;
-  }
+	faces.timestamp = moment().valueOf();
 
-  faces.timestamp = moment().valueOf();
+	stringActions.setString(
+		"plussSpace",
+		`imagefaces_${encodeURIComponent(remoteUrl)}`,
+		faces,
+	);
 
-  stringActions.setString('plussSpace', `imagefaces_${encodeURIComponent(remoteUrl)}`, faces);
-
-  return faces;
+	return faces;
 };
 
 export default detectFaces;

package/src/js/images/findLandmarkRange.js

@@ -1,105 +1,112 @@
-import _ from 'lodash';
-import moment from 'moment';
-import { stringActions } from '../../apis';
-import detectFaces from './detectFaces';
-import getScaledOffset from './getScaledOffset';
+import _ from "lodash";
+import moment from "moment";
+import { stringActions } from "../../apis";
+import detectFaces from "./detectFaces";
+import getScaledOffset from "./getScaledOffset";
 
 const findLandmarkRange = async (url, options) => {
-  let cachedValues;
-  if (options && options.cachedValues) {
-    cachedValues = options.cachedValues;
-  }
-  try {
-    const response = await stringActions.getString('plussSpace', `imagefaces_${encodeURIComponent(url)}`);
-    cachedValues = response.data;
-  } catch (e) {
-    console.log('errored from cache');
-  }
-  if (
-    !cachedValues ||
-    !cachedValues.faces ||
-    !cachedValues.image ||
-    (_.isEmpty(cachedValues.faces) &&
-      moment()
-        .add(-1, 'w')
-        .valueOf() > moment(cachedValues.timestamp).valueOf())
-  ) {
-    cachedValues = await detectFaces(url);
-  }
-  const { faces, image } = cachedValues;
+	let cachedValues;
+	if (options && options.cachedValues) {
+		cachedValues = options.cachedValues;
+	}
+	try {
+		const response = await stringActions.getString(
+			"plussSpace",
+			`imagefaces_${encodeURIComponent(url)}`,
+		);
+		cachedValues = response.data;
+	} catch (e) {
+		console.log("errored from cache");
+	}
+	if (
+		!cachedValues ||
+		!cachedValues.faces ||
+		!cachedValues.image ||
+		(_.isEmpty(cachedValues.faces) &&
+			moment().add(-1, "w").valueOf() >
+				moment(cachedValues.timestamp).valueOf())
+	) {
+		cachedValues = await detectFaces(url);
+	}
+	const { faces, image } = cachedValues;
 
-  let landmarkStartX = null;
-  let landmarkStartY = null;
-  let landmarkEndX = null;
-  let landmarkEndY = null;
+	let landmarkStartX = null;
+	let landmarkStartY = null;
+	let landmarkEndX = null;
+	let landmarkEndY = null;
 
-  if (_.isEmpty(faces)) {
-    landmarkStartX = image.width / 2;
-    landmarkStartY = image.height / 2;
-    landmarkEndX = image.width / 2;
-    landmarkEndY = image.height / 2;
-  } else {
-    faces.forEach(face => {
-      const { bounds } = face;
+	if (_.isEmpty(faces)) {
+		landmarkStartX = image.width / 2;
+		landmarkStartY = image.height / 2;
+		landmarkEndX = image.width / 2;
+		landmarkEndY = image.height / 2;
+	} else {
+		faces.forEach((face) => {
+			const { bounds } = face;
 
-      if (!landmarkStartX || bounds.origin.x < landmarkStartX) {
-        landmarkStartX = bounds.origin.x;
-      }
+			if (!landmarkStartX || bounds.origin.x < landmarkStartX) {
+				landmarkStartX = bounds.origin.x;
+			}
 
-      if (!landmarkStartY || bounds.origin.y < landmarkStartY) {
-        landmarkStartY = bounds.origin.y;
-      }
+			if (!landmarkStartY || bounds.origin.y < landmarkStartY) {
+				landmarkStartY = bounds.origin.y;
+			}
 
-      const faceEndX = bounds.origin.x + bounds.size.width;
-      if (!landmarkEndX || faceEndX > landmarkEndX) {
-        landmarkEndX = faceEndX;
-      }
+			const faceEndX = bounds.origin.x + bounds.size.width;
+			if (!landmarkEndX || faceEndX > landmarkEndX) {
+				landmarkEndX = faceEndX;
+			}
 
-      const faceEndY = bounds.origin.y + bounds.size.height;
-      if (!landmarkEndY || faceEndX > landmarkEndY) {
-        landmarkEndY = faceEndY;
-      }
-    });
-  }
+			const faceEndY = bounds.origin.y + bounds.size.height;
+			if (!landmarkEndY || faceEndX > landmarkEndY) {
+				landmarkEndY = faceEndY;
+			}
+		});
+	}
 
-  let targetWidth = image.width;
-  let targetHeight = image.height;
+	let targetWidth = image.width;
+	let targetHeight = image.height;
 
-  if (options && options.targetWidth && options.targetHeight) {
-    const { scaleFactor } = getScaledOffset(image.width, image.height, options.targetWidth, options.targetHeight);
-    landmarkStartX *= scaleFactor;
-    landmarkStartY *= scaleFactor;
-    landmarkEndX *= scaleFactor;
-    landmarkEndY *= scaleFactor;
-    targetWidth = options.targetWidth;
-    targetHeight = options.targetHeight;
-  }
+	if (options && options.targetWidth && options.targetHeight) {
+		const { scaleFactor } = getScaledOffset(
+			image.width,
+			image.height,
+			options.targetWidth,
+			options.targetHeight,
+		);
+		landmarkStartX *= scaleFactor;
+		landmarkStartY *= scaleFactor;
+		landmarkEndX *= scaleFactor;
+		landmarkEndY *= scaleFactor;
+		targetWidth = options.targetWidth;
+		targetHeight = options.targetHeight;
+	}
 
-  if (landmarkStartX < 0) {
-    landmarkStartX = 0;
-  }
-  if (landmarkStartY < 0) {
-    landmarkStartY = 0;
-  }
-  if (landmarkEndX > targetWidth) {
-    landmarkEndX = targetWidth;
-  }
-  if (landmarkEndY > targetHeight) {
-    landmarkEndY = targetHeight;
-  }
+	if (landmarkStartX < 0) {
+		landmarkStartX = 0;
+	}
+	if (landmarkStartY < 0) {
+		landmarkStartY = 0;
+	}
+	if (landmarkEndX > targetWidth) {
+		landmarkEndX = targetWidth;
+	}
+	if (landmarkEndY > targetHeight) {
+		landmarkEndY = targetHeight;
+	}
 
-  return {
-    start: {
-      x: landmarkStartX,
-      y: landmarkStartY,
-    },
-    end: {
-      x: landmarkEndX,
-      y: landmarkEndY,
-    },
-    height: image.height,
-    width: image.width,
-  };
+	return {
+		start: {
+			x: landmarkStartX,
+			y: landmarkStartY,
+		},
+		end: {
+			x: landmarkEndX,
+			y: landmarkEndY,
+		},
+		height: image.height,
+		width: image.width,
+	};
 };
 
 export default findLandmarkRange;

package/src/js/images/getScaledOffset.js

@@ -1,83 +1,88 @@
-const getScaledOffset = (sourceWidth, sourceHeight, targetWidth, targetHeight) => {
-  const sourceRatio = sourceWidth / sourceHeight;
-  const targetRatio = targetWidth / targetHeight;
+const getScaledOffset = (
+	sourceWidth,
+	sourceHeight,
+	targetWidth,
+	targetHeight,
+) => {
+	const sourceRatio = sourceWidth / sourceHeight;
+	const targetRatio = targetWidth / targetHeight;
 
-  // same ratio. no adjustment needed.
-  if (sourceRatio === targetRatio) {
-    return {
-      width: targetWidth,
-      height: targetHeight,
-      scaleFactor: targetWidth / sourceWidth,
-      offset: {
-        x: 0,
-        y: 0,
-      },
-      bounds: {
-        start: {
-          x: 0,
-          y: 0,
-        },
-        end: {
-          x: targetWidth,
-          y: targetHeight,
-        },
-      },
-    };
-  }
+	// same ratio. no adjustment needed.
+	if (sourceRatio === targetRatio) {
+		return {
+			width: targetWidth,
+			height: targetHeight,
+			scaleFactor: targetWidth / sourceWidth,
+			offset: {
+				x: 0,
+				y: 0,
+			},
+			bounds: {
+				start: {
+					x: 0,
+					y: 0,
+				},
+				end: {
+					x: targetWidth,
+					y: targetHeight,
+				},
+			},
+		};
+	}
 
-  // source is higher than target. height scaling and y offset required.
-  if (sourceRatio < targetRatio) {
-    const scaleFactor = targetWidth / sourceWidth;
-    const adjustedHeight = sourceHeight * scaleFactor;
-    const yOffset = (adjustedHeight - targetHeight) / 2;
+	// source is higher than target. height scaling and y offset required.
+	if (sourceRatio < targetRatio) {
+		const scaleFactor = targetWidth / sourceWidth;
+		const adjustedHeight = sourceHeight * scaleFactor;
+		const yOffset = (adjustedHeight - targetHeight) / 2;
 
-    return {
-      width: targetWidth,
-      height: adjustedHeight,
-      scaleFactor,
-      offset: {
-        x: 0,
-        y: -yOffset,
-      },
-      bounds: {
-        start: {
-          x: 0,
-          y: yOffset,
-        },
-        end: {
-          x: targetWidth,
-          y: yOffset + adjustedHeight,
-        },
-      },
-    };
-  }
+		return {
+			width: targetWidth,
+			height: adjustedHeight,
+			scaleFactor,
+			offset: {
+				x: 0,
+				y: -yOffset,
+			},
+			bounds: {
+				start: {
+					x: 0,
+					y: yOffset,
+				},
+				end: {
+					x: targetWidth,
+					y: yOffset + adjustedHeight,
+				},
+			},
+		};
+	}
 
-  // source is wider than target. width scaling and x offset required.
-  if (sourceRatio > targetRatio) {
-    const scaleFactor = targetHeight / sourceHeight;
-    const adjustedWidth = sourceWidth * scaleFactor;
-    const xOffset = (adjustedWidth - targetWidth) / 2;
+	// source is wider than target. width scaling and x offset required.
+	if (sourceRatio > targetRatio) {
+		const scaleFactor = targetHeight / sourceHeight;
+		const adjustedWidth = sourceWidth * scaleFactor;
+		const xOffset = (adjustedWidth - targetWidth) / 2;
 
-    return {
-      width: adjustedWidth,
-      height: targetHeight,
-      scaleFactor,
-      offset: {
-        x: -xOffset,
-        y: 0,
-      },
-      bounds: {
-        start: {
-          x: xOffset,
-          y: 0,
-        },
-        end: {
-          x: xOffset + adjustedWidth,
-          y: targetHeight,
-        },
-      },
-    };
-  }
+		return {
+			width: adjustedWidth,
+			height: targetHeight,
+			scaleFactor,
+			offset: {
+				x: -xOffset,
+				y: 0,
+			},
+			bounds: {
+				start: {
+					x: xOffset,
+					y: 0,
+				},
+				end: {
+					x: xOffset + adjustedWidth,
+					y: targetHeight,
+				},
+			},
+		};
+	}
 };
 
 export default getScaledOffset;

package/src/js/site/getSiteLevelFromState.js

@@ -1,30 +1,30 @@
-const getSiteLevelFromState = state => {
-  let siteType = 'legacy';
-  if (state && state.user && state.user.siteInfo && state.user.siteInfo.Type) {
-    siteType = state.user.siteInfo.Type;
-  }
-  const siteConfig = {
-    type: siteType,
-    hasTV: true,
-    hasKiosk: false,
-    hasPayments: true,
-    hasPersonalNotes: true,
-    hasEmergencyContacts: true,
-    hasPersonalDocuments: true,
-  };
+const getSiteLevelFromState = (state) => {
+	let siteType = "legacy";
+	if (state && state.user && state.user.siteInfo && state.user.siteInfo.Type) {
+		siteType = state.user.siteInfo.Type;
+	}
+	const siteConfig = {
+		type: siteType,
+		hasTV: true,
+		hasKiosk: false,
+		hasPayments: true,
+		hasPersonalNotes: true,
+		hasEmergencyContacts: true,
+		hasPersonalDocuments: true,
+	};
 
-  switch (siteType) {
-    case 'free':
-      siteConfig.hasTV = false;
-      siteConfig.hasPayments = false;
-      siteConfig.hasPersonalNotes = false;
-      siteConfig.hasEmergencyContacts = false;
-      siteConfig.hasPersonalDocuments = false;
-      break;
-    default:
-      break;
-  }
-  return siteConfig;
+	switch (siteType) {
+		case "free":
+			siteConfig.hasTV = false;
+			siteConfig.hasPayments = false;
+			siteConfig.hasPersonalNotes = false;
+			siteConfig.hasEmergencyContacts = false;
+			siteConfig.hasPersonalDocuments = false;
+			break;
+		default:
+			break;
+	}
+	return siteConfig;
 };
 
 export default getSiteLevelFromState;

package/src/js/site/isTVEnabled.js

@@ -1,15 +1,15 @@
-import _ from 'lodash';
+import _ from "lodash";
 
 const isTVEnabled = (interfaces, feature) => {
-  return _.some(interfaces, t => {
-    return (
-      t.Type === 'TV' &&
-      (!feature ||
-        _.some(t.Settings.widgets, f => {
-          return f.key === feature;
-        }))
-    );
-  });
+	return _.some(interfaces, (t) => {
+		return (
+			t.Type === "TV" &&
+			(!feature ||
+				_.some(t.Settings.widgets, (f) => {
+					return f.key === feature;
+				}))
+		);
+	});
 };
 
 export default isTVEnabled;

package/src/session.js

@@ -1,12 +1,12 @@
-import _ from 'lodash';
-import axios from 'axios';
-import { Auth } from 'aws-amplify';
-
-export const getSessionTokenAWS = async prefix => {
-  const data = await Auth.currentSession();
-  const token = data.accessToken.jwtToken;
-  if (_.isUndefined(prefix)) return token;
-  return `${prefix} ${token}`;
+import _ from "lodash";
+import axios from "axios";
+import { Auth } from "aws-amplify";
+import Config from "./config";
+
+export const getSessionTokenAWS = async (prefix) => {
+	const token = await Config.env.AuthStrategy.getAccessToken();
+	if (_.isUndefined(prefix)) return token;
+	return `${prefix} ${token}`;
 };
 
 // export const getRefreshTokenAWS = async () => {
@@ -15,24 +15,24 @@ export const getSessionTokenAWS = async prefix => {
 // };
 
 export const getSessionUidAWS = () => {
-  return new Promise((resolve, reject) => {
-    Auth.currentSession()
-      .then(data => {
-        resolve(data.accessToken.payload.username);
-      })
-      .catch(err => {
-        console.log('getSessionUidAWS error', err);
-        reject(err);
-      });
-  });
+	return new Promise((resolve, reject) => {
+		Auth.currentSession()
+			.then((data) => {
+				resolve(data.accessToken.payload.username);
+			})
+			.catch((err) => {
+				console.log("getSessionUidAWS error", err);
+				reject(err);
+			});
+	});
 };
 
-export const authedFunction = async request => {
-  const authkey = await getSessionTokenAWS();
-  if (!request.headers) request.headers = {};
-  request.headers.authkey = authkey;
+export const authedFunction = async (request) => {
+	const authkey = await getSessionTokenAWS();
+	if (!request.headers) request.headers = {};
+	request.headers.authkey = authkey;
 
-  return axios(request);
+	return axios(request);
 };
 
 // export const LogoutAWS = () => {
@@ -51,12 +51,12 @@ export const authedFunction = async request => {
 //   return auth && auth.site === 'plussSpace' && auth.type === 'master';
 // };
 
-export const getApiError = error => {
-  if (!__DEV__) return error;
-  try {
-    const errorData = error.response.data;
-    return errorData || error;
-  } catch (e) {
-    return error;
-  }
+export const getApiError = (error) => {
+	if (!__DEV__) return error;
+	try {
+		const errorData = error.response.data;
+		return errorData || error;
+	} catch (e) {
+		return error;
+	}
 };