diff --git a/README.md b/README.md index c5233e3..2047f80 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Add a dependency to our library in the app build.gradle file: ```groovy dependencies { ... - implementation 'com.github.payzeio:payze-android-sdk:0.1.1' + implementation 'com.github.payzeio:payze-android-sdk:0.1.2' } ``` diff --git a/app/build.gradle b/app/build.gradle index a199e45..9fb9bdb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,12 +4,12 @@ plugins { } android { - compileSdk 31 + compileSdk 34 defaultConfig { applicationId "com.payze.payapp" minSdk 21 - targetSdk 31 + targetSdk 34 versionCode 1 versionName "1.0" diff --git a/app/src/main/java/com/payze/payapp/MainActivity.kt b/app/src/main/java/com/payze/payapp/MainActivity.kt index 0285b29..a871267 100644 --- a/app/src/main/java/com/payze/payapp/MainActivity.kt +++ b/app/src/main/java/com/payze/payapp/MainActivity.kt @@ -10,7 +10,7 @@ import com.payze.paylib.model.CardInfo class MainActivity : AppCompatActivity() { // should have one - private val transactionID = "72f55da8-8e2b-4ec0-8701-88ec1d80157a" + private val transactionID = "CFCBDAFB7F2D41EBA2E34E3EA" override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -24,7 +24,6 @@ class MainActivity : AppCompatActivity() { payze.pay( readCardData(), transactionID, - "", onSuccess = ::onSuccess, onError = ::onError ) diff --git a/build.gradle b/build.gradle index 59a783a..fcb3742 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:7.0.2" + classpath "com.android.tools.build:gradle:7.0.4" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..7454180 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a0f1aee..ffed3a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sat Dec 04 12:38:49 GET 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/paylib/build.gradle b/paylib/build.gradle index 07c5b94..b18b395 100644 --- a/paylib/build.gradle +++ b/paylib/build.gradle @@ -5,13 +5,13 @@ plugins { } android { - compileSdk 31 + compileSdk 34 defaultConfig { minSdk 21 - targetSdk 31 - versionCode 1 - versionName "1.0" + targetSdk 34 + versionCode 2 + versionName "0.1.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -59,7 +59,7 @@ afterEvaluate { groupId = 'com.github.payzeio' artifactId = 'payze-android-sdk' - version = '0.1.0' + version = '0.1.2' } } } diff --git a/paylib/src/androidTest/java/com/payze/paylib/ExampleInstrumentedTest.kt b/paylib/src/androidTest/java/com/payze/paylib/ExampleInstrumentedTest.kt index f310863..0ea6faf 100644 --- a/paylib/src/androidTest/java/com/payze/paylib/ExampleInstrumentedTest.kt +++ b/paylib/src/androidTest/java/com/payze/paylib/ExampleInstrumentedTest.kt @@ -1,24 +1,5 @@ package com.payze.paylib -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.payze.paylib.test", appContext.packageName) - } + } \ No newline at end of file diff --git a/paylib/src/main/java/com/payze/paylib/Payze.kt b/paylib/src/main/java/com/payze/paylib/Payze.kt index 316d1a5..1f313ef 100644 --- a/paylib/src/main/java/com/payze/paylib/Payze.kt +++ b/paylib/src/main/java/com/payze/paylib/Payze.kt @@ -5,12 +5,13 @@ import android.content.pm.ActivityInfo import androidx.appcompat.app.AppCompatActivity import com.payze.paylib.model.CardInfo import com.payze.paylib.network.ApiService +import com.payze.paylib.network.PaymentRequest import com.payze.paylib.network.TransactionStatus import com.payze.paylib.network.sendRequest class Payze(private val context: Context) { - private var transactionID: String? = null + private var transactionId: String? = null private var onSuccess: (() -> Unit)? = null private var onError: ((code: Int?, error: String?) -> Unit)? = null private val activity get() = context as AppCompatActivity @@ -22,7 +23,6 @@ class Payze(private val context: Context) { fun pay( cardInfo: CardInfo, transactionID: String, - billingAddress: String = "", onSuccess: () -> Unit, onError: (code: Int?, error: String?) -> Unit ) { @@ -32,7 +32,6 @@ class Payze(private val context: Context) { cardInfo.expirationDate, cardInfo.securityNumber, transactionID, - billingAddress, onSuccess, onError ) @@ -44,29 +43,41 @@ class Payze(private val context: Context) { expirationDate: String, securityNumber: String, transactionID: String, - billingAddress: String = "", onSuccess: () -> Unit, onError: (code: Int?, error: String?) -> Unit ) { - this.transactionID = transactionID + pay( + PaymentRequest( + number, + cardHolder, + expirationDate, + securityNumber, + transactionID + ), + onSuccess, + onError + ) + } + + fun pay( + paymentRequest: PaymentRequest, + onSuccess: () -> Unit, + onError: (code: Int?, error: String?) -> Unit + ) { + this.transactionId = paymentRequest.transactionId this.onSuccess = onSuccess this.onError = onError - ApiService.get().sendPaymentData( - number, - cardHolder, - expirationDate, - securityNumber, - transactionID, - billingAddress - ).sendRequest( + ApiService.get().sendPaymentData(paymentRequest).sendRequest( successWithData = { response -> response?.let { when { it.success == true && it.threeDSIsPresent == true && !it.url.isNullOrBlank() -> openWebView(it.url) + it.success == true && it.threeDSIsPresent != true -> - checkTransactionStatus(transactionID) + checkTransactionStatus(transactionId) + else -> handleError(KEY_UNKNOWN, context.getString(R.string.unknown_error)) } @@ -126,7 +137,7 @@ class Payze(private val context: Context) { activity.requestedOrientation = it } if (success) - checkTransactionStatus(transactionID) + checkTransactionStatus(transactionId) else handleError(KEY_DISMISS_2FA, context.getString(R.string.reject_auth)) } diff --git a/paylib/src/main/java/com/payze/paylib/network/ApiService.kt b/paylib/src/main/java/com/payze/paylib/network/ApiService.kt index 64b23e2..3a15c31 100644 --- a/paylib/src/main/java/com/payze/paylib/network/ApiService.kt +++ b/paylib/src/main/java/com/payze/paylib/network/ApiService.kt @@ -7,7 +7,10 @@ import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Call import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory -import retrofit2.http.* +import retrofit2.http.Body +import retrofit2.http.GET +import retrofit2.http.POST +import retrofit2.http.Query import java.util.concurrent.TimeUnit interface ApiService { @@ -53,15 +56,9 @@ interface ApiService { } - @FormUrlEncoded - @POST("mobile/cardInfo") + @POST("v2/payment/pay") fun sendPaymentData( - @Field("number") number: String, - @Field("cardHolder") cardHolder: String, - @Field("expirationDate") expirationDate: String, - @Field("securityNumber") securityNumber: String, - @Field("transactionId") transactionId: String, - @Field("billingAddress") billingAddress: String, + @Body paymentBody: PaymentRequest ): Call @GET("mobile/transactionStatus") diff --git a/paylib/src/main/java/com/payze/paylib/network/PaymentRequest.kt b/paylib/src/main/java/com/payze/paylib/network/PaymentRequest.kt index 16970e2..d030796 100644 --- a/paylib/src/main/java/com/payze/paylib/network/PaymentRequest.kt +++ b/paylib/src/main/java/com/payze/paylib/network/PaymentRequest.kt @@ -1,10 +1,16 @@ package com.payze.paylib.network +import com.squareup.moshi.Json + data class PaymentRequest( + @Json(name = "number") val number: String, + @Json(name = "cardHolder") val cardHolder: String, + @Json(name = "expirationDate") val expirationDate: String, + @Json(name = "securityNumber") val securityNumber: String, + @Json(name = "transactionId") val transactionId: String, - val billingAddress: String = "" ) \ No newline at end of file diff --git a/paylib/src/main/java/com/payze/paylib/network/PaymentResponse.kt b/paylib/src/main/java/com/payze/paylib/network/PaymentResponse.kt index b000d73..96a4b21 100644 --- a/paylib/src/main/java/com/payze/paylib/network/PaymentResponse.kt +++ b/paylib/src/main/java/com/payze/paylib/network/PaymentResponse.kt @@ -1,11 +1,20 @@ package com.payze.paylib.network +import com.squareup.moshi.Json + data class PaymentResponse( + @Json(name = "success") val success: Boolean?, + @Json(name = "url") val url: String?, + @Json(name = "threeDSIsPresent") val threeDSIsPresent: Boolean?, + @Json(name = "timestamp") val timestamp: String?, + @Json(name = "status") val status: Int?, + @Json(name = "error") val error: String?, + @Json(name = "path") val path: String? ) \ No newline at end of file diff --git a/paylib/src/main/java/com/payze/paylib/network/TransactionStatusResponse.kt b/paylib/src/main/java/com/payze/paylib/network/TransactionStatusResponse.kt index a3c9f9d..6f9f41c 100644 --- a/paylib/src/main/java/com/payze/paylib/network/TransactionStatusResponse.kt +++ b/paylib/src/main/java/com/payze/paylib/network/TransactionStatusResponse.kt @@ -3,6 +3,7 @@ package com.payze.paylib.network import com.squareup.moshi.Json class TransactionStatusResponse( + @Json(name = "status") val status: TransactionStatus ) diff --git a/paylib/src/test/java/com/payze/paylib/ExampleUnitTest.kt b/paylib/src/test/java/com/payze/paylib/ExampleUnitTest.kt index 740a6c1..e28eb33 100644 --- a/paylib/src/test/java/com/payze/paylib/ExampleUnitTest.kt +++ b/paylib/src/test/java/com/payze/paylib/ExampleUnitTest.kt @@ -1,17 +1,5 @@ package com.payze.paylib -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } + } \ No newline at end of file