Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add fields to authentication #130

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+61 −37
Open

add fields to authentication #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 36 additions & 33 deletions app/src/main/java/com/xendit/example/AuthenticationActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@

public class AuthenticationActivity extends AppCompatActivity implements View.OnClickListener {

public static final String PUBLISHABLE_KEY = "xnd_public_development_D8wJuWpOY15JvjJyUNfCdDUTRYKGp8CSM3W0ST4d0N4CsugKyoGEIx6b84j1D7Pg";
private EditText apiKeyEditText;
private EditText tokenIdEditText;
private EditText amountEditText;
private EditText currencyEditText;
private EditText cardCvnEditText;
private EditText cardHolderFirstNameEditText;
private EditText cardHolderLastNameEditText;
Expand All @@ -50,8 +53,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {

setActionBarTitle("Authentication");

apiKeyEditText = (EditText) findViewById(R.id.apiKeyEditText_AuthenticationActivity);
tokenIdEditText = (EditText) findViewById(R.id.tokenIdEditText_AuthenticationActivity);
amountEditText = (EditText) findViewById(R.id.amountEditText_AuthenticationActivity);
currencyEditText = (EditText) findViewById(R.id.currencyEditText_AuthenticationActivity);
cardCvnEditText = (EditText) findViewById(R.id.cardCvnEditText_AuthenticationActivity);
cardHolderFirstNameEditText = (EditText) findViewById(R.id.cardHolderFirstNameEditText_AuthenticationActivity);
cardHolderLastNameEditText = (EditText) findViewById(R.id.cardHolderLastNameEditText_AuthenticationActivity);
Expand All @@ -62,7 +67,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
authenticateBtn = (Button) findViewById(R.id.authenticateBtn_AuthenticationActivity);
resultTextView = (TextView) findViewById(R.id.result_AuthenticationActivity);

apiKeyEditText.setText(PUBLISHABLE_KEY);
amountEditText.setText(getString(R.string.amountTest));
currencyEditText.setText(getString(R.string.currencyTest));
cardCvnEditText.setText(getString(R.string.cvnTest));
cardHolderFirstNameEditText.setText(R.string.cardHolderFirstNameTest);
cardHolderLastNameEditText.setText(R.string.cardHolderLastNameTest);
Expand All @@ -84,46 +91,42 @@ private void setActionBarTitle(String title) {
@Override
public void onClick(View view) {

Xendit xendit = new Xendit(getApplicationContext(), CreateTokenActivity.PUBLISHABLE_KEY, this);

String apiKey = apiKeyEditText.getText().toString();
String tokenId = tokenIdEditText.getText().toString();
String amount = amountEditText.getText().toString();
String currency = currencyEditText.getText().toString();
String cardCvn = cardCvnEditText.getText().toString();
String onBehalfOf = "";
String midLabel = midLabelText.getText().toString();

Xendit xendit = new Xendit(getApplicationContext(), apiKey, this);

AuthenticationCallback callback = new AuthenticationCallback() {
@Override
public void onSuccess(Authentication authentication) {
Gson gson = new Gson();
AuthenticationResponse authenticationResponse = new AuthenticationResponse(authentication);
String json = gson.toJson(authenticationResponse);
resultTextView.setText(json);
Toast.makeText(AuthenticationActivity.this, "Status: " + authentication.getStatus(), Toast.LENGTH_SHORT).show();
}

@Override
public void onError(XenditError xenditError) {
String errorMessage = String.format("{ \"error_code\": \"%s\", \"message\": \"%s\" }", xenditError.getErrorCode(), xenditError.getErrorMessage());
resultTextView.setText(errorMessage);
Toast.makeText(AuthenticationActivity.this, xenditError.getErrorCode(), Toast.LENGTH_SHORT).show();
}
};

if (midLabel.isBlank()){
xendit.createAuthentication(tokenId, amount, "IDR", cardCvn, onBehalfOf, new AuthenticationCallback() {
@Override
public void onSuccess(Authentication authentication) {
Gson gson = new Gson();
AuthenticationResponse authenticationResponse = new AuthenticationResponse(authentication);
String json = gson.toJson(authenticationResponse);
resultTextView.setText(json);
Toast.makeText(AuthenticationActivity.this, "Status: " + authentication.getStatus(), Toast.LENGTH_SHORT).show();
}

@Override
public void onError(XenditError xenditError) {
Toast.makeText(AuthenticationActivity.this, xenditError.getErrorCode(), Toast.LENGTH_SHORT).show();
}
});
} else {
xendit.createAuthentication(tokenId, amount, "IDR", cardCvn, onBehalfOf, midLabel ,new AuthenticationCallback() {
@Override
public void onSuccess(Authentication authentication) {
Gson gson = new Gson();
AuthenticationResponse authenticationResponse = new AuthenticationResponse(authentication);
String json = gson.toJson(authenticationResponse);
resultTextView.setText(json);
Toast.makeText(AuthenticationActivity.this, "Status: " + authentication.getStatus(), Toast.LENGTH_SHORT).show();
}

@Override
public void onError(XenditError xenditError) {
Toast.makeText(AuthenticationActivity.this, xenditError.getErrorCode(), Toast.LENGTH_SHORT).show();
}
});
if (cardCvn.isBlank()) {
xendit.createAuthentication(tokenId, amount, currency, onBehalfOf, callback);
} else {
xendit.createAuthentication(tokenId, amount, currency, cardCvn, onBehalfOf, callback);
}
} else{
xendit.createAuthentication(tokenId, amount, currency, cardCvn, onBehalfOf, midLabel , callback);
}

}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/xendit/example/CreateTokenActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

public class CreateTokenActivity extends AppCompatActivity implements View.OnClickListener {

public static final String PUBLISHABLE_KEY = "xnd_public_development_O4uGfOR3gbOunJU4frcaHmLCYNLy8oQuknDm+R1r9G3S/b2lBQR+gQ==";
public static final String PUBLISHABLE_KEY = "xnd_public_development_D8wJuWpOY15JvjJyUNfCdDUTRYKGp8CSM3W0ST4d0N4CsugKyoGEIx6b84j1D7Pg";
public static final String onBehalfOf = "";

private EditText apiKeyEditText;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/xendit/example/StoreCvnActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import com.xendit.utils.StoreCVNCallback;

public class StoreCvnActivity extends AppCompatActivity implements View.OnClickListener {
public static final String DUMMY_PUBLISHABLE_KEY = "xnd_public_development_O4uGfOR3gbOunJU4frcaHmLCYNLy8oQuknDm+R1r9G3S/b2lBQR+gQ==";
public static final String DUMMY_PUBLISHABLE_KEY = "xnd_public_development_D8wJuWpOY15JvjJyUNfCdDUTRYKGp8CSM3W0ST4d0N4CsugKyoGEIx6b84j1D7Pg";

private EditText tokenId;
private EditText cardCVN;
Expand Down
23 changes: 22 additions & 1 deletion app/src/main/res/layout/activity_authentication.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,23 @@
android:background="@android:color/white"
android:orientation="vertical">

<EditText
android:id="@+id/apiKeyEditText_AuthenticationActivity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:hint="API Key"
android:textColor="@android:color/black"
android:textColorHint="#cccccc" />

<EditText
android:id="@+id/tokenIdEditText_AuthenticationActivity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:hint="Token ID"
android:textColor="@android:color/black"
android:textColorHint="#cccccc"/>
android:textColorHint="#cccccc" />

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -32,6 +41,18 @@
android:textColor="@android:color/black"
android:textColorHint="#cccccc" />

<EditText
android:id="@+id/currencyEditText_AuthenticationActivity"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:layout_marginRight="5dp"
android:layout_weight="1"
android:hint="Currency"
android:inputType="text"
android:textColor="@android:color/black"
android:textColorHint="#cccccc" />

<EditText
android:id="@+id/cardCvnEditText_AuthenticationActivity"
android:layout_width="0dp"
Expand Down
2 changes: 1 addition & 1 deletion xendit-android/src/androidTest/java/com/xendit/AuthTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@SmallTest
public class AuthTest {

private final static String PUBLISHABLE_KEY = "xnd_public_development_O4uGfOR3gbOunJU4frcaHmLCYNLy8oQuknDm+R1r9G3S/b2lBQR+gQ==";
private final static String PUBLISHABLE_KEY = "xnd_public_production_zY1voDvOj27UWD5rAX4LMWuiafcylMEUBmtUX3OHpNbuOSto9zOqlNIEt7K";
private Context appContext = InstrumentationRegistry.getInstrumentation().getContext();
private final Xendit xendit = new Xendit(appContext, PUBLISHABLE_KEY);

Expand Down