Skip to content

Commit b184da1

Browse files
committed
fix: fix missing CSR support in pool route of enrollment creation
1 parent 33cede3 commit b184da1

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/rasenmaeher_api/db/enrollments.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ async def by_pk_or_invitecode(cls, inval: Union[str, uuid.UUID], allow_deleted:
5252
except ValueError:
5353
return await cls.by_invitecode(str(inval), allow_deleted)
5454

55-
async def create_enrollment(self, callsign: str) -> "Enrollment":
55+
async def create_enrollment(self, callsign: str, csr: Optional[str] = None) -> "Enrollment":
5656
"""Create enrollment from this pool"""
5757
if not self.active:
5858
raise PoolInactive()
5959
if self.deleted:
6060
raise Deleted("Can't create enrollments on deleted pools")
61-
return await Enrollment.create_for_callsign(callsign, self, self.extra)
61+
return await Enrollment.create_for_callsign(callsign, self, self.extra, csr)
6262

6363
async def set_active(self, state: bool) -> "EnrollmentPool":
6464
"""Set active and return refreshed object"""

src/rasenmaeher_api/web/api/enrollment/schema.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ class EnrollmentInviteCodeEnrollIn(BaseModel):
422422

423423
invite_code: str
424424
callsign: str
425+
csr: Optional[str] = Field(description="CSR for mTLS key in PEM format", default=None)
425426

426427
class Config: # pylint: disable=too-few-public-methods
427428
"""Example values for schema"""

src/rasenmaeher_api/web/api/enrollment/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ async def post_enroll_invite_code(
416416
except NotFound:
417417
pass
418418

419-
enrollment = await obj.create_enrollment(callsign=request_in.callsign)
419+
enrollment = await obj.create_enrollment(callsign=request_in.callsign, csr=request_in.csr)
420420

421421
# Create JWT token for user
422422
claims = {"sub": request_in.callsign}

0 commit comments

Comments
 (0)