Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/semver-5.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@aliminaei
aliminaei authored Nov 26, 2024
2 parents 73d53f3 + c49bdb1 commit 4b3838e
Show file tree
Hide file tree
Showing 20 changed files with 842 additions and 1,517 deletions.
2 changes: 2 additions & 0 deletions .github/actions/setup/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ runs:
yarn install --cwd example --frozen-lockfile
yarn install --frozen-lockfile
shell: bash
env:
SKIP_YARN_COREPACK_CHECK: '1'
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ jobs:
lint:
runs-on: ubuntu-latest
timeout-minutes: 2
env:
SKIP_YARN_COREPACK_CHECK: '1'

steps:
- name: Checkout
Expand Down Expand Up @@ -41,10 +43,14 @@ jobs:
ignore-unfixed: true
skip-dirs: node_modules
exit-code: 1
env:
TRIVY_DB_REPOSITORY: us-docker.pkg.dev/gr4vy-admin/ghcr/aquasecurity/trivy-db

release:
if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci') && github.repository_owner == 'gr4vy' && github.ref == 'refs/heads/main'"
runs-on: ubuntu-latest
env:
SKIP_YARN_COREPACK_CHECK: '1'

needs:
- lint
Expand Down
50 changes: 50 additions & 0 deletions .trivyignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,53 @@ CVE-2022-46175
# shell-quote (nodejs-mobile-react-native app)

CVE-2021-42740

# @babel/traverse (example - dev dep)

CVE-2023-45133

# ip (example - dev dep)

CVE-2023-42282

# react-devtools-core (example - dev dep)

CVE-2023-5654

# activesupport (example - Gem)

CVE-2023-38037

# semver (nodejs-mobile-react-native app)

CVE-2022-25883

# tough-cookie (nodejs-mobile-react-native app)

CVE-2023-26136

# word-wrap (nodejs-mobile-react-native app)

CVE-2023-26115

# rexml (react-native)

CVE-2024-35176
CVE-2024-39908
CVE-2024-41123
CVE-2024-41946
CVE-2024-43398

# fast-xml-parser (react-native)

CVE-2024-41818

# micromatch (react-native)

CVE-2024-4067

# elliptic (react-native)

CVE-2024-42459
CVE-2024-42460
CVE-2024-42461
111 changes: 111 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,114 @@
# v1.6.0 (Tue Sep 03 2024)

#### 🚀 Enhancement

- task: add support for buyer option [#41](https://github.com/gr4vy/gr4vy-react-native/pull/41) ([@luca-gr4vy](https://github.com/luca-gr4vy))

#### 🐛 Bug Fix

- deps: upgrade insecure dependencies TA-8358 [#42](https://github.com/gr4vy/gr4vy-react-native/pull/42) ([@dependabot[bot]](https://github.com/dependabot[bot]) [@douglaseggleton](https://github.com/douglaseggleton))

#### Authors: 3

- [@dependabot[bot]](https://github.com/dependabot[bot])
- Douglas Eggleton ([@douglaseggleton](https://github.com/douglaseggleton))
- Luca Allievi ([@luca-gr4vy](https://github.com/luca-gr4vy))

---

# v1.5.1 (Wed Aug 14 2024)

#### 🐛 Bug Fix

- chore: update docs with connection options [#39](https://github.com/gr4vy/gr4vy-react-native/pull/39) ([@luca-gr4vy](https://github.com/luca-gr4vy))

#### Authors: 1

- Luca Allievi ([@luca-gr4vy](https://github.com/luca-gr4vy))

---

# v1.5.0 (Tue Aug 13 2024)

#### 🚀 Enhancement

- task: add support for `connectionOptions` [#37](https://github.com/gr4vy/gr4vy-react-native/pull/37) ([@luca-gr4vy](https://github.com/luca-gr4vy))

#### Authors: 1

- Luca Allievi ([@luca-gr4vy](https://github.com/luca-gr4vy))

---

# v1.4.0 (Tue Jul 02 2024)

#### 🚀 Enhancement

- task: pass approvalUrl to Android SDK [#34](https://github.com/gr4vy/gr4vy-react-native/pull/34) ([@luca-gr4vy](https://github.com/luca-gr4vy))

#### ⚠️ Pushed to `main`

- Update example app Podfile.lock with latest sdk version ([@luca-gr4vy](https://github.com/luca-gr4vy))

#### Authors: 1

- Luca Allievi ([@luca-gr4vy](https://github.com/luca-gr4vy))

---

# v1.3.0 (Mon Jul 01 2024)

#### 🚀 Enhancement

- chore: upgrade android sdk [#33](https://github.com/gr4vy/gr4vy-react-native/pull/33) ([@luca-gr4vy](https://github.com/luca-gr4vy))

#### Authors: 1

- Luca Allievi ([@luca-gr4vy](https://github.com/luca-gr4vy))

---

# v1.2.0 (Mon Jul 01 2024)

#### 🚀 Enhancement

- task: add support for cart items [#32](https://github.com/gr4vy/gr4vy-react-native/pull/32) ([@douglaseggleton](https://github.com/douglaseggleton) [@luca-gr4vy](https://github.com/luca-gr4vy))

#### Authors: 2

- Douglas Eggleton ([@douglaseggleton](https://github.com/douglaseggleton))
- Luca Allievi ([@luca-gr4vy](https://github.com/luca-gr4vy))

---

# v1.1.0 (Wed Jun 12 2024)

#### 🚀 Enhancement

- chore: upgrade react-native [#14](https://github.com/gr4vy/gr4vy-react-native/pull/14) ([@luca-gr4vy](https://github.com/luca-gr4vy))

#### 🐛 Bug Fix

- Skip corepack check for release job [#30](https://github.com/gr4vy/gr4vy-react-native/pull/30) ([@luca-gr4vy](https://github.com/luca-gr4vy))
- fix: deps [#29](https://github.com/gr4vy/gr4vy-react-native/pull/29) ([@luca-gr4vy](https://github.com/luca-gr4vy))

#### ⚠️ Pushed to `main`

- trigger GitHub actions ([@luca-gr4vy](https://github.com/luca-gr4vy))

#### 🏠 Internal

- fix: update insecure tar dependency [#26](https://github.com/gr4vy/gr4vy-react-native/pull/26) ([@luca-gr4vy](https://github.com/luca-gr4vy))
- task: beta releases [#12](https://github.com/gr4vy/gr4vy-react-native/pull/12) ([@luca-gr4vy](https://github.com/luca-gr4vy) [@douglaseggleton](https://github.com/douglaseggleton))
- task: example app updates [#11](https://github.com/gr4vy/gr4vy-react-native/pull/11) ([@luca-gr4vy](https://github.com/luca-gr4vy))

#### Authors: 2

- Douglas Eggleton ([@douglaseggleton](https://github.com/douglaseggleton))
- Luca Allievi ([@luca-gr4vy](https://github.com/luca-gr4vy))

---

# (Thu May 25 2023)


Expand Down
7 changes: 5 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,15 @@ The options passed to `showPaymentSheet` via the configuration object are as fol
| `metadata` | `null` | An optional object of key/values for transaction metadata. All values should be a string. |
| `paymentSource` | `null` | `installment`, `moto`, `recurring` - Can be used to signal that Embed is used to capture the first transaction for a subscription or an installment. When used, `store` is implied to be `true` and `display` is implied to be `supportsTokenization`. This means that payment options that do not support tokenization are automatically hidden. |
| `applePayMerchantId` | `null` | The Apple merchant ID to be used for Apple Pay transactions. |
| `cartItems` | `null` | An optional array of cart item objects, each object must define a `name`, `quantity`, and `unitAmount`. |
| `cartItems` | `null` | An optional array of cart item objects, each object must define a `name`, `quantity`, and `unitAmount`. Other optional properties are `discountAmount`, `taxAmount`, `externalIdentifier`, `sku`, `productUrl`, `imageUrl`, `categories` and `productType`. |
| `theme` | `null` | Theme customisation options [See Theming Options](https://docs.gr4vy.com/guides/payments/embed/theming#theme-options). The SDK also contains an additional two properties within the `colors` object: `headerBackground` and `headerText`. These are used for the navigation background and foreground colors. |
| `locale` | `null` | An optional locale, this consists of a `ISO 639 Language Code` followed by an optional `ISO 3166 Country Code`, e.g. `en`, `en-gb` or `pt-br`. |
| `statementDescriptor` | `null` | An optional object with information about the purchase to construct the statement information the buyer will see in their bank statement. Please note support for these fields varies across payment service providers and underlying banks, so Gr4vy can only ensure a best effort approach for each supported platform. <br />As an example, most platforms will only support a concatenation of `name` and `description` fields, truncated to a length of 22 characters. <br />The object can contain `name`, `description`, `phoneNumber`, `city` and `url` keys, with string values. `phoneNumber` should be in E164 format. Gr4vy recommends avoiding characters outside the alphanumeric range and the dot (`.`) to ensure wide compatibility. |
| `requireSecurityCode` | `false` | An optional boolean which forces security code to be prompted for stored card payments. |
| `shippingDetailsId` | `null` | An optional unique identifier of a set of shipping details stored for the buyer. |
| `merchantAccountId` | `null` | An optional merchant account ID. |
| `connectionOptions` | `null` | An optional set of values passed to a connection when processing a transaction (see https://docs.gr4vy.com/reference/transactions/new-transaction) |
| `buyer` | `null` | An optional object to represent the buyer (personal details, billing details, and shipping information). This cannot be used in conjunction with `buyerId` or `buyerExternalIdentifier`. |
| `debugMode` | `false` | `true`, `false` - Prints useful debug information to the console. |

### Events
Expand Down Expand Up @@ -146,7 +148,8 @@ Returns data about a successfully created transaction.
"success": true,
"transactionId": "...",
"status": "capture_succeeded",
"paymentMethodId": "..."
"paymentMethodId": "...",
"approvalUrl": "https://example.com"
}
}
```
Expand Down
5 changes: 3 additions & 2 deletions android/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ dependencies {
// For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+"

implementation "com.github.gr4vy:gr4vy-android:v1.6.3"

implementation "com.github.gr4vy:gr4vy-android:v1.11.0"
implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.3'
}

if (isNewArchitectureEnabled()) {
Expand Down
Loading

0 comments on commit 4b3838e

Please sign in to comment.