exp: onCall

firebase_functions/lib/firebase_functions.dart

@@ -15,7 +15,6 @@ export 'package:tekartik_firebase_functions/src/firebase_functions.dart'
         FirebaseFunctionsServiceDefaultMixin,
         FirebaseFunctionsDefaultMixin,
         FirebaseFunction,
-        CallFunction,
         CallHandler,
         CallRequest,
         CallRequestMixin,
@@ -43,10 +42,12 @@ export 'package:tekartik_firebase_functions/src/firebase_functions_https.dart'
     show
         HttpsFunction,
         HttpsFunctions,
-        HttpsFunctionsMixin,
+        HttpsFunctionsDefaultMixin,
         HttpsError,
         HttpsErrorCode,
-        HttpsOptions;
+        HttpsOptions,
+        HttpsCallableOptions,
+        HttpsCallableFunction;
 
 export 'package:tekartik_http/http_server.dart';
 

firebase_functions/lib/src/firebase_functions.dart

@@ -162,9 +162,6 @@ typedef CallHandler = FutureOr<Object?> Function(CallRequest request);
 
 abstract class FirebaseFunction {}
 
-/// Https function.
-abstract class CallFunction implements FirebaseFunction {}
-
 /// Pubsub function
 abstract class PubsubFunction implements FirebaseFunction {}
 

firebase_functions/lib/src/firebase_functions_https.dart

@@ -13,13 +13,15 @@ abstract class HttpsFunctions {
   HttpsFunction onRequestV2(HttpsOptions httpsOptions, RequestHandler handler);
 
   /// call request
-  CallFunction onCall(CallHandler handler);
+  HttpsCallableFunction onCall(CallHandler handler,
+      {HttpsCallableOptions? callableOptions});
 }
 
 /// no-op by default to never break compilation
-mixin HttpsFunctionsMixin implements HttpsFunctions {
+mixin HttpsFunctionsDefaultMixin implements HttpsFunctions {
   @override
-  CallFunction onCall(CallHandler handler) =>
+  HttpsCallableFunction onCall(CallHandler handler,
+          {HttpsCallableOptions? callableOptions}) =>
       throw UnimplementedError('onCall');
 
   @override
@@ -37,6 +39,27 @@ mixin HttpsFunctionsMixin implements HttpsFunctions {
 /// Https function.
 abstract class HttpsFunction implements FirebaseFunction {}
 
+/// Callable function.
+abstract class HttpsCallableFunction implements FirebaseFunction {}
+
+/// Callable options
+class HttpsCallableOptions extends HttpsOptions {
+  /// Determines whether Firebase App Check token is consumed on request. Defaults to false.
+  final bool? consumeAppCheckToken;
+
+  /// Determines whether Firebase AppCheck is enforced. When true, requests with invalid tokens autorespond with a 401 (Unauthorized) error. When false, requests with invalid tokens set event.app to undefiend.
+  final bool? enforceAppCheck;
+  HttpsCallableOptions(
+      {this.consumeAppCheckToken,
+      this.enforceAppCheck,
+      super.cors,
+      super.concurrency,
+      super.memory,
+      super.region,
+      super.regions,
+      super.timeoutSeconds});
+}
+
 /// Https options
 class HttpsOptions extends GlobalOptions {
   /// Set to true to allow cors

firebase_functions_http/lib/src/firebase_functions_http.dart

@@ -157,7 +157,7 @@ abstract class FirebaseFunctionsHttp implements FirebaseFunctions {
   Future onFileRequestHttp(HttpRequest request);
 }
 
-class HttpsHttp with HttpsFunctionsMixin implements HttpsFunctions {
+class HttpsHttp with HttpsFunctionsDefaultMixin implements HttpsFunctions {
   HttpsHttp();
 
   @override
@@ -172,8 +172,9 @@ class HttpsHttp with HttpsFunctionsMixin implements HttpsFunctions {
   }
 
   @override
-  CallFunction onCall(CallHandler handler) {
-    return CallFunctionHttp(handler);
+  HttpsCallableFunction onCall(CallHandler handler,
+      {HttpsCallableOptions? callableOptions}) {
+    return HttpsCallableFunctionHttp(handler);
   }
 }
 
@@ -185,11 +186,11 @@ class HttpsFunctionHttp implements HttpsFunction {
   HttpsFunctionHttp(this.options, this.handler);
 }
 
-class CallFunctionHttp implements CallFunction {
+class HttpsCallableFunctionHttp implements HttpsCallableFunction {
   // ignore: unused_field
   final CallHandler handler;
 
-  CallFunctionHttp(this.handler);
+  HttpsCallableFunctionHttp(this.handler);
 }
 
 String rewritePath(String path) {

firebase_functions_test/lib/constants.dart

@@ -0,0 +1 @@
+const functionCallName = 'callprv';

firebase_functions_test/lib/firebase_functions_setup.dart

@@ -4,6 +4,8 @@ import 'package:tekartik_firebase_functions/firebase_functions.dart';
 import 'package:tekartik_firebase_functions_test/src/firebase_functions_test_context.dart';
 import 'package:tekartik_firebase_functions_test/src/import.dart';
 
+import 'constants.dart';
+
 void echoBytesHandler(ExpressHttpRequest request) {
   var body = request.body;
   //devPrint('echoBytes ${body?.runtimeType}: ${body}');
@@ -50,10 +52,10 @@ void echoHeadersHandler(ExpressHttpRequest request) {
   request.response.send(sb.toString());
 }
 
-FutureOr<dynamic> callHandler(CallRequest request) async {
+FutureOr<Object?> callHandler(CallRequest request) async {
   //devPrint('request data ${request.text}');
   try {
-    return jsonDecode(request.text!);
+    return {'uid': request.context.auth?.uid, 'data': request.data};
   } catch (_) {
     return {'error': 'no_body'};
   }
@@ -97,7 +99,10 @@ T setup<T extends FirebaseFunctionsTestServerContext>(
 
   /// temp out for node testing
   try {
-    firebaseFunctions['call'] = firebaseFunctions.https.onCall(callHandler);
+    firebaseFunctions[functionCallName] = firebaseFunctions.https.onCall(
+        callHandler,
+        callableOptions:
+            HttpsCallableOptions(cors: true, region: regionBelgium));
   } catch (e) {
     print('error onCall definition $e');
   }
@@ -113,5 +118,5 @@ var testFunctionNames = [
   'echoheaders',
   'echoinfo',
   'ffinfo',
-  'call'
+  functionCallName
 ];