Fix session element parsing on IQ

stanza/sasl_auth.go

@@ -95,10 +95,17 @@ func (s *StreamSession) Namespace() string {
 	return s.XMLName.Space
 }
 
+func (s *StreamSession) IsOptional() bool {
+	if s.XMLName.Local == "session" {
+		return s.Optional
+	}
+	return true
+}
+
 // ============================================================================
 // Registry init
 
 func init() {
 	TypeRegistry.MapExtension(PKTIQ, xml.Name{"urn:ietf:params:xml:ns:xmpp-bind", "bind"}, Bind{})
-	TypeRegistry.MapExtension(PKTIQ, xml.Name{"urn:ietf:params:xml:ns:xmpp-session", "bind"}, StreamSession{})
+	TypeRegistry.MapExtension(PKTIQ, xml.Name{"urn:ietf:params:xml:ns:xmpp-session", "session"}, StreamSession{})
 }

stanza/sasl_auth_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 // Check that we can detect optional session from advertised stream features
-func TestSession(t *testing.T) {
+func TestSessionFeatures(t *testing.T) {
 	streamFeatures := stanza.StreamFeatures{Session: stanza.StreamSession{Optional: true}}
 
 	data, err := xml.Marshal(streamFeatures)
@@ -18,10 +18,38 @@ func TestSession(t *testing.T) {
 
 	parsedStream := stanza.StreamFeatures{}
 	if err = xml.Unmarshal(data, &parsedStream); err != nil {
-		t.Errorf("Unmarshal(%s) returned error", data)
+		t.Errorf("Unmarshal(%s) returned error: %s", data, err)
 	}
 
-	if !parsedStream.Session.Optional {
+	if !parsedStream.Session.IsOptional() {
+		t.Error("Session should be optional")
+	}
+}
+
+// Check that the Session tag can be used in IQ decoding
+func TestSessionIQ(t *testing.T) {
+	iq := stanza.NewIQ(stanza.Attrs{Type: stanza.IQTypeSet, Id: "session"})
+	iq.Payload = &stanza.StreamSession{XMLName: xml.Name{Local: "session"}, Optional: true}
+
+	data, err := xml.Marshal(iq)
+	if err != nil {
+		t.Errorf("cannot marshal xml structure: %s", err)
+		return
+	}
+
+	parsedIQ := stanza.IQ{}
+	if err = xml.Unmarshal(data, &parsedIQ); err != nil {
+		t.Errorf("Unmarshal(%s) returned error: %s", data, err)
+		return
+	}
+
+	session, ok := parsedIQ.Payload.(*stanza.StreamSession)
+	if !ok {
+		t.Error("Missing session payload")
+		return
+	}
+
+	if !session.IsOptional() {
 		t.Error("Session should be optional")
 	}
 }