Handle nil refs in StageOriginate and Originate (#23)

Fixes 22
CyCoreSystems · Jan 26, 2019 · 9ee6a2f · 9ee6a2f
1 parent ea70d92
commit 9ee6a2f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 16 deletions.
diff --git a/client/channel.go b/client/channel.go
@@ -31,10 +31,10 @@ func (c *channel) List(filter *ari.Key) ([]*ari.Key, error) {
 	})
 }
 
-func (c *channel) Originate(key *ari.Key, o ari.OriginateRequest) (*ari.ChannelHandle, error) {
+func (c *channel) Originate(referenceKey *ari.Key, o ari.OriginateRequest) (*ari.ChannelHandle, error) {
 	k, err := c.c.createRequest(&proxy.Request{
 		Kind: "ChannelOriginate",
-		Key:  key,
+		Key:  referenceKey,
 		ChannelOriginate: &proxy.ChannelOriginate{
 			OriginateRequest: o,
 		},
@@ -45,14 +45,15 @@ func (c *channel) Originate(key *ari.Key, o ari.OriginateRequest) (*ari.ChannelH
 	return ari.NewChannelHandle(k, c, nil), nil
 }
 
-func (c *channel) StageOriginate(key *ari.Key, o ari.OriginateRequest) (*ari.ChannelHandle, error) {
+func (c *channel) StageOriginate(referenceKey *ari.Key, o ari.OriginateRequest) (*ari.ChannelHandle, error) {
+
 	if o.ChannelID == "" {
 		o.ChannelID = rid.New(rid.Channel)
 	}
 
 	k, err := c.c.createRequest(&proxy.Request{
 		Kind: "ChannelStageOriginate",
-		Key:  key,
+		Key:  referenceKey,
 		ChannelOriginate: &proxy.ChannelOriginate{
 			OriginateRequest: o,
 		},
@@ -61,9 +62,7 @@ func (c *channel) StageOriginate(key *ari.Key, o ari.OriginateRequest) (*ari.Cha
 		return nil, err
 	}
 	return ari.NewChannelHandle(k.New(ari.ChannelKey, o.ChannelID), c, func(h *ari.ChannelHandle) error {
-		// Call the subsequent Originate with the original key ID (the source
-		// channel), so that Originator mapping will work
-		_, err := c.Originate(k.New(ari.ChannelKey, key.ID), o)
+		_, err := c.Originate(referenceKey, o)
 		return err
 	}), nil
 }

diff --git a/server/channel.go b/server/channel.go
@@ -125,10 +125,17 @@ func (s *Server) channelOriginate(ctx context.Context, reply string, req *proxy.
 		orig.ChannelID = rid.New(rid.Channel)
 	}
 
-	if req.Key.Dialog != "" {
+	if req.Key != nil && req.Key.Dialog != "" {
 		s.Dialog.Bind(req.Key.Dialog, "channel", orig.ChannelID)
-		s.Dialog.Bind(req.Key.Dialog, "channel", orig.OtherChannelID)
-		s.Dialog.Bind(req.Key.Dialog, "channel", orig.Originator)
+		if orig.OtherChannelID != "" {
+			s.Dialog.Bind(req.Key.Dialog, "channel", orig.OtherChannelID)
+		}
+		if orig.Originator != "" {
+			s.Dialog.Bind(req.Key.Dialog, "channel", orig.Originator)
+		}
+		if req.Key.ID != orig.Originator {
+			s.Dialog.Bind(req.Key.Dialog, "channel", req.Key.ID)
+		}
 	}
 
 	h, err := s.ari.Channel().Originate(req.Key, orig)
@@ -143,18 +150,33 @@ func (s *Server) channelOriginate(ctx context.Context, reply string, req *proxy.
 }
 
 func (s *Server) channelStageOriginate(ctx context.Context, reply string, req *proxy.Request) {
-	h := s.ari.Channel().Get(req.Key)
+	orig := req.ChannelOriginate.OriginateRequest
 
-	if req.ChannelOriginate.OriginateRequest.ChannelID == "" {
-		req.ChannelOriginate.OriginateRequest.ChannelID = rid.New(rid.Channel)
+	if orig.ChannelID == "" {
+		orig.ChannelID = rid.New(rid.Channel)
 	}
 
-	if req.Key.Dialog != "" {
-		s.Dialog.Bind(req.Key.Dialog, "channel", req.Key.ID)
+	if req.Key != nil && req.Key.Dialog != "" {
+		s.Dialog.Bind(req.Key.Dialog, "channel", orig.ChannelID)
+		if orig.OtherChannelID != "" {
+			s.Dialog.Bind(req.Key.Dialog, "channel", orig.OtherChannelID)
+		}
+		if orig.Originator != "" {
+			s.Dialog.Bind(req.Key.Dialog, "channel", orig.Originator)
+		}
+		if req.Key.ID != orig.Originator {
+			s.Dialog.Bind(req.Key.Dialog, "channel", req.Key.ID)
+		}
+	}
+
+	h, err := s.ari.Channel().StageOriginate(req.Key, orig)
+	if err != nil {
+		s.sendError(reply, err)
+		return
 	}
 
 	s.publish(reply, &proxy.Response{
-		Key: h.Key().New(ari.ChannelKey, req.ChannelOriginate.OriginateRequest.ChannelID),
+		Key: h.Key(),
 	})
 }