Merge branch 'main' into identity-fed-routes

Dockerfile

@@ -1,4 +1,4 @@
-ARG NODEJS_IMAGE=node:20.12.1-alpine3.19
+ARG NODEJS_IMAGE=node:20.12.2-alpine3.19
 FROM --platform=$BUILDPLATFORM $NODEJS_IMAGE AS base
 
 # Install dependencies only when needed

ee/branding/pages/index.tsx

@@ -136,7 +136,12 @@ const Branding = ({ hasValidLicense }: { hasValidLicense: boolean }) => {
               <label className='label'>
                 <span className='label-text'>{t('bui-shared-primary-color')}</span>
               </label>
-              <input type='color' id='primaryColor' onChange={onChange} value={branding.primaryColor || ''} />
+              <input
+                type='color'
+                id='primaryColor'
+                onChange={onChange}
+                value={branding.primaryColor || '#25c2a0'}
+              />
               <label className='label'>
                 <span className='label-text-alt'>{t('bui-shared-primary-color-desc')}</span>
               </label>

ee/identity-federation/api/admin/index.ts

@@ -3,6 +3,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import jackson from '@lib/jackson';
 import { defaultHandler } from '@lib/api';
 import { parsePaginateApiParams } from '@lib/utils';
+import { validateDevelopmentModeLimits } from '@lib/development-mode';
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   await defaultHandler(req, res, {
@@ -15,6 +16,12 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
 const handlePOST = async (req: NextApiRequest, res: NextApiResponse) => {
   const { samlFederatedController } = await jackson();
 
+  await validateDevelopmentModeLimits(
+    req.body.product,
+    'samlFederation',
+    'Maximum number of federation apps reached'
+  );
+
   const app = await samlFederatedController.app.create(req.body);
 
   res.status(201).json({ data: app });

ee/identity-federation/api/v1/index.ts

@@ -2,36 +2,28 @@ import { AppRequestParams } from '@boxyhq/saml-jackson';
 import { NextApiRequest, NextApiResponse } from 'next';
 
 import jackson from '@lib/jackson';
+import { validateDevelopmentModeLimits } from '@lib/development-mode';
+import { defaultHandler } from '@lib/api';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    switch (req.method) {
-      case 'POST':
-        await handlePOST(req, res);
-        break;
-      case 'GET':
-        await handleGET(req, res);
-        break;
-      case 'PATCH':
-        await handlePATCH(req, res);
-        break;
-      case 'DELETE':
-        await handleDELETE(req, res);
-        break;
-      default:
-        res.setHeader('Allow', 'POST, GET, PATCH, DELETE');
-        res.status(405).json({ error: { message: `Method ${req.method} Not Allowed` } });
-    }
-  } catch (error: any) {
-    const { message, statusCode = 500 } = error;
-    res.status(statusCode).json({ error: { message } });
-  }
+  await defaultHandler(req, res, {
+    POST: handlePOST,
+    GET: handleGET,
+    PATCH: handlePATCH,
+    DELETE: handleDELETE,
+  });
 }
 
 // Create a SAML federated app
 const handlePOST = async (req: NextApiRequest, res: NextApiResponse) => {
   const { samlFederatedController } = await jackson();
 
+  await validateDevelopmentModeLimits(
+    req.body.product,
+    'samlFederation',
+    'Maximum number of federation apps reached'
+  );
+
   const app = await samlFederatedController.app.create(req.body);
 
   res.status(201).json({ data: app });