Added optional userId and customData support for rewarded AD (#51)

* Added optional custom data support for rewarded AD

* add: userId support

* add: support for ios

* make second parameter options table optional in `load_rewarded`

* update script_api for `load_rewarded`

Author: blendjam

.gitignore

@@ -11,4 +11,5 @@ builtins
 /.idea/
 /debug.keystore
 /debug.keystore.pass.txt
-/.editor_settings
+/.editor_settings
+/.vscode

extension-admob/api/admob.script_api

@@ -306,6 +306,22 @@
             Original docs
             [Android](https://developers.google.com/admob/android/rewarded-fullscreen),
             [iOS](https://developers.google.com/admob/ios/rewarded-ads)
+    - name: options
+      type: table
+      optional: true
+      desc: ServerSideVerificationOptions
+            [Android](https://developers.google.com/admob/android/rewarded#validate-ssv),
+            [iOS](https://developers.google.com/admob/ios/rewarded#validate-ssv)
+      fields:
+          - name: user_id
+            type: string
+            optional: true
+            desc: A unique identifier assigned to each user.
+          - name: custom_data 
+            type: string
+            optional: true
+            desc: Custom Data attached to server-side reward callbacks. 
+
 
 #*****************************************************************************************************
 

extension-admob/src/admob.cpp

@@ -72,7 +72,24 @@ static int Lua_LoadRewarded(lua_State* L)
         return DM_LUA_ERROR("Expected string, got %s. Wrong type for Rewarded UnitId variable '%s'.", luaL_typename(L, 1), lua_tostring(L, 1));
     }
     const char* unitId_lua = luaL_checkstring(L, 1);
-    LoadRewarded(unitId_lua);
+
+    char* userId_lua = 0;
+    char* customData_lua = 0;
+    if (lua_istable(L, 2))
+    {
+        lua_getfield(L, 2, "user_id");
+        if (lua_isstring(L, -1)) {
+            userId_lua = (char*)luaL_checkstring(L, -1);
+        }
+        lua_pop(L, 1);
+
+        lua_getfield(L, 2, "custom_data");
+        if (lua_isstring(L, -1)) {
+            customData_lua = (char*)luaL_checkstring(L, -1);
+        }
+        lua_pop(L, 1);
+    }
+    LoadRewarded(unitId_lua, userId_lua, customData_lua);
     return 0;
 }
 

extension-admob/src/admob_android.cpp

@@ -93,6 +93,20 @@ static void CallVoidMethodCharBoolean(jobject instance, jmethodID method, const
     env->DeleteLocalRef(jstr);
 }
 
+static void CallVoidMethodCharCharChar(jobject instance, jmethodID method, const char* cstr, const char* cstr2, const char* cstr3)
+{
+    dmAndroid::ThreadAttacher threadAttacher;
+    JNIEnv* env = threadAttacher.GetEnv();
+
+    jstring jstr = env->NewStringUTF(cstr);
+    jstring jstr2 = env->NewStringUTF(cstr2);
+    jstring jstr3 = env->NewStringUTF(cstr3);
+    env->CallVoidMethod(instance, method, jstr, jstr2, jstr3);
+    env->DeleteLocalRef(jstr);
+    env->DeleteLocalRef(jstr2);
+    env->DeleteLocalRef(jstr3);
+}
+
 static void CallVoidMethodInt(jobject instance, jmethodID method, int cint)
 {
     dmAndroid::ThreadAttacher threadAttacher;
@@ -116,7 +130,7 @@ static void InitJNIMethods(JNIEnv* env, jclass cls)
     g_admob.m_ShowAppOpen = env->GetMethodID(cls, "showAppOpen", "()V");
     g_admob.m_LoadInterstitial = env->GetMethodID(cls, "loadInterstitial", "(Ljava/lang/String;)V");
     g_admob.m_ShowInterstitial = env->GetMethodID(cls, "showInterstitial", "()V");
-    g_admob.m_LoadRewarded = env->GetMethodID(cls, "loadRewarded", "(Ljava/lang/String;)V");
+    g_admob.m_LoadRewarded = env->GetMethodID(cls, "loadRewarded", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
     g_admob.m_ShowRewarded = env->GetMethodID(cls, "showRewarded", "()V");
     g_admob.m_LoadRewardedInterstitial  = env->GetMethodID(cls, "loadRewardedInterstitial", "(Ljava/lang/String;)V");
     g_admob.m_ShowRewardedInterstitial  = env->GetMethodID(cls, "showRewardedInterstitial", "()V");
@@ -193,9 +207,9 @@ bool IsInterstitialLoaded()
     return CallBoolMethod(g_admob.m_AdmobJNI, g_admob.m_IsInterstitialLoaded);
 }
 
-void LoadRewarded(const char* unitId)
+void LoadRewarded(const char* unitId, const char* userId, const char* customData)
 {
-    CallVoidMethodChar(g_admob.m_AdmobJNI, g_admob.m_LoadRewarded, unitId);
+    CallVoidMethodCharCharChar(g_admob.m_AdmobJNI, g_admob.m_LoadRewarded, unitId, userId, customData);
 }
 
 void ShowRewarded()

extension-admob/src/admob_ios.mm

@@ -276,7 +276,14 @@ void SetRewardedAd(GADRewardedAd *newAd) {
         rewardedAd = newAd;
     }
 
-    void LoadRewarded(const char* unitId) {
+    void LoadRewarded(const char* unitId, const char* userId, const char* customData) {
+        GADServerSideVerificationOptions *ssvOptions = [[GADServerSideVerificationOptions alloc] init];
+        if (userId) {
+            ssvOptions.userIdentifier = [NSString stringWithUTF8String:userId];
+        }
+        if (customData) {
+            ssvOptions.customRewardString = [NSString stringWithUTF8String:customData];
+        }
         [GADRewardedAd
             loadWithAdUnitID:[NSString stringWithUTF8String:unitId]
             request:createGADRequest()
@@ -288,6 +295,7 @@ void LoadRewarded(const char* unitId) {
                           @"error", [NSString stringWithFormat:@"Error domain: \"%@\". %@", [error domain], [error localizedDescription]]);
                     return;
                 }
+                ad.serverSideVerificationOptions = ssvOptions;
                 SetRewardedAd(ad);
                 SendSimpleMessage(MSG_REWARDED, EVENT_LOADED);
             }];

extension-admob/src/admob_private.h

@@ -50,7 +50,7 @@ void LoadAppOpen(const char* unitId, bool showImmediately);
 void ShowAppOpen();
 void LoadInterstitial(const char* unitId);
 void ShowInterstitial();
-void LoadRewarded(const char* unitId);
+void LoadRewarded(const char* unitId, const char* userId,  const char* customData);
 void ShowRewarded();
 void LoadRewardedInterstitial(const char* unitId);
 void ShowRewardedInterstitial();

extension-admob/src/java/com/defold/admob/AdmobJNI.java

@@ -43,6 +43,7 @@
 import com.google.android.gms.ads.rewarded.RewardItem;
 import com.google.android.gms.ads.rewarded.RewardedAd;
 import com.google.android.gms.ads.rewarded.RewardedAdLoadCallback;
+import com.google.android.gms.ads.rewarded.ServerSideVerificationOptions;
 
 import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAd;
 import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAdLoadCallback;
@@ -502,7 +503,15 @@ public boolean isInterstitialLoaded() {
 
   private RewardedAd mRewardedAd;
 
-  public void loadRewarded(final String unitId) {
+  private void setRewardedCustomData(final String userId, final String customData) {
+    ServerSideVerificationOptions options = new ServerSideVerificationOptions.Builder()
+      .setUserId(userId != null ? userId : "")
+      .setCustomData(customData != null ? customData : "")
+      .build();
+    mRewardedAd.setServerSideVerificationOptions(options);
+  }
+
+  public void loadRewarded(final String unitId, final String userId,  final String customData) {
     activity.runOnUiThread(new Runnable() {
       @Override
       public void run() {
@@ -515,6 +524,7 @@ public void onAdLoaded(@NonNull RewardedAd rewardedAd) {
               // Log.d(TAG, "onAdLoaded");
               mRewardedAd = rewardedAd;
               sendSimpleMessage(MSG_REWARDED, EVENT_LOADED);
+              setRewardedCustomData(userId, customData);
               mRewardedAd.setFullScreenContentCallback(new FullScreenContentCallback() {
                 @Override
                 public void onAdDismissedFullScreenContent() {