diff --git a/app.json b/app.json index a2f626e..f0b753a 100644 --- a/app.json +++ b/app.json @@ -4,19 +4,19 @@ "slug": "imexmobile", "version": "1.3.5", "extra": { - "expover": "1" + "expover": "2" }, "orientation": "default", "icon": "./assets/logo192noa.png", "ios": { "supportsTablet": true, "bundleIdentifier": "com.imex.imexmobile", - "buildNumber": "1", + "buildNumber": "2", "googleServicesFile": "./GoogleService-Info.plist" }, "android": { "package": "com.imex.imexmobile", - "versionCode": 1100001, + "versionCode": 1100002, "googleServicesFile": "./google-services.json" }, "splash": { diff --git a/eas.json b/eas.json index 3ad2a22..534fceb 100644 --- a/eas.json +++ b/eas.json @@ -4,12 +4,11 @@ }, "build": { "test": { - "developmentClient": true, - "distribution": "internal", "releaseChannel": "test" }, "production": { - "release-channel": "production" + "releaseChannel": "production", + "env": { "ANDROID_SDK_ROOT": "/Users/pfic/Library/Android/sdk" } } }, "submit": { diff --git a/graphql/bodyshop.queries.js b/graphql/bodyshop.queries.js index 7e4aba2..eaf877f 100644 --- a/graphql/bodyshop.queries.js +++ b/graphql/bodyshop.queries.js @@ -10,6 +10,7 @@ export const QUERY_BODYSHOP = gql` localmediaserverhttp shopname features + localmediatoken } } `; diff --git a/package.json b/package.json index 9ee842b..0b661f6 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,9 @@ "release:test": "expo publish --release-channel test", "release:production": "expo publish --release-channel production", "build:production": "eas build --profile production", - "build:test": "eas build --profile test" + "build:test": "eas build --profile test", + "build:test:local:ios": "eas build --profile test --platform ios --local", + "build:test:local:android": "eas build --profile test --platform android --local" }, "dependencies": { "@apollo/client": "^3.7.0-alpha.3", @@ -52,7 +54,7 @@ "react": "17.0.2", "react-dom": "17.0.2", "react-i18next": "^11.15.5", - "react-native": "0.68.1", + "react-native": "0.68.2", "react-native-gesture-handler": "~2.2.1", "react-native-image-gallery": "^2.1.5", "react-native-indicators": "^0.17.0", diff --git a/util/local-document-upload.utility.js b/util/local-document-upload.utility.js index 6de2654..17d1ea6 100644 --- a/util/local-document-upload.utility.js +++ b/util/local-document-upload.utility.js @@ -7,9 +7,13 @@ import * as ImageManipulator from "expo-image-manipulator"; export const handleLocalUpload = async ({ ev, context }) => { const { onError, onSuccess, onProgress, filename, mediaId } = ev; const { jobid, invoice_number, vendorid, callbackAfterUpload } = context; + const bodyshop = store.getState().user.bodyshop; var options = { - headers: { "X-Requested-With": "XMLHttpRequest" }, + headers: { + "X-Requested-With": "XMLHttpRequest", + ims_token: bodyshop.localmediatoken, + }, onUploadProgress: (e) => { if (onProgress) onProgress({ percent: (e.loaded / e.total) * 100 }); }, @@ -57,7 +61,6 @@ export const handleLocalUpload = async ({ ev, context }) => { } formData.append("file", fileData); - const bodyshop = store.getState().user.bodyshop; try { const imexMediaServerResponse = await axios.post( diff --git a/yarn.lock b/yarn.lock index 0ebe107..a9c51ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7604,10 +7604,10 @@ react-mixin@^3.0.5: object-assign "^4.0.1" smart-mixin "^2.0.0" -react-native-codegen@^0.0.13: - version "0.0.13" - resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.0.13.tgz#4cc94546fc75a5dbe9350d59c10108f2efe6bc17" - integrity sha512-rCh1P+s0Q4N6vNgS97ckafbhJRztz22+0l0VZoyQC06F07J98kI5cUByH0ATypPRIdpkMbAZc59DoPdDFc01bg== +react-native-codegen@^0.0.17: + version "0.0.17" + resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.0.17.tgz#83fb814d94061cbd46667f510d2ddba35ffb50ac" + integrity sha512-7GIEUmAemH9uWwB6iYXNNsPoPgH06pxzGRmdBzK98TgFBdYJZ7CBuZFPMe4jmHQTPOkQazKZ/w5O6/71JBixmw== dependencies: "@babel/parser" "^7.14.0" flow-parser "^0.121.0" @@ -7721,10 +7721,10 @@ react-native-web@0.17.7: normalize-css-color "^1.0.2" prop-types "^15.6.0" -react-native@0.68.1: - version "0.68.1" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.68.1.tgz#c3d92f89028cdc2453fe7cd2d532b3f68d1c27c8" - integrity sha512-5gfvslo5NO2Ece2k/q41eVOK3ca4u1QAOf+qM+auvOiUA4/QR5Yr0WfSGbRpUr2GaFgv7qP11F4+elCravg7uQ== +react-native@0.68.2: + version "0.68.2" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.68.2.tgz#07547cd31bb9335a7fa4135cfbdc24e067142585" + integrity sha512-qNMz+mdIirCEmlrhapAtAG+SWVx6MAiSfCbFNhfHqiqu1xw1OKXdzIrjaBEPihRC2pcORCoCHduHGQe/Pz9Yuw== dependencies: "@jest/create-cache-key-function" "^27.0.1" "@react-native-community/cli" "^7.0.3" @@ -7748,7 +7748,7 @@ react-native@0.68.1: pretty-format "^26.5.2" promise "^8.0.3" react-devtools-core "^4.23.0" - react-native-codegen "^0.0.13" + react-native-codegen "^0.0.17" react-native-gradle-plugin "^0.0.6" react-refresh "^0.4.0" react-shallow-renderer "16.14.1"