Revert "updated HMAC Auth logic for api with request params, added ex…

…ample class for user apis" This reverts commit 04557ab
paypay · Oct 12, 2020 · 74e28d1 · 74e28d1
1 parent 04557ab
commit 74e28d1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 61 deletions.
diff --git a/src/main/java/jp/ne/paypay/auth/HmacAuth.java b/src/main/java/jp/ne/paypay/auth/HmacAuth.java
@@ -69,20 +69,10 @@ private  byte[]  getHmacData(String nonce, long epoch, String hash){
             localContentType = this.contentType;
         }
         String  DELIMITER = "\n";
-        return (formatRequestUrl(this.requestUrl) + DELIMITER + this.httpMethod + DELIMITER + nonce + DELIMITER + epoch + DELIMITER
+        return (this.requestUrl + DELIMITER + this.httpMethod + DELIMITER + nonce + DELIMITER + epoch + DELIMITER
                 + localContentType + DELIMITER + hash)
                 .getBytes(StandardCharsets.UTF_8);
     }
-    private String formatRequestUrl(String requestUrl){
-        try{
-            if(requestUrl.contains("?")){
-                requestUrl =  requestUrl.substring(0, requestUrl.indexOf("?"));
-            }
-        }catch (Exception e){
-            System.out.println("Exception while formatting request url for HMAC Auth");
-        }
-        return requestUrl;
-    }
     @Override
     public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams) {
         if (apiKey == null ||  apiSecretKey == null) {
@@ -94,6 +84,7 @@ public void applyToParams(List<Pair> queryParams, Map<String, String> headerPara
         }catch (Exception e){
             System.err.println("Error in getting Authorization: "+e);
         }
+
     }
 
     public String getApiKey() {

diff --git a/src/main/java/jp/ne/paypay/example/UserApiExample.java b/src/main/java/jp/ne/paypay/example/UserApiExample.java
diff --git a/src/test/java/jp/ne/paypay/api/HmacAuthTest.java b/src/test/java/jp/ne/paypay/api/HmacAuthTest.java
@@ -35,12 +35,10 @@ public void hmacAuthTest(){
         Assert.assertNotNull(hmacAuth.getHttpMethod());
         Assert.assertNotNull(hmacAuth.getRequestBody());
         Assert.assertNotNull(hmacAuth.getRequestUrl());
-        hmacAuth.setRequestUrl("/v2/api/test?param=p1");
-        hmacAuth.applyToParams(queryParams, headerParams);
-        Assert.assertTrue(headerParams.get("Authorization").startsWith("hmac"));
         hmacAuth.setContentType(null);
         headerParams = new HashMap<>();
         hmacAuth.applyToParams(queryParams, headerParams);
         Assert.assertNull(headerParams.get("Authorization"));
+
     }
 }