Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

feat(fusionauth): add in github identity provider to iac (#5391)

Will Hutchinson45d6c768c5aa
diff --git a/infra/stacks/fusionauth-instance/Pulumi.dev.yaml b/infra/stacks/fusionauth-instance/Pulumi.dev.yaml
index e552bcc9b9..8471701456 100644
--- a/infra/stacks/fusionauth-instance/Pulumi.dev.yaml
+++ b/infra/stacks/fusionauth-instance/Pulumi.dev.yaml
@@ -16,6 +16,9 @@ config:
fusionauth-instance:google-client-id-secret-key: google-client-id-dev
fusionauth-instance:google-client-secret-secret-key: google-client-secret-dev
fusionauth-instance:enable-google-calendar: true
+ fusionauth-instance:github-client-id-secret-key: github-client-id-dev
+ fusionauth-instance:github-client-secret-secret-key: github-client-secret-dev
+ fusionauth-instance:fusionauth-github-idp-id: 9315cdd2-d172-4b3a-aa35-7b7db3e77382
fusionauth:host: https://fusionauth-dev.macro.com
fusionauth:apiKey:
secure: AAABAGgKVJijjzcGu5lYU2bdn90Xhj6JcMl0mfKwaLTvNccxRKljjFRHrLaXY63ZLseAxo39MMakTB8SyYbebCvHBDv/zkCV5tnFjx4UBZozo4ABYRLgoQ==
diff --git a/infra/stacks/fusionauth-instance/Pulumi.local.yaml b/infra/stacks/fusionauth-instance/Pulumi.local.yaml
index d299b72af4..82bb7b9d2c 100644
--- a/infra/stacks/fusionauth-instance/Pulumi.local.yaml
+++ b/infra/stacks/fusionauth-instance/Pulumi.local.yaml
@@ -10,5 +10,7 @@ config:
fusionauth-instance:fusionauth-signing-key-id: d7d09513-a3f5-401c-9685-34ab6c552453
fusionauth-instance:google-client-id-secret-key: google-client-id-dev
fusionauth-instance:google-client-secret-secret-key: google-client-secret-dev
+ fusionauth-instance:github-client-id-secret-key: github-client-id-dev
+ fusionauth-instance:github-client-secret-secret-key: github-client-secret-dev
fusionauth:apiKey: bf69486b-4733-4954-a44e-2e1b5f2c8a91
fusionauth-instance:enable-google-calendar: true
diff --git a/infra/stacks/fusionauth-instance/Pulumi.prod.yaml b/infra/stacks/fusionauth-instance/Pulumi.prod.yaml
index 77e81731f1..a75826ba68 100644
--- a/infra/stacks/fusionauth-instance/Pulumi.prod.yaml
+++ b/infra/stacks/fusionauth-instance/Pulumi.prod.yaml
@@ -17,5 +17,8 @@ config:
fusionauth-instance:google-client-secret-secret-key: google-client-secret-prod
fusionauth:host: https://auth.macro.com
fusionauth-instance:enable-google-calendar: false
+ fusionauth-instance:github-client-id-secret-key: github-client-id-prod
+ fusionauth-instance:github-client-secret-secret-key: github-client-secret-prod
+ fusionauth-instance:fusionauth-github-idp-id: 76d915da-0f44-47c1-ac15-423f162b0b55
fusionauth:apiKey:
secure: AAABANOJD8AOmyME2/j2t2nmudnPjYIszfItHGubEm2ZmKaErrrrqRydP7udMstGDgi0inuUCRj819+S1tXXVZF0E7BP9bL1cTxmhf0+nMbO6CHkdyRycQ==
diff --git a/infra/stacks/fusionauth-instance/index.ts b/infra/stacks/fusionauth-instance/index.ts
index fabab690e7..d9a41f56ab 100644
--- a/infra/stacks/fusionauth-instance/index.ts
+++ b/infra/stacks/fusionauth-instance/index.ts
@@ -328,6 +328,54 @@ const macroApplication = new FusionAuthApplication(
export const macroApplicationClientId =
macroApplication.oauthConfiguration.clientId;
+const GITHUB_CLIENT_ID = aws.secretsmanager
+ .getSecretVersionOutput({
+ secretId: config.require('github-client-id-secret-key'),
+ })
+ .apply((secret) => secret.secretString);
+
+const GITHUB_CLIENT_SECRET = aws.secretsmanager
+ .getSecretVersionOutput({
+ secretId: config.require('github-client-secret-secret-key'),
+ })
+ .apply((secret) => secret.secretString);
+
+// The github identity provider
+new FusionAuthIdpOpenIdConnect(
+ 'github-idp',
+ {
+ enabled: true,
+ // idpId: GITHUB_IDP_ID,
+ name: 'github',
+ oauth2ClientId: GITHUB_CLIENT_ID,
+ oauth2ClientSecret: GITHUB_CLIENT_SECRET,
+ oauth2ClientAuthenticationMethod: 'client_secret_basic',
+ oauth2AuthorizationEndpoint: 'https://github.com/login/oauth/authorize',
+ oauth2TokenEndpoint: 'https://github.com/login/oauth/access_token',
+ oauth2UserInfoEndpoint: 'https://api.github.com/user',
+ buttonText: 'Github',
+ oauth2Scope: 'openid profile email offline user:email offline_access',
+ oauth2UniqueIdClaim: 'id',
+ oauth2EmailClaim: 'email',
+ oauth2EmailVerifiedClaim: 'email_verified',
+ oauth2UsernameClaim: 'preferred_username',
+ linkingStrategy: 'LinkByEmail',
+ debug: stack !== 'prod',
+ applicationConfigurations: [
+ {
+ applicationId: pulumi.interpolate`${macroApplication.oauthConfiguration.clientId}`,
+ enabled: true,
+ createRegistration: true,
+ },
+ ],
+ },
+ {
+ dependsOn: macroApplication,
+ provider: fusionAuthProvider,
+ protect: stack !== 'local',
+ }
+);
+
// Google identity provider id
const GOOGLE_IDP_ID =
stack === 'local' ? undefined : config.require('fusionauth-google-idp-id');