Skip to content
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.

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

Extensibility as custom phone provider deploy cli support #1038

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 18 additions & 0 deletions src/context/defaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,21 @@ export function emailProviderDefaults(emailProvider) {

return updated;
}

export function phoneProviderDefaults(phoneProvider) {
// eslint-disable-line
Copy link
Contributor

@kushalshit27 kushalshit27 Feb 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why using @ts-ignore?

const updated = { ...phoneProvider };

const apiKeyProviders = ['twilio'];

// Add placeholder for credentials as they cannot be exported
const { name } = updated;

if (apiKeyProviders.includes(name)) {
updated.credentials = {
auth_token: `##${name.toUpperCase()}_AUTH_TOKEN##`,
...(updated.credentials || {}),
};
}
return updated;
}
2 changes: 2 additions & 0 deletions src/context/directory/handlers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import organizations from './organizations';
import triggers from './triggers';
import attackProtection from './attackProtection';
import branding from './branding';
import phoneProviders from './phoneProvider';
import logStreams from './logStreams';
import prompts from './prompts';
import customDomains from './customDomains';
Expand Down Expand Up @@ -66,6 +67,7 @@ const directoryHandlers: {
triggers,
attackProtection,
branding,
phoneProviders,
logStreams,
prompts,
customDomains,
Expand Down
59 changes: 59 additions & 0 deletions src/context/directory/handlers/phoneProvider.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import path from 'path';
import fs from 'fs-extra';
import { constants } from '../../../tools';

import { existsMustBeDir, isFile, dumpJSON, loadJSON } from '../../../utils';
import { DirectoryHandler } from '.';
import DirectoryContext from '..';
import { ParsedAsset } from '../../../types';
import { PhoneProvider } from '../../../tools/auth0/handlers/phoneProvider';

type ParsedPhoneProvider = ParsedAsset<'phoneProviders', PhoneProvider[]>;

function parse(context: DirectoryContext): ParsedPhoneProvider {
const phoneProvidersFolder = path.join(context.filePath, constants.PHONE_PROVIDER_DIRECTORY);
if (!existsMustBeDir(phoneProvidersFolder)) return { phoneProviders: null }; // Skip

const providerFile = path.join(phoneProvidersFolder, 'provider.json');

if (isFile(providerFile)) {
return {
phoneProviders: loadJSON(providerFile, {
mappings: context.mappings,
disableKeywordReplacement: context.disableKeywordReplacement,
}),
};
}

return { phoneProviders: null };
}

async function dump(context: DirectoryContext): Promise<void> {
const { phoneProviders } = context.assets;
if (!phoneProviders) {
return;
}// Skip, nothing to dump

const phoneProvidersFolder = path.join(context.filePath, constants.PHONE_PROVIDER_DIRECTORY);
fs.ensureDirSync(phoneProvidersFolder);

const phoneProviderFile = path.join(phoneProvidersFolder, 'provider.json');

const removeKeysFromOutput = ['id', 'created_at', 'updated_at', 'channel', 'tenant', 'credentials'];
phoneProviders.forEach((provider) => {
removeKeysFromOutput.forEach((key) => {
if (key in provider) {
delete provider[key];
}
});
});

dumpJSON(phoneProviderFile, phoneProviders);
}

const phoneProvidersHandler: DirectoryHandler<ParsedPhoneProvider> = {
parse,
dump,
};

export default phoneProvidersHandler;
2 changes: 2 additions & 0 deletions src/context/yaml/handlers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import actions from './actions';
import triggers from './triggers';
import attackProtection from './attackProtection';
import branding from './branding';
import phoneProviders from './phoneProvider';
import logStreams from './logStreams';
import prompts from './prompts';
import customDomains from './customDomains';
Expand Down Expand Up @@ -64,6 +65,7 @@ const yamlHandlers: { [key in AssetTypes]: YAMLHandler<{ [key: string]: unknown
triggers,
attackProtection,
branding,
phoneProviders,
logStreams,
prompts,
customDomains,
Expand Down
44 changes: 44 additions & 0 deletions src/context/yaml/handlers/phoneProvider.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import { YAMLHandler } from '.';
import YAMLContext from '..';
import { PhoneProvider } from '../../../tools/auth0/handlers/phoneProvider';
import { ParsedAsset } from '../../../types';

type ParsedPhoneProviders = ParsedAsset<'phoneProviders', PhoneProvider[] >;

async function parse(context: YAMLContext): Promise<ParsedPhoneProviders> {
const { phoneProviders } = context.assets;

if (!phoneProviders) return { phoneProviders: null };

console.log(phoneProviders);

return {
phoneProviders,
};
}

async function dump(context: YAMLContext): Promise<ParsedPhoneProviders> {
if (!context.assets.phoneProviders) return { phoneProviders: null };

const { phoneProviders } = context.assets;

const removeKeysFromOutput = ['id', 'created_at', 'updated_at', 'channel', 'tenant', 'credentials'];
phoneProviders.forEach((provider) => {
removeKeysFromOutput.forEach((key) => {
if (key in provider) {
delete provider[key];
}
});
});

return {
phoneProviders
};
}

const phoneProviderHandler: YAMLHandler<ParsedPhoneProviders> = {
parse,
dump,
};

export default phoneProviderHandler;
10 changes: 0 additions & 10 deletions src/tools/auth0/handlers/emailProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { EmailProviderCreate } from 'auth0';
import { isEmpty } from 'lodash';
import DefaultHandler, { order } from './default';
import { Asset, Assets } from '../../../types';
import log from '../../../logger';

export const schema = { type: 'object' };

Expand Down Expand Up @@ -46,7 +45,6 @@ export default class EmailProviderHandler extends DefaultHandler {
if (Object.keys(emailProvider).length === 0) {
if (this.config('AUTH0_ALLOW_DELETE') === true) {
// await this.client.emails.delete(); is not supported
existing.enabled = false;
if (isEmpty(existing.credentials)) {
delete existing.credentials;
}
Expand All @@ -57,14 +55,6 @@ export default class EmailProviderHandler extends DefaultHandler {
return;
}

if (existing.name) {
if (existing.name !== emailProvider.name) {
// Delete the current provider as it's different
// await this.client.emailProvider.delete(); is not supported
existing.enabled = false;
}
}

if (existing.name) {
const updated = await this.client.emails.update(emailProvider);
this.updated += 1;
Expand Down
2 changes: 2 additions & 0 deletions src/tools/auth0/handlers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import * as guardianPhoneFactorSelectedProvider from './guardianPhoneFactorSelec
import * as guardianPhoneFactorMessageTypes from './guardianPhoneFactorMessageTypes';
import * as roles from './roles';
import * as branding from './branding';
import * as phoneProviders from './phoneProvider';
import * as prompts from './prompts';
import * as actions from './actions';
import * as triggers from './triggers';
Expand Down Expand Up @@ -55,6 +56,7 @@ const auth0ApiHandlers: { [key in AssetTypes]: any } = {
guardianPhoneFactorMessageTypes,
roles,
branding,
phoneProviders,
//@ts-ignore because prompts have not been universally implemented yet
prompts,
actions,
Expand Down
Loading