diff --git a/bbbapiwrapper/create.go b/bbbapiwrapper/create.go index 3f333a2..54b5d6a 100644 --- a/bbbapiwrapper/create.go +++ b/bbbapiwrapper/create.go @@ -96,6 +96,7 @@ func ConvertCreateRequest(r *CreateMeetingReq, rawQueries map[string]string) (*p AllowScreenShare: true, AllowRaiseHand: &b, AllowVirtualBg: &b, + AutoGenUserId: &b, RecordingFeatures: &plugnmeet.RecordingFeatures{ IsAllow: r.Record, IsAllowCloud: r.Record, @@ -240,19 +241,15 @@ func setLockSettings(f *plugnmeet.LockSettings, r *CreateMeetingReq) { if r.LockSettingsDisableCam { f.LockWebcam = &l } - if r.LockSettingsDisableMic { f.LockMicrophone = &l } - if r.LockSettingsDisablePublicChat { f.LockChatSendMessage = &l } - if r.LockSettingsDisablePrivateChat { f.LockPrivateChat = &l } - if r.LockSettingsDisableNotes { f.LockSharedNotepad = &l } diff --git a/bbbapiwrapper/join.go b/bbbapiwrapper/join.go index f4889b2..a31a3b5 100644 --- a/bbbapiwrapper/join.go +++ b/bbbapiwrapper/join.go @@ -30,10 +30,10 @@ func ConvertJoinRequest(r *JoinMeetingReq, isAdmin bool) *plugnmeet.GenerateToke RoomId: CheckMeetingIdToMatchFormat(r.MeetingID), UserInfo: &plugnmeet.UserInfo{ Name: r.FullName, - UserId: CheckForUserId(r.UserID), IsAdmin: isAdmin, UserMetadata: &plugnmeet.UserMetadata{ LockSettings: &plugnmeet.LockSettings{}, + ExUserId: &r.UserID, }, }, } diff --git a/proto_files/plugnmeet_create_room.proto b/proto_files/plugnmeet_create_room.proto index 637e86b..4cb723c 100644 --- a/proto_files/plugnmeet_create_room.proto +++ b/proto_files/plugnmeet_create_room.proto @@ -11,7 +11,7 @@ import "plugnmeet_auth_room.proto"; message CreateRoomReq { string room_id = 1 [(buf.validate.field).cel = { id: "room_id_format", - message: "room_id should only contain letters, digits or -_", + message: "room_id should only contain ASCII letters (a-z A-Z), digits (0-9) or -_", expression: "this.matches('^[a-zA-Z0-9-_]+$')" }]; optional uint32 empty_timeout = 2 [(buf.validate.field).uint32.gt = 0]; diff --git a/proto_files/plugnmeet_gen_token.proto b/proto_files/plugnmeet_gen_token.proto index 04546eb..05dfef1 100644 --- a/proto_files/plugnmeet_gen_token.proto +++ b/proto_files/plugnmeet_gen_token.proto @@ -8,7 +8,7 @@ import "buf/validate/validate.proto"; message GenerateTokenReq { string room_id = 1 [(buf.validate.field).cel = { id: "room_id_format", - message: "room_id should only contain letters, digits -_", + message: "room_id should only contain letters (a-z A-Z), digits (0-9) or -_", expression: "this.matches('^[a-zA-Z0-9-_]+$')" }]; UserInfo user_info = 2 [(buf.validate.field).required = true];