Skip to content

Feat/channel invitation workflow part 3 #804

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

Open
Pranav-d33 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Feat/channel invitation workflow part 3 #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75ba03c
feat: add channel invitation data models
Pranav-d33 May 11, 2026
53f5365
feat: add channel invitation API endpoints
Pranav-d33 Jun 10, 2026
2aa1f85
fix: add msp_id to Organization model and fix agent artifact generation
Pranav-d33 Jun 18, 2026
d2a234f
Merge branch 'main' into feat/channel-invitation-workflow-part-3
yeasy Jun 30, 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
8 changes: 6 additions & 2 deletions src/api-engine/api/common/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,12 @@ def __new__(mcs, name, bases, attrs):

if display_strings is not None and inspect.isclass(display_strings):
del attrs["DisplayStrings"]
if hasattr(attrs, "_member_names"):
attrs._member_names.remove("DisplayStrings")
member_names = getattr(attrs, "_member_names", None)
if member_names is not None and "DisplayStrings" in member_names:
try:
member_names.remove("DisplayStrings")
except (AttributeError, TypeError):
pass

obj = super().__new__(mcs, name, bases, attrs)
for m in obj:
Expand Down
18 changes: 16 additions & 2 deletions src/api-engine/auth/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@ class RegisterBody(serializers.Serializer):
email = serializers.EmailField(help_text="Admin Email")
password = serializers.CharField(help_text="Admin Password")
agent_url = serializers.CharField(help_text="Agent URL")
msp_id = serializers.CharField(
help_text="Fabric MSP ID (e.g. Org1MSP)",
required=False,
allow_blank=True,
)

class Meta:
fields = ("org_name", "email", "password")
fields = ("org_name", "email", "password", "msp_id")
extra_kwargs = {
"org_name": {"required": True},
"email": {"required": True},
Expand All @@ -40,8 +45,17 @@ def validate_agent_url(agent_url: str) -> str:

return agent_url

def validate_msp_id(self, msp_id: str) -> str:
if msp_id and Organization.objects.filter(msp_id=msp_id).exists():
raise serializers.ValidationError("MSP ID already exists!")
return msp_id

def create(self, validated_data: Dict[str, Any]) -> Optional[Organization]:
organization = create_organization(validated_data.get("org_name"), validated_data.get("agent_url"))
organization = create_organization(
validated_data.get("org_name"),
validated_data.get("agent_url"),
validated_data.get("msp_id", ""),
)
create_user(organization, validated_data["email"], validated_data["password"], UserProfile.Role.ADMIN)
return organization

Expand Down
2 changes: 1 addition & 1 deletion src/api-engine/chaincode/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Migration(migrations.Migration):
('label', models.CharField(help_text='Chaincode Label', max_length=128)),
('language', models.CharField(help_text='Chaincode Language', max_length=128)),
('init_required', models.BooleanField(default=False, help_text='Whether Chaincode Initialization Required')),
('signature_policy', models.CharField(blank=True, help_text='Chaincode Signature Policy', null=True)),
('signature_policy', models.CharField(blank=True, help_text='Chaincode Signature Policy', max_length=1024, null=True)),
('description', models.CharField(blank=True, help_text='Chaincode Description', max_length=128, null=True)),
('created_at', models.DateTimeField(auto_now_add=True, help_text='Chaincode Creation Timestamp')),
],
Expand Down
1 change: 1 addition & 0 deletions src/api-engine/chaincode/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class Status(models.TextChoices):
)
signature_policy = models.CharField(
help_text="Chaincode Signature Policy",
max_length=1024,
null=True,
blank=True,
)
Expand Down
221 changes: 221 additions & 0 deletions src/api-engine/channel/migrations/0002_channel_invitation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
import common.utils
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
("channel", "0001_initial"),
]

operations = [
migrations.CreateModel(
name="ChannelInvitation",
fields=[
(
"id",
models.UUIDField(
default=common.utils.make_uuid,
help_text="Channel Invitation ID",
primary_key=True,
serialize=False,
),
),
(
"status",
models.CharField(
choices=[
("DRAFT", "Draft"),
("SIGNING", "Signing"),
("READY", "Ready"),
("ACCEPTED", "Accepted"),
("REJECTED", "Rejected"),
("FAILED", "Failed"),
("CANCELED", "Canceled"),
],
default="DRAFT",
help_text="Channel invitation status",
max_length=32,
),
),
(
"artifact",
models.FileField(
blank=True,
help_text="Update Artifact",
null=True,
upload_to="channel_invitations/",
),
),
(
"artifact_hash",
models.CharField(
blank=True,
default="",
help_text="Artifact Hash",
max_length=64,
),
),
(
"required_signatures",
models.PositiveSmallIntegerField(
default=0,
help_text="Required Signatures",
),
),
(
"error_message",
models.TextField(
blank=True,
default="",
help_text="Error Message",
),
),
(
"created_at",
models.DateTimeField(auto_now_add=True),
),
(
"updated_at",
models.DateTimeField(auto_now=True),
),
(
"channel",
models.ForeignKey(
help_text="Invitation Channel",
on_delete=django.db.models.deletion.CASCADE,
related_name="invitations",
to="channel.channel",
),
),
(
"creator_organization",
models.ForeignKey(
help_text="Creator Organization",
on_delete=django.db.models.deletion.CASCADE,
related_name="created_invitations",
to="organization.organization",
),
),
],
options={
"ordering": ("-created_at",),
},
),
migrations.CreateModel(
name="ChannelInvitationSignature",
fields=[
(
"id",
models.UUIDField(
default=common.utils.make_uuid,
help_text="Channel Invitation Signature ID",
primary_key=True,
serialize=False,
),
),
(
"artifact_hash",
models.CharField(
help_text="Artifact Hash",
max_length=64,
),
),
(
"signed_at",
models.DateTimeField(auto_now_add=True),
),
(
"invitation",
models.ForeignKey(
help_text="Invitation",
on_delete=django.db.models.deletion.CASCADE,
related_name="signatures",
to="channel.channelinvitation",
),
),
(
"organization",
models.ForeignKey(
help_text="Signing Organization",
on_delete=django.db.models.deletion.CASCADE,
related_name="invitation_signatures",
to="organization.organization",
),
),
],
options={
"ordering": ("signed_at",),
},
),
migrations.CreateModel(
name="ChannelInvitationInvitee",
fields=[
(
"id",
models.UUIDField(
default=common.utils.make_uuid,
help_text="Channel Invitation Invitee ID",
primary_key=True,
serialize=False,
),
),
(
"status",
models.CharField(
choices=[
("PENDING", "Pending"),
("ACCEPTED", "Accepted"),
("REJECTED", "Rejected"),
],
default="PENDING",
help_text="Invitee Status",
max_length=32,
),
),
(
"responded_at",
models.DateTimeField(
blank=True,
null=True,
),
),
(
"invitation",
models.ForeignKey(
help_text="Invitation",
on_delete=django.db.models.deletion.CASCADE,
related_name="invitees",
to="channel.channelinvitation",
),
),
(
"organization",
models.ForeignKey(
help_text="Invited Organization",
on_delete=django.db.models.deletion.CASCADE,
related_name="invitee_invitations",
to="organization.organization",
),
),
],
options={
"ordering": ("id",),
},
),
migrations.AddConstraint(
model_name="channelinvitationsignature",
constraint=models.UniqueConstraint(
fields=("invitation", "organization"),
name="unique_channel_invitation_signature",
),
),
migrations.AddConstraint(
model_name="channelinvitationinvitee",
constraint=models.UniqueConstraint(
fields=("invitation", "organization"),
name="unique_channel_invitation_invitee",
),
),
]
Loading
Loading