version 0.14.3

seratch · Jul 24, 2024 · a44f438 · a44f438
1 parent 25de48a
commit a44f438
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "slack-cloudflare-workers",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "description": "Slack app development framework for Cloudflare Workers",
   "main": "dist/index.js",
   "scripts": {
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/seratch/slack-cloudflare-workers#readme",
   "dependencies": {
-    "slack-edge": "^0.14.3"
+    "slack-edge": "^0.14.4"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.8.3",

diff --git a/src/kv-installation-store.ts b/src/kv-installation-store.ts
@@ -157,26 +157,26 @@ export class KVInstallationStore<E extends SlackOAuthEnv> implements Installatio
 
 export function toBotInstallationQuery(clientId: string, q: InstallationStoreQuery): string {
   const e = q.enterpriseId ? q.enterpriseId : "_";
-  const t = q.teamId ? q.teamId : "_";
+  const t = q.teamId && !q.isEnterpriseInstall ? q.teamId : "_";
   return `${clientId}/${e}:${t}`;
 }
 
 export function toUserInstallationQuery(clientId: string, q: InstallationStoreQuery): string {
   const e = q.enterpriseId ? q.enterpriseId : "_";
-  const t = q.teamId ? q.teamId : "_";
+  const t = q.teamId && !q.isEnterpriseInstall ? q.teamId : "_";
   const u = q.userId ? q.userId : "_";
   return `${clientId}/${e}:${t}:${u}`;
 }
 
 export function toBotInstallationKey(clientId: string, installation: Installation): string {
   const e = installation.enterprise_id ?? "_";
-  const t = installation.team_id ?? "_";
+  const t = installation.team_id && !installation.is_enterprise_install ? installation.team_id : "_";
   return `${clientId}/${e}:${t}`;
 }
 
 export function toUserInstallationKey(clientId: string, installation: Installation): string {
   const e = installation.enterprise_id ?? "_";
-  const t = installation.team_id ?? "_";
+  const t = installation.team_id && !installation.is_enterprise_install ? installation.team_id : "_";
   const u = installation.user_id ?? "_";
   return `${clientId}/${e}:${t}:${u}`;
 }