Fix the nullable check in generated rules (#30)

* Use == for null * Update nullable check
FirebaseExtended · Nov 22, 2018 · 99af1c3 · 99af1c3
1 parent 3dbf0e2
commit 99af1c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/firebase_rules_generator/generator.cc b/firebase_rules_generator/generator.cc
@@ -463,7 +463,7 @@ bool RulesGenerator::GenerateField(const protobuf::FieldDescriptor *field,
   bool nullable =
       (!options.has_nullable() && msg_options.nullable()) || options.nullable();
   if (nullable) {
-    printer.Print(" || resource.$name$ is null", "name", field->json_name());
+    printer.Print(" || resource.$name$ == null", "name", field->json_name());
   }
   printer.Print(")");
   return true;

diff --git a/testdata/testA.rules b/testdata/testA.rules
@@ -2,13 +2,13 @@
 function isNullableExampleMessage(resource) {
   return resource.keys().hasAll([]) &&
           (resource.keys().hasOnly(['bar','foo'])) &&
-          ((!resource.keys().hasAny(['foo'])) || (resource.foo is string) || resource.foo is null) &&
+          ((!resource.keys().hasAny(['foo'])) || (resource.foo is string) || resource.foo == null) &&
           ((!resource.keys().hasAny(['bar'])) || (resource.bar is string));
 }
 function isExampleMessage(resource) {
   return resource.keys().hasAll([]) &&
           (resource.keys().hasOnly(['bar','foo'])) &&
           ((!resource.keys().hasAny(['foo'])) || (resource.foo is string)) &&
-          ((!resource.keys().hasAny(['bar'])) || (resource.bar is string) || resource.bar is null);
+          ((!resource.keys().hasAny(['bar'])) || (resource.bar is string) || resource.bar == null);
 }
 // @@END_GENERATED_FUNCTIONS@@