From fc552d2044b2662d7c32c1e5a7b4ad56d3678ddf Mon Sep 17 00:00:00 2001 From: Adrien Teulade Date: Wed, 31 May 2023 14:35:19 +0100 Subject: [PATCH 1/9] moving the appupgrade api url to a variable. --- src/api.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/api.js b/src/api.js index 2f1eb08..1f740b3 100644 --- a/src/api.js +++ b/src/api.js @@ -1,9 +1,8 @@ import axios from "axios"; import axiosRetry from 'axios-retry'; -async function checkVersionWithAppUpgrade(appInfo, xApiKey) { +async function checkVersionWithAppUpgrade(appInfo, xApiKey, appUpgradeBaseUrl) { try { - const appUpgradeBaseUrl = "https://appupgrade.dev"; const { appName, appVersion, platform, environment, appLanguage } = appInfo; axiosRetry(axios, { retries: 3, retryDelay: axiosRetry.exponentialDelay, retryCondition: () => true }); From e0e211a50a577d9d8f39997ce7f5c08bcdb97255 Mon Sep 17 00:00:00 2001 From: Adrien Teulade Date: Wed, 31 May 2023 15:14:09 +0100 Subject: [PATCH 2/9] updating the package.json data so a new package can be published to npm. --- package-lock.json | 4 ++-- package.json | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index b4a2530..5779429 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "app-upgrade-react-native-sdk", - "version": "1.0.9", + "name": "@pod-point/app-upgrade-react-native-sdk", + "version": "1.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1625c91..a20feb6 100644 --- a/package.json +++ b/package.json @@ -1,19 +1,19 @@ { - "name": "app-upgrade-react-native-sdk", - "version": "1.0.15", - "description": "Official App Upgrade react-native sdk", + "name": "@pod-point/app-upgrade-react-native-sdk", + "version": "1.0.0", + "description": "Pod Point App Upgrade react-native sdk", "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, "author": "App Upgrade (https://appupgrade.dev)", - "homepage": "https://github.com/appupgrade-dev/app-upgrade-react-native-sdk", + "homepage": "https://github.com/Pod-Point/app-upgrade-react-native-sdk", "repository": { "type": "git", - "url": "git+https://github.com/appupgrade-dev/app-upgrade-react-native-sdk.git" + "url": "git+https://github.com/Pod-Point/app-upgrade-react-native-sdk.git" }, "bugs": { - "url": "https://github.com/appupgrade-dev/app-upgrade-react-native-sdk.git/issues" + "url": "https://github.com/Pod-Point/app-upgrade-react-native-sdk.git/issues" }, "license": "MIT", "dependencies": { From 72f5c1054d833a2d7728a7cf294cfb448e800945 Mon Sep 17 00:00:00 2001 From: Adrien Teulade Date: Wed, 31 May 2023 16:56:18 +0100 Subject: [PATCH 3/9] fix: issue in version-check. --- index.js | 4 ++-- src/version-check.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index 112e8a3..b0845bd 100644 --- a/index.js +++ b/index.js @@ -7,8 +7,8 @@ const PreferredAndroidMarket = { OTHER: 'Other', } -function appUpgradeVersionCheck(appInfo, xApiKey, alertInfo) { - versionCheck(appInfo, xApiKey, alertInfo); +function appUpgradeVersionCheck(appInfo, xApiKey, alertInfo, baseUrl) { + versionCheck(appInfo, xApiKey, alertInfo, baseUrl); } export { appUpgradeVersionCheck, PreferredAndroidMarket }; diff --git a/src/version-check.js b/src/version-check.js index f7464ce..d4976fb 100644 --- a/src/version-check.js +++ b/src/version-check.js @@ -3,11 +3,11 @@ import { checkVersionWithAppUpgrade } from "./api"; import { Platform, Alert, Linking } from "react-native"; import { PreferredAndroidMarket } from "app-upgrade-react-native-sdk"; -async function versionCheck(appInfo, xApiKey, alertInfo) { +async function versionCheck(appInfo, xApiKey, alertInfo, baseUrl) { const isValid = validate(appInfo, xApiKey); if (isValid) { - const version = await checkVersionWithAppUpgrade(appInfo, xApiKey); + const version = await checkVersionWithAppUpgrade(appInfo, xApiKey, baseUrl); if (!version) { console.error("App Upgrade Error: Version is null."); } else if (version && version.found === true) { From aec8fcfe497de13e953433ad508e9e73cae13c08 Mon Sep 17 00:00:00 2001 From: Adrien Teulade Date: Wed, 31 May 2023 16:59:36 +0100 Subject: [PATCH 4/9] fix: adjusting new version. --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5779429..645bf25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@pod-point/app-upgrade-react-native-sdk", - "version": "1.0.0", + "version": "1.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a20feb6..293f6cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@pod-point/app-upgrade-react-native-sdk", - "version": "1.0.0", + "version": "1.0.1", "description": "Pod Point App Upgrade react-native sdk", "main": "index.js", "scripts": { From c4273d2e3c0a2e31872d29b9491e4812a91c3797 Mon Sep 17 00:00:00 2001 From: Adrien Teulade Date: Fri, 2 Jun 2023 10:27:16 +0100 Subject: [PATCH 5/9] fix: issue with import. --- src/validation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/validation.js b/src/validation.js index addccab..65c64c2 100644 --- a/src/validation.js +++ b/src/validation.js @@ -1,4 +1,4 @@ -import { PreferredAndroidMarket } from "app-upgrade-react-native-sdk"; +import { PreferredAndroidMarket } from "../index"; function validate(appInfo, xApiKey) { if (!xApiKey || xApiKey === undefined || xApiKey === "") { From b607d71a213c7ed560691c8322c8fdbeef12afe8 Mon Sep 17 00:00:00 2001 From: Adrien Teulade Date: Fri, 2 Jun 2023 10:29:40 +0100 Subject: [PATCH 6/9] version 1.0.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 645bf25..c9de02d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@pod-point/app-upgrade-react-native-sdk", - "version": "1.0.1", + "version": "1.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 293f6cf..7f35e67 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@pod-point/app-upgrade-react-native-sdk", - "version": "1.0.1", + "version": "1.0.2", "description": "Pod Point App Upgrade react-native sdk", "main": "index.js", "scripts": { From 2b0547d36c23581b42e52db3090a646392719793 Mon Sep 17 00:00:00 2001 From: Adrien Teulade Date: Fri, 2 Jun 2023 10:54:26 +0100 Subject: [PATCH 7/9] fix: bad import, version 1.0.3 --- package-lock.json | 2 +- package.json | 2 +- src/version-check.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c9de02d..a12dbf2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@pod-point/app-upgrade-react-native-sdk", - "version": "1.0.2", + "version": "1.0.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7f35e67..317a784 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@pod-point/app-upgrade-react-native-sdk", - "version": "1.0.2", + "version": "1.0.3", "description": "Pod Point App Upgrade react-native sdk", "main": "index.js", "scripts": { diff --git a/src/version-check.js b/src/version-check.js index d4976fb..f70e227 100644 --- a/src/version-check.js +++ b/src/version-check.js @@ -1,7 +1,7 @@ import { validate } from "./validation"; import { checkVersionWithAppUpgrade } from "./api"; import { Platform, Alert, Linking } from "react-native"; -import { PreferredAndroidMarket } from "app-upgrade-react-native-sdk"; +import { PreferredAndroidMarket } from "../index"; async function versionCheck(appInfo, xApiKey, alertInfo, baseUrl) { const isValid = validate(appInfo, xApiKey); From 60110ab7060f5e98e8326bb4ec2e3839ba80f1dc Mon Sep 17 00:00:00 2001 From: Adrien Teulade Date: Fri, 2 Jun 2023 14:09:03 +0100 Subject: [PATCH 8/9] fix: removing uri part, version 1.0.4 --- package-lock.json | 2 +- package.json | 2 +- src/api.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a12dbf2..b9b9813 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@pod-point/app-upgrade-react-native-sdk", - "version": "1.0.3", + "version": "1.0.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 317a784..8095d8b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@pod-point/app-upgrade-react-native-sdk", - "version": "1.0.3", + "version": "1.0.4", "description": "Pod Point App Upgrade react-native sdk", "main": "index.js", "scripts": { diff --git a/src/api.js b/src/api.js index 1f740b3..b493636 100644 --- a/src/api.js +++ b/src/api.js @@ -8,7 +8,7 @@ async function checkVersionWithAppUpgrade(appInfo, xApiKey, appUpgradeBaseUrl) { axiosRetry(axios, { retries: 3, retryDelay: axiosRetry.exponentialDelay, retryCondition: () => true }); const response = await axios.get( - `${appUpgradeBaseUrl}/api/v1/versions/check`, + `${appUpgradeBaseUrl}`, { headers: { "x-api-key": xApiKey, From 799fc603b53fd672f48434a6f862173d41d7a959 Mon Sep 17 00:00:00 2001 From: Adrien Teulade Date: Wed, 20 Mar 2024 16:46:49 +0000 Subject: [PATCH 9/9] chore: reverting changes related to fork, adding optional baseUrl --- package-lock.json | 4 ++-- package.json | 6 +++--- src/api.js | 5 +++-- src/validation.js | 2 +- src/version-check.js | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index b9b9813..b4a2530 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "@pod-point/app-upgrade-react-native-sdk", - "version": "1.0.4", + "name": "app-upgrade-react-native-sdk", + "version": "1.0.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 08f92cc..d3feab8 100644 --- a/package.json +++ b/package.json @@ -7,13 +7,13 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "author": "App Upgrade (https://appupgrade.dev)", - "homepage": "https://github.com/Pod-Point/app-upgrade-react-native-sdk", + "homepage": "https://github.com/appupgrade-dev/app-upgrade-react-native-sdk", "repository": { "type": "git", - "url": "git+https://github.com/Pod-Point/app-upgrade-react-native-sdk.git" + "url": "git+https://github.com/appupgrade-dev/app-upgrade-react-native-sdk.git" }, "bugs": { - "url": "https://github.com/Pod-Point/app-upgrade-react-native-sdk.git/issues" + "url": "https://github.com/appupgrade-dev/app-upgrade-react-native-sdk.git/issues" }, "license": "MIT", "dependencies": { diff --git a/src/api.js b/src/api.js index 8c1e96a..508f2b7 100644 --- a/src/api.js +++ b/src/api.js @@ -1,8 +1,9 @@ import axios from "axios"; import axiosRetry from "axios-retry"; -async function checkVersionWithAppUpgrade(appInfo, xApiKey, appUpgradeBaseUrl) { +async function checkVersionWithAppUpgrade(appInfo, xApiKey, baseUrl = '') { try { + const appUpgradeBaseUrl = baseUrl ? baseUrl : "https://appupgrade.dev/api/v1/versions/check"; const { appName, appVersion, platform, environment, appLanguage } = appInfo; const { customAttributes } = appInfo; @@ -26,7 +27,7 @@ async function checkVersionWithAppUpgrade(appInfo, xApiKey, appUpgradeBaseUrl) { } const response = await axios.get( - `${appUpgradeBaseUrl}`, + appUpgradeBaseUrl, { headers: { "x-api-key": xApiKey, diff --git a/src/validation.js b/src/validation.js index 65c64c2..addccab 100644 --- a/src/validation.js +++ b/src/validation.js @@ -1,4 +1,4 @@ -import { PreferredAndroidMarket } from "../index"; +import { PreferredAndroidMarket } from "app-upgrade-react-native-sdk"; function validate(appInfo, xApiKey) { if (!xApiKey || xApiKey === undefined || xApiKey === "") { diff --git a/src/version-check.js b/src/version-check.js index f70e227..d4976fb 100644 --- a/src/version-check.js +++ b/src/version-check.js @@ -1,7 +1,7 @@ import { validate } from "./validation"; import { checkVersionWithAppUpgrade } from "./api"; import { Platform, Alert, Linking } from "react-native"; -import { PreferredAndroidMarket } from "../index"; +import { PreferredAndroidMarket } from "app-upgrade-react-native-sdk"; async function versionCheck(appInfo, xApiKey, alertInfo, baseUrl) { const isValid = validate(appInfo, xApiKey);