[pull] main from formbricks:main

apps/web/Dockerfile

@@ -101,6 +101,9 @@ RUN chown -R nextjs:nextjs ./apps/web/public && chmod -R 755 ./apps/web/public
 # Create packages/database directory structure with proper ownership for runtime migrations
 RUN mkdir -p ./packages/database/migrations && chown -R nextjs:nextjs ./packages/database
 
+COPY --from=installer /app/packages/database/package.json ./packages/database/package.json
+RUN chown nextjs:nextjs ./packages/database/package.json && chmod 644 ./packages/database/package.json
+
 COPY --from=installer /app/packages/database/schema.prisma ./packages/database/schema.prisma
 RUN chown nextjs:nextjs ./packages/database/schema.prisma && chmod 644 ./packages/database/schema.prisma
 

apps/web/app/api/v1/integrations/slack/callback/route.ts

@@ -6,7 +6,7 @@ import {
 } from "@formbricks/types/integration/slack";
 import { responses } from "@/app/lib/api/response";
 import { TSessionAuthentication, withV1ApiWrapper } from "@/app/lib/api/with-api-logging";
-import { SLACK_CLIENT_ID, SLACK_CLIENT_SECRET, WEBAPP_URL } from "@/lib/constants";
+import { SLACK_CLIENT_ID, SLACK_CLIENT_SECRET, SLACK_REDIRECT_URI, WEBAPP_URL } from "@/lib/constants";
 import { hasUserEnvironmentAccess } from "@/lib/environment/auth";
 import { createOrUpdateIntegration, getIntegrationByType } from "@/lib/integration/service";
 
@@ -56,6 +56,7 @@ export const GET = withV1ApiWrapper({
       code,
       client_id: SLACK_CLIENT_ID,
       client_secret: SLACK_CLIENT_SECRET,
+      redirect_uri: SLACK_REDIRECT_URI,
     };
     const formBody: string[] = [];
     for (const property in formData) {

apps/web/lib/constants.ts

@@ -63,7 +63,8 @@ export const INVITE_DISABLED = env.INVITE_DISABLED === "1";
 
 export const SLACK_CLIENT_SECRET = env.SLACK_CLIENT_SECRET;
 export const SLACK_CLIENT_ID = env.SLACK_CLIENT_ID;
-export const SLACK_AUTH_URL = `https://slack.com/oauth/v2/authorize?client_id=${env.SLACK_CLIENT_ID}&scope=channels:read,chat:write,chat:write.public,chat:write.customize,groups:read`;
+export const SLACK_REDIRECT_URI = `${WEBAPP_URL}/api/v1/integrations/slack/callback`;
+export const SLACK_AUTH_URL = `https://slack.com/oauth/v2/authorize?client_id=${env.SLACK_CLIENT_ID}&scope=channels:read,chat:write,chat:write.public,chat:write.customize,groups:read&redirect_uri=${SLACK_REDIRECT_URI}`;
 
 export const GOOGLE_SHEETS_CLIENT_ID = env.GOOGLE_SHEETS_CLIENT_ID;
 export const GOOGLE_SHEETS_CLIENT_SECRET = env.GOOGLE_SHEETS_CLIENT_SECRET;

packages/storage/src/service.test.ts

@@ -80,7 +80,7 @@ describe("service.ts", () => {
         Key: "uploads/images/test-file.jpg",
         Fields: {
           "Content-Type": "image/jpeg",
-          // "Content-Encoding": "base64",
+          success_action_status: "201",
         },
         Conditions: [["content-length-range", 0, mockMaxSize]],
       });
@@ -175,7 +175,7 @@ describe("service.ts", () => {
         Key: "uploads/images/test-file.jpg",
         Fields: {
           "Content-Type": "image/jpeg",
-          // "Content-Encoding": "base64",
+          success_action_status: "201",
         },
         Conditions: [["content-length-range", 0, mockMaxSize]],
       });

packages/storage/src/service.ts

@@ -66,7 +66,7 @@ export const getSignedUploadUrl = async (
       Key: `${filePath}/${fileName}`,
       Fields: {
         "Content-Type": contentType,
-        // "Content-Encoding": "base64",
+        success_action_status: "201",
       },
       Conditions: postConditions,
     });