Skip to content

Enhance validate phone number method #18

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

Open
andhikaribrahim wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enhance validate phone number method #18

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
15 changes: 14 additions & 1 deletion src/main/java/com/xfers/model/Connect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class Connect {
public static ConnectResponse getToken(String phoneNumber, String OTP, String returnURL, String appKey, String secretKey)
throws AuthenticationException, InvalidRequestException, APIException, APIConnectionException, UnirestException {
Map<String, Object> params = new HashMap<String, Object>();
phoneNumber = validate_phone(phoneNumber);
params.put("phone_no", phoneNumber);
params.put("otp", OTP);
params.put("signature", getSignature(phoneNumber, secretKey, OTP));
Expand All @@ -44,6 +45,7 @@ public static ConnectResponse getToken(String phoneNumber, String OTP, String re
public static String authorize(String phoneNumber, String appKey, String secretKey)
throws AuthenticationException, InvalidRequestException, APIException, APIConnectionException, UnirestException {
Map<String, Object> params = new HashMap<String, Object>();
phoneNumber = validate_phone(phoneNumber);
params.put("phone_no", phoneNumber);
params.put("signature", getSignature(phoneNumber, secretKey));

Expand All @@ -59,6 +61,7 @@ public static String authorize(String phoneNumber, String appKey, String secretK
public static ConnectResponse privateAuthorize(String phoneNumber, String appKey, String secretKey)
throws AuthenticationException, InvalidRequestException, APIException, APIConnectionException, UnirestException {
Map<String, Object> params = new HashMap<String, Object>();
phoneNumber = validate_phone(phoneNumber);
params.put("phone_no", phoneNumber);
params.put("signature", getSignature(phoneNumber, secretKey));

Expand Down Expand Up @@ -93,7 +96,16 @@ public static String validate_phone(String phoneNumber)
{
if(phoneNumber.charAt(0) == '0')
{
return "+62".concat(phoneNumber.substring(1));
phoneNumber = phoneNumber.replaceFirst("^0+(?!$)", "");
if (phoneNumber.charAt(0) == '6' && phoneNumber.charAt(1) == '2')
{
return "+".concat(phoneNumber);
}
return "+62".concat(phoneNumber);
}
else if(phoneNumber.charAt(0) == '6' && phoneNumber.charAt(1) == '2')
{
return "+".concat(phoneNumber);
}
else
{
Expand All @@ -102,6 +114,7 @@ public static String validate_phone(String phoneNumber)
}

}

public static String getSignature(String phoneNumber, String secretKey, String OTP) {
String beforeSHA1;
phoneNumber = validate_phone(phoneNumber);
Expand Down