From 40c3eaa2fe83c50808fe28d374926c0aecfb7a1a Mon Sep 17 00:00:00 2001 From: Artem Farafonov Date: Wed, 13 Jan 2021 23:33:09 +0400 Subject: [PATCH 1/6] add typings --- index.d.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 index.d.ts diff --git a/index.d.ts b/index.d.ts new file mode 100644 index 0000000..146c675 --- /dev/null +++ b/index.d.ts @@ -0,0 +1,16 @@ +export module "react-native-ok-sdk" { + export const Scopes = { + VALUABLE_ACCESS: "VALUABLE_ACCESS", + SET_STATUS: "SET_STATUS", + PHOTO_CONTENT: "PHOTO_CONTENT", + GROUP_CONTENT: "GROUP_CONTENT", + VIDEO_CONTENT: "VIDEO_CONTENT", + APP_INVITE: "APP_INVITE", + LONG_ACCESS_TOKEN: "LONG_ACCESS_TOKEN", + }; + + export default class OkManager { + initialize(appId: string, appKey: string); + login(permissions: Array); + } +} From d478458fd9e5d9162920cb382ca5451da986440e Mon Sep 17 00:00:00 2001 From: Artem Farafonov Date: Wed, 13 Jan 2021 23:43:17 +0400 Subject: [PATCH 2/6] fixed typings --- index.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.d.ts b/index.d.ts index 146c675..2df9897 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,4 +1,4 @@ -export module "react-native-ok-sdk" { +declare module "react-native-ok-sdk" { export const Scopes = { VALUABLE_ACCESS: "VALUABLE_ACCESS", SET_STATUS: "SET_STATUS", @@ -10,7 +10,7 @@ export module "react-native-ok-sdk" { }; export default class OkManager { - initialize(appId: string, appKey: string); - login(permissions: Array); + static initialize(appId: string, appKey: string); + static login(permissions: Array): Primise; } } From 816a411bf2671e9526b3e3b2c29483aece99ace8 Mon Sep 17 00:00:00 2001 From: Artem Farafonov Date: Tue, 9 Feb 2021 21:14:56 +0400 Subject: [PATCH 3/6] bump version --- android/build.gradle | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 3de073e..e6ffc48 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -36,5 +36,5 @@ repositories { dependencies { compile 'com.android.support:appcompat-v7:25.0.0' compile 'com.facebook.react:react-native:+' - compile 'ru.ok:odnoklassniki-android-sdk:2.1.6' + compile 'ru.ok:odnoklassniki-android-sdk:2.1.8' } diff --git a/package.json b/package.json index 2c19348..f74833f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-ok-sdk", - "version": "0.0.1", + "version": "0.0.2", "description": "OK SDK support for React Native apps", "main": "index.js", "scripts": { @@ -60,6 +60,6 @@ }, "homepage": "https://github.com/askiiRobotics/react-native-ok-sdk#readme", "engines": { - "node" : ">8.11.0" + "node": ">8.11.0" } } From d6435533c8ff738dae72c2bd576bf47f084cd1b4 Mon Sep 17 00:00:00 2001 From: Artem Farafonov Date: Tue, 9 Feb 2021 21:21:54 +0400 Subject: [PATCH 4/6] restore dep version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index e6ffc48..3de073e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -36,5 +36,5 @@ repositories { dependencies { compile 'com.android.support:appcompat-v7:25.0.0' compile 'com.facebook.react:react-native:+' - compile 'ru.ok:odnoklassniki-android-sdk:2.1.8' + compile 'ru.ok:odnoklassniki-android-sdk:2.1.6' } From f9322c35eec10d564a35f539107c87951f08f670 Mon Sep 17 00:00:00 2001 From: Artem Farafonov Date: Tue, 3 Aug 2021 16:57:07 +0400 Subject: [PATCH 5/6] bump dependency version --- android/build.gradle | 2 +- index.d.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 3de073e..e6ffc48 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -36,5 +36,5 @@ repositories { dependencies { compile 'com.android.support:appcompat-v7:25.0.0' compile 'com.facebook.react:react-native:+' - compile 'ru.ok:odnoklassniki-android-sdk:2.1.6' + compile 'ru.ok:odnoklassniki-android-sdk:2.1.8' } diff --git a/index.d.ts b/index.d.ts index 2df9897..2b5b791 100644 --- a/index.d.ts +++ b/index.d.ts @@ -11,6 +11,6 @@ declare module "react-native-ok-sdk" { export default class OkManager { static initialize(appId: string, appKey: string); - static login(permissions: Array): Primise; + static login(permissions: Array): Promise; } } From 4bf18218311711766480b11c6f49c8070c123e0d Mon Sep 17 00:00:00 2001 From: Artem Farafonov Date: Tue, 3 Aug 2021 18:07:04 +0400 Subject: [PATCH 6/6] fix compilation --- .../reactnativeoksdk/OkManagerModule.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/android/src/main/java/com/askiirobotics/reactnativeoksdk/OkManagerModule.java b/android/src/main/java/com/askiirobotics/reactnativeoksdk/OkManagerModule.java index 4285bb6..7f3c295 100644 --- a/android/src/main/java/com/askiirobotics/reactnativeoksdk/OkManagerModule.java +++ b/android/src/main/java/com/askiirobotics/reactnativeoksdk/OkManagerModule.java @@ -19,7 +19,7 @@ import ru.ok.android.sdk.Odnoklassniki; import ru.ok.android.sdk.OkListener; -import ru.ok.android.sdk.Shared; +import ru.ok.android.sdk.SharedKt; import ru.ok.android.sdk.util.OkAuthType; import ru.ok.android.sdk.OkRequestMode; @@ -63,7 +63,7 @@ public void login(final ReadableArray scope, final Promise promise) { @Override public void onSuccess(JSONObject json) { Log.d(LOG, "Check valid token success"); - resolveWithCurrentUser(json.optString(Shared.PARAM_ACCESS_TOKEN), json.optString(Shared.PARAM_SESSION_SECRET_KEY)); + resolveWithCurrentUser(json.optString(SharedKt.PARAM_ACCESS_TOKEN), json.optString(SharedKt.PARAM_SESSION_SECRET_KEY)); } @Override @@ -95,7 +95,7 @@ private OkListener getAuthListener() { @Override public void onSuccess(final JSONObject json) { Log.d(LOG, "Activity auth success"); - resolveWithCurrentUser(json.optString(Shared.PARAM_ACCESS_TOKEN), json.optString(Shared.PARAM_SESSION_SECRET_KEY)); + resolveWithCurrentUser(json.optString(SharedKt.PARAM_ACCESS_TOKEN), json.optString(SharedKt.PARAM_SESSION_SECRET_KEY)); } @Override @@ -111,11 +111,11 @@ private void resolveWithCurrentUser(final String accessToken, final String sessi @Override public void run() { try { - String userStr = odnoklassniki.request("users.getCurrentUser", null, OkRequestMode.DEFAULT); + String userStr = odnoklassniki.request("users.getCurrentUser", null, OkRequestMode.getDEFAULT()); JSONObject user = new JSONObject(userStr); WritableMap result = Arguments.createMap(); - result.putString(Shared.PARAM_ACCESS_TOKEN, accessToken); - result.putString(Shared.PARAM_SESSION_SECRET_KEY, sessionSecretKey); + result.putString(SharedKt.PARAM_ACCESS_TOKEN, accessToken); + result.putString(SharedKt.PARAM_SESSION_SECRET_KEY, sessionSecretKey); result.putMap("user", JSONUtil.convertMap(user)); loginPromise.resolve(result); } catch (Exception e) {