Skip to content

Commit

Permalink
fix: Support for Functions updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mathrunet
mathrunet committed Jun 23, 2023
1 parent 2355353 commit 7fdb428
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 37 deletions.
48 changes: 25 additions & 23 deletions packages/katana_cli/lib/action/purchase/purchase.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

// Package imports:

// Project imports:
// Dart imports:
import 'dart:io';

import 'package:katana_cli/katana_cli.dart';
// Package imports:
import 'package:xml/xml.dart';

// Project imports:
import 'package:katana_cli/katana_cli.dart';

/// Add a module to use InAppPurchase.
///
/// InAppPurchaseを利用するためのモジュールを追加します。
Expand Down Expand Up @@ -207,39 +210,38 @@ class PurchaseCliAction extends CliCommand with CliActionMixin {
label("Add firebase functions");
final functions = Fuctions();
await functions.load();
if (!functions.functions.any((e) => e == "android_auth_code")) {
functions.functions.add("android_auth_code");
if (!functions.functions.any((e) => e == "androidAuthCode")) {
functions.functions.add("androidAuthCode");
}
if (!functions.functions.any((e) => e == "android_token")) {
functions.functions.add("android_token");
if (!functions.functions.any((e) => e == "androidToken")) {
functions.functions.add("androidToken");
}
if (enableAppStore) {
if (!functions.functions.any((e) => e == "consumable_verify_ios")) {
functions.functions.add("consumable_verify_ios");
if (!functions.functions.any((e) => e == "consumableVerifyIOS")) {
functions.functions.add("consumableVerifyIOS");
}
if (!functions.functions.any((e) => e == "nonconsumable_verify_ios")) {
functions.functions.add("nonconsumable_verify_ios");
if (!functions.functions.any((e) => e == "nonconsumableVerifyIOS")) {
functions.functions.add("nonconsumableVerifyIOS");
}
if (!functions.functions.any((e) => e == "subscription_verify_ios")) {
functions.functions.add("subscription_verify_ios");
if (!functions.functions.any((e) => e == "subscriptionVerifyIOS")) {
functions.functions.add("subscriptionVerifyIOS");
}
if (!functions.functions.any((e) => e == "purchase_hook_ios")) {
functions.functions.add("purchase_hook_ios");
if (!functions.functions.any((e) => e == "purchaseWebhookIOS")) {
functions.functions.add("purchaseWebhookIOS");
}
}
if (enableGooglePlay) {
if (!functions.functions.any((e) => e == "consumable_verify_android")) {
functions.functions.add("consumable_verify_android");
if (!functions.functions.any((e) => e == "consumableVerifyAndroid")) {
functions.functions.add("consumableVerifyAndroid");
}
if (!functions.functions
.any((e) => e == "nonconsumable_verify_android")) {
functions.functions.add("nonconsumable_verify_android");
if (!functions.functions.any((e) => e == "nonconsumableVerifyAndroid")) {
functions.functions.add("nonconsumableVerifyAndroid");
}
if (!functions.functions.any((e) => e == "subscription_verify_android")) {
functions.functions.add("subscription_verify_android");
if (!functions.functions.any((e) => e == "subscriptionVerifyAndroid")) {
functions.functions.add("subscriptionVerifyAndroid");
}
if (!functions.functions.any((e) => e == "purchase_hook_android")) {
functions.functions.add("purchase_hook_android");
if (!functions.functions.any((e) => e == "purchaseWebhookAndroid")) {
functions.functions.add("purchaseWebhookAndroid");
}
}
await functions.save();
Expand Down
20 changes: 10 additions & 10 deletions packages/katana_cli/lib/action/stripe/stripe.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ class StripeCliAction extends CliCommand with CliActionMixin {
"Authorization": "Basic $encodedApiSecret"
},
body: _formatQueryParamater({
"url": "https://$region-$projectId.cloudfunctions.net/stripe_hook",
"url": "https://$region-$projectId.cloudfunctions.net/stripe_webhook",
"description": "",
"enabled_events": [
"customer.subscription.trial_will_end",
Expand All @@ -415,7 +415,7 @@ class StripeCliAction extends CliCommand with CliActionMixin {
webHookSecret = stripeResMap.get("secret", "");
if (webHookSecret.isEmpty) {
error(
"Could not create webhook: https://$region-$projectId.cloudfunctions.net/stripe_hook");
"Could not create webhook: https://$region-$projectId.cloudfunctions.net/stripe_webhook");
return;
}
if (enableConnect) {
Expand All @@ -427,7 +427,7 @@ class StripeCliAction extends CliCommand with CliActionMixin {
},
body: _formatQueryParamater({
"url":
"https://$region-$projectId.cloudfunctions.net/stripe_hook_connect",
"https://$region-$projectId.cloudfunctions.net/stripe_webhook_connect",
"description": "",
"enabled_events": [
"account.updated",
Expand All @@ -439,7 +439,7 @@ class StripeCliAction extends CliCommand with CliActionMixin {
webHookConnectSecret = connectResMap.get("secret", "");
if (webHookConnectSecret.isEmpty) {
error(
"Could not create webhook: https://$region-$projectId.cloudfunctions.net/stripe_hook_connect");
"Could not create webhook: https://$region-$projectId.cloudfunctions.net/stripe_webhook_connect");
return;
}
}
Expand All @@ -449,15 +449,15 @@ class StripeCliAction extends CliCommand with CliActionMixin {
if (!functions.functions.any((e) => e == "stripe")) {
functions.functions.add("stripe");
}
if (!functions.functions.any((e) => e == "stripeHook")) {
functions.functions.add("stripeHook");
if (!functions.functions.any((e) => e == "stripeWebhook")) {
functions.functions.add("stripeWebhook");
}
if (!functions.functions.any((e) => e == "stripeHookSecure")) {
functions.functions.add("stripeHookSecure");
if (!functions.functions.any((e) => e == "stripeWebhookSecure")) {
functions.functions.add("stripeWebhookSecure");
}
if (enableConnect &&
!functions.functions.any((e) => e == "stripeHookConnect")) {
functions.functions.add("stripeHookConnect");
!functions.functions.any((e) => e == "stripeWebhookConnect")) {
functions.functions.add("stripeWebhookConnect");
}
switch (emailProvider) {
case "gmail":
Expand Down
8 changes: 4 additions & 4 deletions packages/katana_cli/lib/command/store/android_token.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ class StoreAndroidTokenCliCommand extends CliCommand {
label("Add firebase functions");
final functions = Fuctions();
await functions.load();
if (!functions.functions.any((e) => e == "android_auth_code")) {
functions.functions.add("android_auth_code");
if (!functions.functions.any((e) => e == "androidAuthCode")) {
functions.functions.add("androidAuthCode");
}
if (!functions.functions.any((e) => e == "android_token")) {
functions.functions.add("android_token");
if (!functions.functions.any((e) => e == "androidToken")) {
functions.functions.add("androidToken");
}
await functions.save();
await command(
Expand Down

0 comments on commit 7fdb428

Please sign in to comment.