refactor: use intersect to evaluate MiskCaller#hasCapability

misk-actions/src/main/kotlin/misk/MiskCaller.kt

@@ -29,10 +29,10 @@ data class MiskCaller @JvmOverloads constructor(
   }
 
   /**
-   * Check whether the caller has one of allowedCapabilities.
+   * Check whether this caller has one or more of the [allowedCapabilities].
    */
-  fun hasCapability(allowedCapabilities: Set<String>) =
-    capabilities.any { allowedCapabilities.contains(it) }
+  fun hasCapability(allowedCapabilities: Set<String>): Boolean =
+    capabilities.intersect(allowedCapabilities).isNotEmpty()
 
   /**
    * Check whether this is a service-to-service call from one of allowedServices.
@@ -50,6 +50,6 @@ data class MiskCaller @JvmOverloads constructor(
     if (service != null && allowedServices.contains(service)) return true
 
     // Allow if the caller has provided an allowed capability
-    return capabilities.any { allowedCapabilities.contains(it) }
+    return hasCapability(allowedCapabilities)
   }
 }

misk/src/test/kotlin/misk/MiskCallerTest.kt

@@ -20,6 +20,16 @@ internal class MiskCallerTest {
   @Test fun serviceNameIsNotRedactedFromToString() {
     assertThat("$testService").contains("${testService.service}")
   }
+
+  @Test fun `hasCapability should be true when capabilities contains an allowedCapability`() {
+    val hasCapability = testUser.hasCapability(setOf("not_testing", "testing", "other_capability"))
+    assertThat(hasCapability).isTrue()
+  }
+
+  @Test fun `hasCapability should be false when capabilities does not contain an allowedCapability`() {
+    val hasCapability = testUser.hasCapability(setOf("not_testing", "other_capability"))
+    assertThat(hasCapability).isFalse()
+  }
 }
 
 internal class MiskCallerTestModule : KAbstractModule() {