diff --git a/server/src/modules/auth/constants/feature.ts b/server/src/modules/auth/constants/feature.ts index 43d6ef6bd9..b0f5bcf7c9 100644 --- a/server/src/modules/auth/constants/feature.ts +++ b/server/src/modules/auth/constants/feature.ts @@ -17,9 +17,6 @@ export const FEATURES: FeaturesConfig = { isPublic: true, auditLogsKey: 'USER_LOGIN', }, - [FEATURE_KEY.ACTIVATE_ACCOUNT]: { - isPublic: true, - }, [FEATURE_KEY.AUTHORIZE]: { isPublic: true, }, @@ -29,58 +26,12 @@ export const FEATURES: FeaturesConfig = { [FEATURE_KEY.SETUP_ADMIN]: { isPublic: true, }, - [FEATURE_KEY.SETUP_SUPER_ADMIN]: { - isPublic: true, - }, - [FEATURE_KEY.SIGNUP]: { - isPublic: true, - auditLogsKey: 'USER_SIGNUP', - }, - [FEATURE_KEY.ACCEPT_INVITE]: { - isPublic: true, - auditLogsKey: 'USER_INVITE_REDEEM', - }, - [FEATURE_KEY.RESEND_INVITE]: { - isPublic: true, - }, - [FEATURE_KEY.VERIFY_INVITE_TOKEN]: { - isPublic: true, - }, - [FEATURE_KEY.VERIFY_ORGANIZATION_TOKEN]: { - isPublic: true, - }, - [FEATURE_KEY.SETUP_ACCOUNT_FROM_TOKEN]: { - auditLogsKey: 'USER_INVITE_REDEEM', - isPublic: true, - }, - [FEATURE_KEY.REQUEST_TRIAL]: { - isPublic: true, - }, - [FEATURE_KEY.ACTIVATE_TRIAL]: { - isPublic: true, - }, - [FEATURE_KEY.GET_ONBOARDING_SESSION]: { - isPublic: true, - }, - [FEATURE_KEY.GET_SIGNUP_ONBOARDING_SESSION]: { - isPublic: true, - }, - [FEATURE_KEY.FINISH_ONBOARDING]: { - isPublic: true, - }, - [FEATURE_KEY.TRIAL_DECLINED]: { - isPublic: true, - }, [FEATURE_KEY.FORGOT_PASSWORD]: { isPublic: true, }, [FEATURE_KEY.RESET_PASSWORD]: { isPublic: true, }, - [FEATURE_KEY.GET_INVITEE_DETAILS]: { - auditLogsKey: 'USER_INVITE_REDEEM', - isPublic: true, - }, [FEATURE_KEY.OAUTH_SIGN_IN]: { isPublic: true, }, diff --git a/server/src/modules/auth/constants/index.ts b/server/src/modules/auth/constants/index.ts index abcf6ded3a..ef769b9230 100644 --- a/server/src/modules/auth/constants/index.ts +++ b/server/src/modules/auth/constants/index.ts @@ -5,35 +5,16 @@ export enum FEATURE_KEY { ORGANIZATION_LOGIN = 'organizationLogin', // POST 'authenticate/:organizationId' // Account Activation and Authorization - ACTIVATE_ACCOUNT = 'activateAccount', // POST 'activate-account-with-token' AUTHORIZE = 'authorize', // GET 'authorize' SWITCH_WORKSPACE = 'switchWorkspace', // GET 'switch/:organizationId' // Setup and Signup SETUP_ADMIN = 'setupAdmin', // POST 'setup-admin' - SETUP_SUPER_ADMIN = 'setupSuperAdmin', // POST 'setup-super-admin' - SIGNUP = 'signup', // POST 'signup' - ACCEPT_INVITE = 'acceptInvite', // POST 'accept-invite' - RESEND_INVITE = 'resendInvite', // POST 'resend-invite' - VERIFY_INVITE_TOKEN = 'verifyInviteToken', // GET 'verify-invite-token' - VERIFY_ORGANIZATION_TOKEN = 'verifyOrganizationToken', // GET 'verify-organization-token' - SETUP_ACCOUNT_FROM_TOKEN = 'setupAccountFromToken', // POST 'setup-account-from-token' - - // Trial and Onboarding - REQUEST_TRIAL = 'requestTrial', // GET 'request-trial' - ACTIVATE_TRIAL = 'activateTrial', // POST 'activate-trial' - GET_ONBOARDING_SESSION = 'getOnboardingSession', // GET 'onboarding-session' - GET_SIGNUP_ONBOARDING_SESSION = 'getSignupOnboardingSession', // GET 'signup-onboarding-session' - FINISH_ONBOARDING = 'finishOnboarding', // POST 'finish-onboarding' - TRIAL_DECLINED = 'trialDeclined', // GET 'trial-declined' // Password Management FORGOT_PASSWORD = 'forgotPassword', // POST 'forgot-password' RESET_PASSWORD = 'resetPassword', // POST 'reset-password' - // Invitee Details - GET_INVITEE_DETAILS = 'getInviteeDetails', // GET 'invitee-details' - // Oauth OAUTH_SIGN_IN = '/oauth/sign-in/:configId', OAUTH_OPENID_CONFIGS = '/oauth/configs/:configId', diff --git a/server/src/modules/auth/types/index.ts b/server/src/modules/auth/types/index.ts index a86b4997c0..2283b240d6 100644 --- a/server/src/modules/auth/types/index.ts +++ b/server/src/modules/auth/types/index.ts @@ -6,26 +6,11 @@ export interface Features { [FEATURE_KEY.LOGIN]: FeatureConfig; [FEATURE_KEY.SUPER_ADMIN_LOGIN]: FeatureConfig; [FEATURE_KEY.ORGANIZATION_LOGIN]: FeatureConfig; - [FEATURE_KEY.ACTIVATE_ACCOUNT]: FeatureConfig; [FEATURE_KEY.AUTHORIZE]: FeatureConfig; [FEATURE_KEY.SWITCH_WORKSPACE]: FeatureConfig; [FEATURE_KEY.SETUP_ADMIN]: FeatureConfig; - [FEATURE_KEY.SETUP_SUPER_ADMIN]: FeatureConfig; - [FEATURE_KEY.SIGNUP]: FeatureConfig; - [FEATURE_KEY.ACCEPT_INVITE]: FeatureConfig; - [FEATURE_KEY.RESEND_INVITE]: FeatureConfig; - [FEATURE_KEY.VERIFY_INVITE_TOKEN]: FeatureConfig; - [FEATURE_KEY.VERIFY_ORGANIZATION_TOKEN]: FeatureConfig; - [FEATURE_KEY.SETUP_ACCOUNT_FROM_TOKEN]: FeatureConfig; - [FEATURE_KEY.REQUEST_TRIAL]: FeatureConfig; - [FEATURE_KEY.ACTIVATE_TRIAL]: FeatureConfig; - [FEATURE_KEY.GET_ONBOARDING_SESSION]: FeatureConfig; - [FEATURE_KEY.GET_SIGNUP_ONBOARDING_SESSION]: FeatureConfig; - [FEATURE_KEY.FINISH_ONBOARDING]: FeatureConfig; - [FEATURE_KEY.TRIAL_DECLINED]: FeatureConfig; [FEATURE_KEY.FORGOT_PASSWORD]: FeatureConfig; [FEATURE_KEY.RESET_PASSWORD]: FeatureConfig; - [FEATURE_KEY.GET_INVITEE_DETAILS]: FeatureConfig; [FEATURE_KEY.OAUTH_COMMON_SIGN_IN]: FeatureConfig; [FEATURE_KEY.OAUTH_OPENID_CONFIGS]: FeatureConfig; [FEATURE_KEY.OAUTH_SAML_CONFIGS]: FeatureConfig; diff --git a/server/src/modules/licensing/controllers/workflows.controller.ts b/server/src/modules/licensing/controllers/workflows.controller.ts index 55edec2e89..1e4b51aaf9 100644 --- a/server/src/modules/licensing/controllers/workflows.controller.ts +++ b/server/src/modules/licensing/controllers/workflows.controller.ts @@ -7,7 +7,10 @@ import { ILicenseWorkflowsController } from '../interfaces/IController'; import { FeatureAbilityGuard } from '../ability/guard'; import { InitFeature } from '@modules/app/decorators/init-feature.decorator'; import { FEATURE_KEY } from '../constants'; +import { InitModule } from '@modules/app/decorators/init-module'; +import { MODULES } from '@modules/app/constants/modules'; +@InitModule(MODULES.LICENSING) @Controller('license/workflows') @UseGuards(JwtAuthGuard, FeatureAbilityGuard) export class LicenseWorkflowsController implements ILicenseWorkflowsController {