Skip to content

[pull] main from activepieces:main #1218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
May 7, 2026
+5 −16
Merged

[pull] main from activepieces:main #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions packages/server/api/src/app/ee/authentication/saml-authn/authn-sso-saml-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
import { FastifyPluginAsyncZod } from 'fastify-type-provider-zod'
import { SystemJobName } from '../../../helper/system-jobs/common'
import { systemJobHandlers } from '../../../helper/system-jobs/job-handlers'
import { systemJobsSchedule } from '../../../helper/system-jobs/system-job'
import cron from 'node-cron'
import { rejectedPromiseHandler } from '../../../helper/promise-handler'
import { authnSsoSamlController } from './authn-sso-saml-controller'
import { authnSsoSamlService } from './authn-sso-saml-service'

export const authnSsoSamlModule: FastifyPluginAsyncZod = async (app) => {
systemJobHandlers.registerJobHandler(SystemJobName.EXPIRE_PENDING_SSO_DOMAINS, async () => authnSsoSamlService(app.log).expirePendingSsoDomains())
void systemJobsSchedule(app.log).upsertJob({
job: {
name: SystemJobName.EXPIRE_PENDING_SSO_DOMAINS,
data: {},
jobId: SystemJobName.EXPIRE_PENDING_SSO_DOMAINS,
},
schedule: {
type: 'repeated',
cron: '0 * * * *',
},
cron.schedule('0 * * * *', () => {
rejectedPromiseHandler(authnSsoSamlService(app.log).expirePendingSsoDomains(), app.log)
})
await app.register(authnSsoSamlController, { prefix: '/v1/authn/saml' })
}
2 changes: 0 additions & 2 deletions packages/server/api/src/app/helper/system-jobs/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export enum SystemJobName {
HARD_DELETE_PROJECT = 'hard-delete-project',
HARD_DELETE_PLATFORM = 'hard-delete-platform',
RESUME_DELAY_WAITPOINT = 'resume-delay-waitpoint',
EXPIRE_PENDING_SSO_DOMAINS = 'expire-pending-sso-domains',
}

type DeleteFlowDurableSystemJobData = {
Expand Down Expand Up @@ -55,7 +54,6 @@ type SystemJobDataMap = {
[SystemJobName.HARD_DELETE_PROJECT]: HardDeleteProjectSystemJobData
[SystemJobName.HARD_DELETE_PLATFORM]: HardDeletePlatformSystemJobData
[SystemJobName.RESUME_DELAY_WAITPOINT]: ResumeDelayWaitpointSystemJobData
[SystemJobName.EXPIRE_PENDING_SSO_DOMAINS]: Record<string, never>
}

export type SystemJobData<T extends SystemJobName = SystemJobName> = T extends SystemJobName ? SystemJobDataMap[T] : never
Expand Down
1 change: 1 addition & 0 deletions packages/server/api/src/app/helper/system-jobs/system-job.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ async function removeDeprecatedJobs(): Promise<void> {
'seven-days-in-trial',
'issue-reminder',
'update-flow-status',
'expire-pending-sso-domains',
]
const allSystemJobs = await systemJobsQueue.getJobSchedulers()
const knownJobNames = Object.values(SystemJobName) as string[]
Expand Down
Loading