Adds Button for UI and Corrects All Typings.

Author: Brendan Ingham

demo/app/main-page.xml

@@ -18,7 +18,7 @@
       <TabViewItem.view>
         <ScrollView>
           <GridLayout columns="*, *"
-                      rows="auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto"
+                      rows="auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto, auto"
                       horizontalAlignment="stretch"
                       class="tab-content">
             <Button row="0" colSpan="2" text="init firebase - do this first" tap="{{ doWebInit }}" class="button button-positive"/>
@@ -72,6 +72,10 @@
 
             <Label row="19" colSpan="2" text="{{ storageFeedback }}" class="message" textWrap="true"/>
 
+            <Label row="20" colSpan="2" text="Callable Functions" class="subtitle" />
+
+            <Button row="21" col="0" text="callable 1" tap="{{ doCallableFunction }}"  class="button button-functions" />
+
           </GridLayout>
         </ScrollView>
       </TabViewItem.view>

demo/app/main-view-model.ts

@@ -8,6 +8,7 @@ import { MessagingViewModel } from './messaging-view-model';
 
 const firebaseWebApi = require("nativescript-plugin-firebase/app");
 
+
 declare const Crashlytics: any;
 
 export class HelloWorldModel extends Observable {
@@ -195,6 +196,25 @@ export class HelloWorldModel extends Observable {
     }
   }
 
+  public doCallableFunction(): void {
+    const fn = firebaseWebApi.functions().httpsCallable('helloWorldJson');
+
+    fn( 'Hello' ).then((DataCue) => {
+      alert({
+        title: "Callable Function Result",
+        message: JSON.stringify(DataCue),
+        okButtonText: "Nice!"
+      });
+    })
+    .catch((e) => {
+      alert({
+        title: "An Error Occurred",
+        message: e.message,
+        okButtonText: "OK, thanks"
+      });
+    });
+  }
+
   public doWebAddValueEventListenerForCompanies(): void {
     const path = "/companies";
     const onValueEvent = result => {

src/app/functions/index.ts

@@ -2,7 +2,7 @@ import * as firebase from "../../firebase";
 
 export namespace functions {
     // tslint:disable-next-line:class-name
-    export class functions {
+    export class Functions {
         httpsCallable<I, O>( functionName: string ) {
             return firebase.functions.httpsCallable<I, O>(functionName);
         }

src/app/index.ts

@@ -8,6 +8,7 @@ import { auth as firebaseAuthModule } from "./auth";
 import { database as firebaseDatabaseModule } from "./database";
 import { firestore as firebaseFirestoreModule } from "./firestore";
 import { storage as firebaseStorageModule } from "./storage";
+import { functions as firebaseFunctionsModule } from './functions';
 
 export function initializeApp(options?: firebase.InitOptions, name? /* ignored */: string): Promise<any> {
   return firebase.init(options);
@@ -46,6 +47,17 @@ export function firestore(app?: any): firebaseFirestoreModule.Firestore {
   return firestoreCache;
 }
 
+let functionsCache;
+export function functions(app?: any): firebaseFunctionsModule.Functions {
+  if (app) {
+    console.log("The 'app' param is ignored at the moment.");
+  }
+  if ( !functionsCache ) {
+    functionsCache = new firebaseFunctionsModule.Functions();
+  }
+  return functionsCache;
+}
+
 let storageCache;
 export function storage(app?: any): firebaseStorageModule.Storage {
   if (app) {

src/firebase.android.ts

@@ -6,6 +6,7 @@ import {
   isDocumentReference
 } from "./firebase-common";
 import * as firebaseMessaging from "./messaging/messaging";
+import * as firebaseFunctions from "./functions/functions";
 import * as appModule from "tns-core-modules/application";
 import { AndroidActivityResultEventData } from "tns-core-modules/application";
 import { ad as AndroidUtils, layout } from "tns-core-modules/utils/utils";
@@ -448,6 +449,8 @@ firebase.subscribeToTopic = firebaseMessaging.subscribeToTopic;
 firebase.unsubscribeFromTopic = firebaseMessaging.unsubscribeFromTopic;
 firebase.areNotificationsEnabled = firebaseMessaging.areNotificationsEnabled;
 
+firebase.functions = firebaseFunctions;
+
 firebase.addOnDynamicLinkReceivedCallback = callback => {
   return new Promise((resolve, reject) => {
     try {

src/firebase.d.ts

@@ -847,8 +847,8 @@ export namespace firestore {
 }
 
 export namespace functions {
-  declare type HttpsCallable<I, O> = ( callableData: I ) => Promise<O>;
-  declare function httpsCallable<I, O>( callableFunctionName: string ): HttpsCallable<I, O>;
+  export type HttpsCallable<I, O> = ( callableData: I ) => Promise<O>;
+  export function httpsCallable<I, O>( callableFunctionName: string ): HttpsCallable<I, O>;
 }
 // Auth
 export function login(options: LoginOptions): Promise<User>;

src/firebase.ios.ts

@@ -10,6 +10,7 @@ import * as application from "tns-core-modules/application/application";
 import { ios as iOSUtils } from "tns-core-modules/utils/utils";
 import { device } from "tns-core-modules/platform/platform";
 import { DeviceType } from "tns-core-modules/ui/enums/enums";
+import * as firebaseFunctions from './functions/functions';
 import { firestore, User } from "./firebase";
 import { firebaseUtils } from "./utils";
 
@@ -42,6 +43,8 @@ firebase.subscribeToTopic = firebaseMessaging.subscribeToTopic;
 firebase.unsubscribeFromTopic = firebaseMessaging.unsubscribeFromTopic;
 firebase.areNotificationsEnabled = firebaseMessaging.areNotificationsEnabled;
 
+firebase.functions = firebaseFunctions;
+
 firebase.addAppDelegateMethods = appDelegate => {
   // we need the launchOptions for this one so it's a bit hard to use the UIApplicationDidFinishLaunchingNotification pattern we're using for other things
   appDelegate.prototype.applicationDidFinishLaunchingWithOptions = (application, launchOptions) => {

src/functions/functions.android.ts

@@ -1,11 +1,12 @@
-import {HttpsCallable} from '.';
+import {HttpsCallable} from './functions';
+import { firebase } from '../firebase-common';
 
 export function httpsCallable<I = {}, O = {}>(functionName: string): HttpsCallable<I, O> {
     const instance = com.google.firebase.functions.FirebaseFunctions.getInstance();
 
     return (data: I) => new Promise<O>((resolve, reject) => {
 
-        let actData = convertToNative(data);
+        let actData = firebase.toValue(data);
 
         return instance.getHttpsCallable(functionName)
                 .call(actData)
@@ -18,6 +19,7 @@ export function httpsCallable<I = {}, O = {}>(functionName: string): HttpsCallab
 
                             resolve( resultData );
                         } catch (e) {
+                            console.log('Error Caught:', e);
                             reject( e.message );
                         }
 
@@ -27,27 +29,4 @@ export function httpsCallable<I = {}, O = {}>(functionName: string): HttpsCallab
     });
 
 
-}
-
-function convertToNative(input: any) {
-
-    if ( typeof input === "string" ) {
-        return new java.lang.String(input);
-    } else if (typeof input === "number") {
-        if ( input % 1 === 0) {
-            return new java.lang.Integer(input);
-        } else {
-            return new java.lang.Float(input);
-        }
-    } else if ( typeof input === "boolean" ) {
-        return new java.lang.Boolean(input);
-    } else if ( Array.isArray(input) ) {
-        const hashset = new java.util.ArrayList();
-        input.forEach( (currentItem) => hashset.add(convertToNative(currentItem)));
-        return hashset;
-    } else {
-        const hashmap = new java.util.HashMap<string, any>();
-        Object.keys(input).forEach((currentItem ) => hashmap.put( currentItem, convertToNative(input[currentItem])));
-        return hashmap;
-    }
 }

src/functions/functions.ios.ts

@@ -1,12 +1,12 @@
-import {HttpsCallable} from '.';
+import {HttpsCallable} from './functions';
 
 
 export function httpsCallable< I = {}, O = {} >( functionName: string ): HttpsCallable<I, O> {
 
     const functions = FIRFunctions.functions();
 
     return (data: I ) => new Promise((resolve, reject) => {
-        functions.HTTPSCallableWithName(functionName).callWithObjectCompletion(data, (result, err: NSError) => {
+        functions.HTTPSCallableWithName(functionName).callWithObjectCompletion(data, (result: FIRHTTPSCallableResult, err: NSError) => {
             if ( err ) {
                 if ( err.domain === FIRFunctionsErrorDomain ) {
                     const message = err.localizedDescription;

src/functions/index.d.ts

@@ -1 +1,2 @@
-export * from './functions';
+import * as callableFns from "./functions";
+export declare const functions: typeof callableFns;