Skip to content

Allow 2fa enforcement at the user level #2644

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
adelowo merged 8 commits into from
Aug 6, 2026
Merged

Allow 2fa enforcement at the user level #2644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e2d4460
add 2 factor authentication enforcement
adelowo Jul 29, 2026
d27bb47
Merge remote-tracking branch 'origin/main' into feat-ISS-2587
adelowo Jul 31, 2026
a1e47ea
Merge remote-tracking branch 'origin/main' into feat-ISS-2587
adelowo Aug 3, 2026
db30dd6
task regenerate
adelowo Aug 3, 2026
400cbf1
Merge remote-tracking branch 'origin/main' into feat-ISS-2587
adelowo Aug 4, 2026
1d224a4
task generate
adelowo Aug 4, 2026
abb93bc
Merge remote-tracking branch 'origin/main' into feat-ISS-2587
adelowo Aug 6, 2026
0dd51a1
remove allowCtx
adelowo Aug 6, 2026
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
2 changes: 1 addition & 1 deletion .task/checksum/generate-ent-smart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f75f9c7b4718489f967a5a0fa165d8c8
8f951e1a0020299ee9450a72fdfa0456
2 changes: 1 addition & 1 deletion .task/checksum/generate-graphql-smart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
82f5052cf2c10768d5fbe2c6cd788f4a
f0f7821ffee1b805d010e873c4106a75
2 changes: 1 addition & 1 deletion .task/checksum/generate-openapi-smart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7911e1722214c4803f7e8745210389d7
673005be2e9496ae3902b1e0f281124f
7 changes: 7 additions & 0 deletions db/migrations-goose-postgres/20260806102628_tfa_enforcement.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-- +goose Up
-- modify "org_memberships" table
ALTER TABLE "org_memberships" ADD COLUMN "tfa_enforced" boolean NULL DEFAULT false, ADD COLUMN "tfa_enforced_reason" character varying NULL, ADD COLUMN "tfa_enforced_by" character varying NULL, ADD COLUMN "tfa_enforced_at" timestamptz NULL;

-- +goose Down
-- reverse: modify "org_memberships" table
ALTER TABLE "org_memberships" DROP COLUMN "tfa_enforced_at", DROP COLUMN "tfa_enforced_by", DROP COLUMN "tfa_enforced_reason", DROP COLUMN "tfa_enforced";
7 changes: 7 additions & 0 deletions db/migrations-goose-postgres/20260806102636_tfa_enforcement_history.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-- +goose Up
-- modify "org_membership_history" table
ALTER TABLE "org_membership_history" ADD COLUMN "tfa_enforced" boolean NULL DEFAULT false, ADD COLUMN "tfa_enforced_reason" character varying NULL, ADD COLUMN "tfa_enforced_by" character varying NULL, ADD COLUMN "tfa_enforced_at" timestamptz NULL;

-- +goose Down
-- reverse: modify "org_membership_history" table
ALTER TABLE "org_membership_history" DROP COLUMN "tfa_enforced_at", DROP COLUMN "tfa_enforced_by", DROP COLUMN "tfa_enforced_reason", DROP COLUMN "tfa_enforced";
4 changes: 3 additions & 1 deletion db/migrations-goose-postgres/atlas.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
h1:aWZe+Nu31OmFlBvmf10NwG+FpDG7rPewJHBUQleU6EE=
h1:ZcsB4l/WXn0+/QcEGCFrW6G/1mcFCEGId4QUixLvCtg=
20251229183203_init.sql h1:g/05irCXoqKFObJV2PPLuvDRqma+da41VPsZ5fXQgfE=
20251229183205_init_history.sql h1:P/q2kAHb8zfNMOWzYkKtPbOwoh9GdJUQljSNAiPEjYI=
20251231045229_workflow.sql h1:uUPRLO4yw2y//fPGeqIXRrL+fiEN1TRGkF4wHiqPaPk=
Expand Down Expand Up @@ -173,3 +173,5 @@ h1:aWZe+Nu31OmFlBvmf10NwG+FpDG7rPewJHBUQleU6EE=
20260730170846_dropassetnameindex.sql h1:87FQbYhZYp8TkCRHUmBe/3n2XxIBo+AOct1Q2JAGImg=
20260803213558_drop_notification_user_edge.sql h1:1oL/MV2MdtYqnz9sKV0CED/yt01j45eTrEe0wbQCKpM=
20260806055955_drop_integration_history_tables.sql h1:iF8wKuPtK4tAqxhVpBdC6407ptkgOUnc46azCkr9z/Y=
20260806102628_tfa_enforcement.sql h1:OfHMmkxbWl9RonXcnx3MunsruZ6vwp8872QAhERMWL8=
20260806102636_tfa_enforcement_history.sql h1:0NNHJpOCxJ5qlMtaItDEYlLgQAmtpDueL+noHLc+et0=
2 changes: 2 additions & 0 deletions db/migrations/20260806102606_tfa_enforcement.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- Modify "org_memberships" table
ALTER TABLE "org_memberships" ADD COLUMN "tfa_enforced" boolean NULL DEFAULT false, ADD COLUMN "tfa_enforced_reason" character varying NULL, ADD COLUMN "tfa_enforced_by" character varying NULL, ADD COLUMN "tfa_enforced_at" timestamptz NULL;
2 changes: 2 additions & 0 deletions db/migrations/20260806102616_tfa_enforcement_history.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- Modify "org_membership_history" table
ALTER TABLE "org_membership_history" ADD COLUMN "tfa_enforced" boolean NULL DEFAULT false, ADD COLUMN "tfa_enforced_reason" character varying NULL, ADD COLUMN "tfa_enforced_by" character varying NULL, ADD COLUMN "tfa_enforced_at" timestamptz NULL;
4 changes: 3 additions & 1 deletion db/migrations/atlas.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
h1:LZozbwRDwq/IbKHCRQy7qQPK+HHWaFlD6z4aoaVnXak=
h1:qDkwYcCwccihiwBlHCESVxoH6O59yShr/zPNLhR06c4=
20251229183159_init.sql h1:3uf/ftr28zW8YUD9qAaY2GESQHC7pYmkhlI6oDWUCKU=
20251229183201_init_history.sql h1:1tFSeCDWvZgb2Ctw80C/s3tqVPNLADQw9fSDACzL8WA=
20251231045221_workflow.sql h1:5bLq4cHh2kxUV7xajK5bq5McKKpr88HmufYauTdsgUw=
Expand Down Expand Up @@ -173,3 +173,5 @@ h1:LZozbwRDwq/IbKHCRQy7qQPK+HHWaFlD6z4aoaVnXak=
20260730170837_dropassetnameindex.sql h1:vfvgvcqSsRer9jd8g6JzlRg/l+LOmKw5ytLMCEcqTgk=
20260803213537_drop_notification_user_edge.sql h1:988ebIeIjtpxaIckXmIRbRl9V2GzENRBUWdLa9CTx9I=
20260806055946_drop_integration_history_tables.sql h1:WpsMuHDxGn3t4hAepDLBUePTYZBgh0P/cx/DgRQCj1Q=
20260806102606_tfa_enforcement.sql h1:iKnXbvc7CxEr0FU7GxJ6Lq7Ah92sIaytO+FP053Lybo=
20260806102616_tfa_enforcement_history.sql h1:lYstxxJz5bNKGS3M5+WaULQnGWLpYSDWhLK2YgbeF10=
2 changes: 1 addition & 1 deletion internal/ent/checksum/.history_schema_checksum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e792e56081bda28b7947f27d0a244edeadb0c404ca48ea1f1779d4b9d12e1901
001a87c385f673386bb8cd60ec25c1b4a6bc53b30912f6ecb2eef46289b08d62
2 changes: 1 addition & 1 deletion internal/ent/checksum/.schema_checksum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ae44f2b57b10b53083681758d6459753787839cf8d899ed141b49f471ee195a3
ac6af5b3c4a1d30cefe12c7f70dc5f2ec7cce30d4e4d3cf78c3c6ba6b9461e3d
24 changes: 24 additions & 0 deletions internal/ent/generated/entql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions internal/ent/generated/gql_collection.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 38 additions & 14 deletions internal/ent/generated/gql_mutation_input.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading