chat with authToken+userid instead of userSecret+dbid
This commit is contained in:
Anton Georgiev
parent
a2d868643b
commit
f2760f3ef8
@ -96,7 +96,7 @@ Handlebars.registerHelper "grabChatTabs", ->
|
||||
messageForServer = { # construct message for server
|
||||
"message": message
|
||||
"chat_type": if chattingWith is "PUBLIC_CHAT" then "PUBLIC_CHAT" else "PRIVATE_CHAT"
|
||||
"from_userid": getInSession("DBID")
|
||||
"from_userid": getInSession("userId")
|
||||
"from_username": BBB.getMyUserName()
|
||||
"from_tz_offset": "240"
|
||||
"to_username": if chattingWith is "PUBLIC_CHAT" then "public_chat_username" else dest.user.name
|
||||
@ -107,7 +107,8 @@ Handlebars.registerHelper "grabChatTabs", ->
|
||||
# "from_color": "0x#{getInSession("messageColor")}"
|
||||
}
|
||||
|
||||
Meteor.call "sendChatMessagetoServer", getInSession("meetingId"), messageForServer, getInSession("userId")
|
||||
Meteor.call "sendChatMessagetoServer", getInSession("meetingId"), messageForServer, getInSession("userId"), getInSession("authToken")
|
||||
|
||||
$('#newMessageInput').val '' # Clear message box
|
||||
|
||||
Template.chatbar.helpers
|
||||
|
||||
@ -1,7 +1,50 @@
|
||||
Meteor.methods
|
||||
sendChatMessagetoServer: (meetingId, chatObject, requesterUserId) ->
|
||||
# meetingId: the id of the meeting
|
||||
# chatObject: the object including info on the chat message, including the text
|
||||
# requesterUserId: the userId of the user sending chat
|
||||
# requesterToken: the authToken of the requester
|
||||
sendChatMessagetoServer: (meetingId, chatObject, requesterUserId, requesterToken) ->
|
||||
# inside the chatObject, they store their _id as the sender
|
||||
# and they pass their userId to this method as a param
|
||||
|
||||
###
|
||||
check if the user is the user with the auth token
|
||||
check if the user is the same user from 'sedding' in the message body
|
||||
check if the user is allowed sending a public chat if this is the case
|
||||
check if the user is allowed sending a private chat if that's the case
|
||||
check if the user is sending a message to himself
|
||||
###
|
||||
chatType = chatObject.chat_type
|
||||
recipient = chatObject.to_userid
|
||||
eventName = null
|
||||
action = ->
|
||||
if chatType is "PUBLIC_CHAT"
|
||||
eventName = "send_public_chat_message_request"
|
||||
return 'chatPublic'
|
||||
else
|
||||
eventName = "send_private_chat_message_request"
|
||||
if recipient is requesterUserId
|
||||
return 'chatSelf' #not allowed
|
||||
else
|
||||
return 'chatPrivate'
|
||||
|
||||
if isAllowedTo(action(), meetingId, requesterUserId, requesterToken)
|
||||
Meteor.log.info "requesterUserId: #{requesterUserId} | from_userid: #{chatObject.from_userid}"
|
||||
Meteor.log.info "chatObject:" + JSON.stringify chatObject
|
||||
|
||||
message =
|
||||
header :
|
||||
timestamp: new Date().getTime()
|
||||
name: eventName
|
||||
payload:
|
||||
message: chatObject
|
||||
meeting_id: meetingId
|
||||
requester_id: chatObject.from_userid
|
||||
|
||||
Meteor.log.info "publishing chat to redis"
|
||||
publish Meteor.config.redis.channels.toBBBApps.chat, message
|
||||
return
|
||||
###
|
||||
transformedChatObject = chatObject
|
||||
|
||||
Meteor.log.info "requesterUserId: #{requesterUserId} | from_userid: #{transformedChatObject.from_userid}"
|
||||
@ -36,6 +79,7 @@ Meteor.methods
|
||||
publish Meteor.config.redis.channels.toBBBApps.chat, message
|
||||
else
|
||||
Meteor.log.info "requester no exists"
|
||||
###
|
||||
|
||||
deletePrivateChatMessages: (userId, contact_id) ->
|
||||
# if authorized pass through
|
||||
@ -46,37 +90,29 @@ Meteor.methods
|
||||
# Private methods on server
|
||||
# --------------------------------------------------------------------------------------------
|
||||
@addChatToCollection = (meetingId, messageObject) ->
|
||||
console.log "\n\n\n stage 2 - adding \n\n"
|
||||
transformedChatObject = messageObject
|
||||
|
||||
# manually convert time from 1.408645053653E12 to 1408645053653 if necessary (this is the time_from that the Flash client outputs)
|
||||
transformedChatObject.from_time = (transformedChatObject.from_time).toString().split('.').join("").split("E")[0]
|
||||
|
||||
fromUser = Meteor.Users.findOne({userId: transformedChatObject.from_userid})
|
||||
toUser = Meteor.Users.findOne({userId: transformedChatObject.to_userid})
|
||||
forPublic = transformedChatObject.to_userid is 'public_chat_userid'
|
||||
|
||||
if (fromUser? and toUser?) or forPublic
|
||||
# translate ids from flash to html5
|
||||
transformedChatObject.from_userid = fromUser?._id
|
||||
transformedChatObject.to_userid = if forPublic then 'public_chat_userid' else toUser?._id
|
||||
if transformedChatObject.from_userid? and transformedChatObject.to_userid?
|
||||
entry =
|
||||
meetingId: meetingId
|
||||
message:
|
||||
chat_type: transformedChatObject.chat_type
|
||||
message: transformedChatObject.message
|
||||
to_username: transformedChatObject.to_username
|
||||
from_tz_offset: transformedChatObject.from_tz_offset
|
||||
from_color: transformedChatObject.from_color
|
||||
to_userid: transformedChatObject.to_userid
|
||||
from_userid: transformedChatObject.from_userid
|
||||
from_time: transformedChatObject.from_time
|
||||
from_username: transformedChatObject.from_username
|
||||
from_lang: transformedChatObject.from_lang
|
||||
|
||||
if transformedChatObject.from_userid? and transformedChatObject.to_userid?
|
||||
entry =
|
||||
meetingId: meetingId
|
||||
message:
|
||||
chat_type: transformedChatObject.chat_type
|
||||
message: transformedChatObject.message
|
||||
to_username: transformedChatObject.to_username
|
||||
from_tz_offset: transformedChatObject.from_tz_offset
|
||||
from_color: transformedChatObject.from_color
|
||||
to_userid: transformedChatObject.to_userid
|
||||
from_userid: transformedChatObject.from_userid
|
||||
from_time: transformedChatObject.from_time
|
||||
from_username: transformedChatObject.from_username
|
||||
from_lang: transformedChatObject.from_lang
|
||||
|
||||
id = Meteor.Chat.insert(entry)
|
||||
#Meteor.log.info "added chat id=[#{id}]:#{transformedChatObject.message}. Chat.size is now #{Meteor.Chat.find({meetingId: meetingId}).count()}"
|
||||
id = Meteor.Chat.insert(entry)
|
||||
Meteor.log.info "added chat id=[#{id}]:#{transformedChatObject.message}. Chat.size is now #{Meteor.Chat.find({meetingId: meetingId}).count()}"
|
||||
# --------------------------------------------------------------------------------------------
|
||||
# end Private methods on server
|
||||
# --------------------------------------------------------------------------------------------
|
||||
|
||||
@ -16,6 +16,10 @@ viewer =
|
||||
subscribeUsers: true
|
||||
subscribeChat: true
|
||||
|
||||
#chat
|
||||
chatPublic: true #should make this dynamically modifiable later on
|
||||
chatPrivate: true #should make this dynamically modifiable later on
|
||||
|
||||
@isAllowedTo = (action, meetingId, userId, authToken) ->
|
||||
Meteor.log.info "in isAllowedTo: action-#{action}, userId=#{userId}, authToken=#{authToken}"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user