Skip to content

Commit

Permalink
fix: Allow overwrite_rule to be specified.
Browse files Browse the repository at this point in the history
  • Loading branch information
mathrunet committed Jun 30, 2023
1 parent e3a2281 commit adb14da
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
22 changes: 15 additions & 7 deletions packages/katana_cli/lib/action/firebase/init.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,16 @@ class FirebaseInitCliAction extends CliCommand with CliActionMixin {
final projectId = firebase.get("project_id", "");
final hosting = firebase.getAsMap("hosting");
final useFlutter = hosting.get("use_flutter", false);
final enabledFirestore =
firebase.getAsMap("firestore").get("enable", false);
final firestore = firebase.getAsMap("firestore");
final overwriteFirestoreRule = firestore.get("overwrite_rule", false);
final enabledFirestore = firestore.get("enable", false);
final enabledAuthentication =
firebase.getAsMap("authentication").get("enable", false);
final enabledFunctions =
firebase.getAsMap("functions").get("enable", false);
final enabledStorage = firebase.getAsMap("storage").get("enable", false);
final storage = firebase.getAsMap("storage");
final overwriteStorageRule = storage.get("overwrite_rule", false);
final enabledStorage = storage.get("enable", false);
final enabledHosting = hosting.get("enable", false);
final enabledLogger = firebase.getAsMap("logger").get("enable", false);
final enableActions = enableGithubAction &&
Expand Down Expand Up @@ -212,8 +215,10 @@ class FirebaseInitCliAction extends CliCommand with CliActionMixin {
);
});
await firestoreProcess.exitCode;
label("Rewriting Rules");
await const FirestoreRulesCliCode().generateFile("firestore.rules");
if (overwriteFirestoreRule) {
label("Rewriting Rules");
await const FirestoreRulesCliCode().generateFile("firestore.rules");
}
}
}
if (enabledStorage) {
Expand Down Expand Up @@ -247,8 +252,11 @@ class FirebaseInitCliAction extends CliCommand with CliActionMixin {
);
});
await storageProcess.exitCode;
label("Rewriting Rules");
await const FirebaseStorageRulesCliCode().generateFile("storage.rules");
if (overwriteStorageRule) {
label("Rewriting Rules");
await const FirebaseStorageRulesCliCode()
.generateFile("storage.rules");
}
}
}
if (enabledHosting) {
Expand Down
2 changes: 2 additions & 0 deletions packages/katana_cli/lib/config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ firebase:
# Firebase Firestoreを有効にします。
firestore:
enable: false
overwrite_rule: false
# Enable Firebase Authentication.
# Firebase Authenticationを有効にします。
Expand Down Expand Up @@ -165,6 +166,7 @@ ${showAllConfig ? """
# Cloud Storage for Firebaseを有効にします。
storage:
enable: false
overwrite_rule: false
# Enable Cloud Functions for Firebase.
# Cloud Functions for Firebaseを有効にします。
Expand Down
2 changes: 1 addition & 1 deletion packages/katana_cli/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ packages:
path: "../katana"
relative: true
source: path
version: "2.2.1"
version: "2.2.2"
lints:
dependency: "direct main"
description:
Expand Down

0 comments on commit adb14da

Please sign in to comment.