feat: add org domain whitelisting #289

Chief-Rishab · 2023-08-02T03:45:53Z

Requires feat: add org domain whitelisting proton#295

vercel · 2023-08-02T03:45:57Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
frontier	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 13, 2023 2:16pm

coveralls · 2023-08-02T03:54:49Z

Pull Request Test Coverage Report for Build 5842332694

0 of 312 (0.0%) changed or added relevant lines in 5 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage decreased (-1.2%) to 39.677%

Changes Missing Coverage	Changed/Added Lines	%
internal/api/v1beta1/v1beta1.go	1	0.0%
cmd/serve.go	10	0.0%
internal/store/postgres/domain.go	11	0.0%
internal/store/postgres/domain_repository.go	141	0.0%
internal/api/v1beta1/domain.go	149	0.0%

Totals
Change from base Build 5840222929:	-1.2%
Covered Lines:	4345
Relevant Lines:	10951

💛 - Coveralls

core/domain/domain.go

kushsharma · 2023-08-03T16:43:32Z

internal/store/postgres/migrations/20230731211912_create_domain_table.up.sql

+    name text NOT NULL,
+    org_id uuid NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,


We can create a unique constraint on org_id and name. One index on org_id.

kushsharma · 2023-08-03T16:45:25Z

pkg/server/interceptors/authorization.go

+	"/raystack.frontier.v1beta1.FrontierService/ListOrganizationDomains": func(ctx context.Context, handler *v1beta1.Handler, req any) error {
+		pbreq := req.(*frontierv1beta1.ListOrganizationDomainsRequest)
+		return handler.IsAuthorized(ctx, schema.OrganizationNamespace, pbreq.GetOrgId(), schema.GetPermission)
+	},
+	"/raystack.frontier.v1beta1.FrontierService/GetOrganizationDomain": func(ctx context.Context, handler *v1beta1.Handler, req any) error {
+		pbreq := req.(*frontierv1beta1.GetOrganizationDomainRequest)
+		return handler.IsAuthorized(ctx, schema.OrganizationNamespace, pbreq.GetId(), schema.GetPermission)
+	},


I am wondering about the authz model, if we expect user already part of the org to find possible orgs to join, how would he join it?

there's another API for that (get orgs by domain)

internal/store/postgres/domain_repository.go

kushsharma · 2023-08-03T16:48:23Z

core/domain/domain.go

+	Token      string
+	Verified   bool
+	VerifiedAt time.Time
+	CreatedAt  time.Time


How about having an expires at column as well?

was thinking of keeping it abstract since all the verified domains will not require that field, the cron job can be just used to remove the pending state domains with created-at time being more than 7 days

core/domain/service.go

cmd/serve.go

core/domain/domain.go

core/domain/service.go

cmd/serve.go

core/domain/filter.go

internal/api/v1beta1/domain.go

kushsharma · 2023-08-12T03:02:06Z

internal/api/v1beta1/domain.go

+	InitDomainVerification(ctx context.Context) error
+	Close()


Are we calling these two here?

yes, in the server file to initialise and close the cron to remove the pending records for domain verification

In server file we work with actual struct instead of interface, can you confirm? I think we can remove Close.

internal/api/v1beta1/domain.go

internal/store/postgres/domain.go

internal/store/postgres/domain_repository.go

… whitelisted

kushsharma

LGTM

kushsharma · 2023-08-13T16:21:13Z

internal/api/v1beta1/domain.go

+	InitDomainVerification(ctx context.Context) error
+	Close()


In server file we work with actual struct instead of interface, can you confirm? I think we can remove Close.

vercel bot deployed to Preview August 2, 2023 03:46 View deployment

Chief-Rishab force-pushed the feat/domain-whitelists branch from b037b9d to 45a1382 Compare August 2, 2023 03:51

vercel bot deployed to Preview August 2, 2023 03:52 View deployment

vercel bot deployed to Preview August 3, 2023 02:54 View deployment

Chief-Rishab requested a review from kushsharma August 3, 2023 02:58

kushsharma reviewed Aug 3, 2023

View reviewed changes

core/domain/service.go Outdated Show resolved Hide resolved

kushsharma reviewed Aug 3, 2023

View reviewed changes

core/domain/service.go Outdated Show resolved Hide resolved

vercel bot deployed to Preview August 8, 2023 02:58 View deployment

Chief-Rishab force-pushed the feat/domain-whitelists branch from 53c1916 to 0953a09 Compare August 8, 2023 03:26

vercel bot deployed to Preview August 8, 2023 03:27 View deployment

Chief-Rishab force-pushed the feat/domain-whitelists branch from 0953a09 to c45dca9 Compare August 9, 2023 15:31

vercel bot deployed to Preview August 9, 2023 15:31 View deployment

Chief-Rishab force-pushed the feat/domain-whitelists branch from c45dca9 to ca083a9 Compare August 9, 2023 19:53

vercel bot deployed to Preview August 9, 2023 19:54 View deployment

vercel bot deployed to Preview August 9, 2023 22:22 View deployment

vercel bot deployed to Preview August 9, 2023 22:44 View deployment

vercel bot deployed to Preview August 9, 2023 23:09 View deployment

Chief-Rishab requested a review from kushsharma August 9, 2023 23:09

Chief-Rishab marked this pull request as ready for review August 9, 2023 23:12

vercel bot deployed to Preview August 10, 2023 20:09 View deployment

Chief-Rishab force-pushed the feat/domain-whitelists branch from 9c53bb3 to 435f204 Compare August 10, 2023 20:10

vercel bot deployed to Preview August 10, 2023 20:10 View deployment

kushsharma reviewed Aug 12, 2023

View reviewed changes

Chief-Rishab added 4 commits August 12, 2023 20:30

feat: add org domain whitelisting

360bdee

feat: add support for user to join a whitelisted org domain

b8bb8bb

chore: add changes from suggestions

20dfd3c

feat: add api to list all the orgs user can join based on the domains…

0f31920

… whitelisted

Chief-Rishab added 3 commits August 12, 2023 20:33

chore: fix duplicate name error

14f83e8

chore: update interceptors and path params for list org by domain api

e2d8fef

chore: add the cron to remove expired pending domain requests

5ace2c5

Chief-Rishab force-pushed the feat/domain-whitelists branch from 435f204 to a35650c Compare August 12, 2023 16:23

vercel bot deployed to Preview August 12, 2023 16:24 View deployment

Chief-Rishab force-pushed the feat/domain-whitelists branch from a35650c to f840205 Compare August 12, 2023 16:58

vercel bot deployed to Preview August 12, 2023 16:58 View deployment

chore: add changes from suggestion

e32f7c5

Chief-Rishab force-pushed the feat/domain-whitelists branch from f840205 to e32f7c5 Compare August 12, 2023 17:13

vercel bot deployed to Preview August 12, 2023 17:14 View deployment

Chief-Rishab requested a review from kushsharma August 12, 2023 18:24

chore: add changes from suggestions

2069849

vercel bot deployed to Preview August 13, 2023 14:16 View deployment

kushsharma approved these changes Aug 13, 2023

View reviewed changes

kushsharma merged commit 25ee189 into main Aug 13, 2023
6 checks passed

kushsharma deleted the feat/domain-whitelists branch August 13, 2023 16:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add org domain whitelisting #289

feat: add org domain whitelisting #289

Chief-Rishab commented Aug 2, 2023 •

edited

Loading

vercel bot commented Aug 2, 2023 •

edited

Loading

coveralls commented Aug 2, 2023 •

edited

Loading

kushsharma Aug 3, 2023

kushsharma Aug 3, 2023

Chief-Rishab Aug 9, 2023

kushsharma Aug 3, 2023

Chief-Rishab Aug 9, 2023

kushsharma Aug 12, 2023

Chief-Rishab Aug 12, 2023

kushsharma Aug 13, 2023

kushsharma left a comment

kushsharma Aug 13, 2023

		name text NOT NULL,
		org_id uuid NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,

feat: add org domain whitelisting #289

feat: add org domain whitelisting #289

Conversation

Chief-Rishab commented Aug 2, 2023 • edited Loading

vercel bot commented Aug 2, 2023 • edited Loading

coveralls commented Aug 2, 2023 • edited Loading

Pull Request Test Coverage Report for Build 5842332694

💛 - Coveralls

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kushsharma left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Chief-Rishab commented Aug 2, 2023 •

edited

Loading

vercel bot commented Aug 2, 2023 •

edited

Loading

coveralls commented Aug 2, 2023 •

edited

Loading