Skip to content

Commit 045b970

Browse files
committed
Merge PR #48
tested
2 parents ea629f7 + c75f5c5 commit 045b970

14 files changed

Lines changed: 1956 additions & 1968 deletions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Add this dependency and repository to your POM.xml
1616
<dependency>
1717
<groupId>com.xero</groupId>
1818
<artifactId>xero-java-sdk</artifactId>
19-
<version>0.5.0</version>
19+
<version>0.6.0</version>
2020
</dependency>
2121

2222
<repositories>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.xero</groupId>
55
<artifactId>xero-java-sdk</artifactId>
66
<packaging>jar</packaging>
7-
<version>0.5.0</version>
7+
<version>0.6.0</version>
88
<name>Xero-Java SDK</name>
99
<url>http://maven.apache.org</url>
1010
<dependencies>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.xero.api;
2+
3+
import com.google.api.client.auth.oauth.OAuthSigner;
4+
5+
public class ConfigBasedSignerFactory implements SignerFactory {
6+
private static final String PUBLIC_APP = "PUBLIC";
7+
private Config config;
8+
9+
public ConfigBasedSignerFactory(Config config) {
10+
this.config = config;
11+
}
12+
13+
@Override
14+
public OAuthSigner createSigner(String tokenSharedSecret) {
15+
if (config.getAppType().equals(PUBLIC_APP)) {
16+
return new HmacSignerFactory(config.getConsumerSecret()).createSigner(tokenSharedSecret);
17+
} else {
18+
return new RsaSignerFactory(config.getPathToPrivateKey(), config.getPrivateKeyPassword()).createSigner(
19+
tokenSharedSecret);
20+
}
21+
}
22+
}

src/main/java/com/xero/api/HmacSigner.java

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.xero.api;
2+
3+
import com.google.api.client.auth.oauth.OAuthHmacSigner;
4+
5+
public class HmacSignerFactory implements SignerFactory {
6+
7+
private String consumerSecret;
8+
9+
public HmacSignerFactory(String consumerSecret) {
10+
this.consumerSecret = consumerSecret;
11+
}
12+
13+
@Override
14+
public OAuthHmacSigner createSigner(String tokenSecret) {
15+
OAuthHmacSigner signer = new OAuthHmacSigner();
16+
signer.tokenSharedSecret = tokenSecret;
17+
signer.clientSharedSecret = consumerSecret;
18+
return signer;
19+
}
20+
}

src/main/java/com/xero/api/JsonConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public String getAccessTokenUrl() {
9696

9797
@Override
9898
public String getUserAgent() {
99-
return USER_AGENT + " [Xero-Java-0.5.0]";
99+
return USER_AGENT + " [Xero-Java-0.6.0]";
100100
}
101101

102102
@Override

0 commit comments

Comments
 (0)