Skip to content

Commit 2153075

Browse files
committed
Some fixes for Android SDK
1 parent 2881656 commit 2153075

File tree

3 files changed

+22
-11
lines changed

3 files changed

+22
-11
lines changed

android/src/main/java/com/nextar/sumup/RNSumUpModule.java

+4-9
Original file line numberDiff line numberDiff line change
@@ -164,17 +164,12 @@ public void preferences(Promise promise) {
164164
}
165165

166166
@ReactMethod
167-
public void isLoggedIn(Promise promise) {
168-
WritableMap map = Arguments.createMap();
169-
if (CoreState.Instance() == null) {
170-
map.putBoolean("isLoggedIn", false);
171-
} else {
172-
map.putBoolean("isLoggedIn", ((UserModel)CoreState.Instance().get(UserModel.class)).isLoggedIn());
167+
public void isLoggedIn(Promise promise) {
168+
WritableMap map = Arguments.createMap();
169+
map.putBoolean("isLoggedIn", SumUpAPI.isLoggedIn());
170+
promise.resolve(map);
173171
}
174172

175-
promise.resolve(map);
176-
}
177-
178173
private final ActivityEventListener mActivityEventListener = new BaseActivityEventListener() {
179174

180175
@Override

index.js

+17-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,23 @@ const RNSumUp = {
4747
return RNSumUpWrapper.prepareForCheckout();
4848
},
4949

50-
checkout(request) {
50+
checkout(request, token = null) {
51+
if (Platform.OS === 'android') {
52+
if (!token)
53+
throw new Error('For Android checkouts you need to provide an OAuth2 token. Please, read: https://github.com/sumup/sumup-android-sdk#5-transparent-authentication');
54+
55+
return this.isLoggedIn().then((result) => {
56+
if (!result.isLoggedIn) {
57+
const authWithToken = new Promise(async resolve => {
58+
await this.authenticateWithToken(token);
59+
resolve();
60+
});
61+
62+
return authWithToken.then(() => RNSumUpWrapper.checkout(request));
63+
}
64+
return RNSumUpWrapper.checkout(request);
65+
});
66+
}
5167
return RNSumUpWrapper.checkout(request);
5268
},
5369

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rn-sumup",
3-
"version": "1.0.9",
3+
"version": "1.0.10",
44
"description": "SumUp SDK Wrapper for React Native.",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)