Add checker on auth and invite

Author: Pascal Benoit

sip-to-webrtc/softphone/invite.go

@@ -2,6 +2,7 @@ package softphone
 
 import (
 	"fmt"
+	"strings"
 )
 
 // Invite ...
@@ -22,14 +23,43 @@ func (softphone *Softphone) Invite(extension, offer string) {
 	sipMessage.Body = offer
 
 	softphone.request(sipMessage, func(message string) bool {
-		authenticateHeader := SIPMessage{}.FromString(message).headers["Proxy-Authenticate"]
-		ai :=  GetAuthInfo(authenticateHeader)
-		ai.AuthType = "Proxy-Authorization"
-		ai.Uri = "sip:"+ extension + "@"+ softphone.sipInfo.Domain
-		ai.Method = "INVITE"
+		proxyAuthenticateHeader := SIPMessage{}.FromString(message).headers["Proxy-Authenticate"]
+		authenticateHeader := SIPMessage{}.FromString(message).headers["WWW-Authenticate"]
+
+		var ai AuthInfo
+		if len(authenticateHeader) > 0 { //WWW-Authenticate
+			ai =  GetAuthInfo(authenticateHeader)
+			ai.AuthType = "Proxy-Authorization"
+			ai.Uri = "sip:"+ extension + "@"+ softphone.sipInfo.Domain
+			ai.Method = "INVITE"
+		} else if len(proxyAuthenticateHeader) > 0 { //Proxy-Authenticate
+			ai =  GetAuthInfo(authenticateHeader)
+			ai.AuthType = "Authorization"
+			ai.Uri = "sip:"+ extension + "@"+ softphone.sipInfo.Domain
+			ai.Method = "INVITE"
+		} else {
+			panic("FAIL TO SEND INVITE")
+		}
+
 		sipMessage.addAuthorization(*softphone, ai).addCseq(softphone).newViaBranch()
 		softphone.request(sipMessage, func(msg string) bool {
-			return false
+			responseStatus := strings.Split(strings.Split(msg, "\r\n")[0], " ")[1]
+			textStatus := strings.Split(strings.Split(msg, "\r\n")[0], " ")[2]
+			switch responseStatus {
+			case "100":
+				fmt.Println(textStatus)
+				return false //Continue the handler
+			case "183":
+				fmt.Println(textStatus)
+				return false //Continue the handler
+
+			case "200":
+				fmt.Println("### INVITE SUCCESS ###")
+				return true
+			default: //480
+				panic("INVITE FAILED : " +  responseStatus  + " " + textStatus)
+			}
+			return true
 		})
 
 		return true

sip-to-webrtc/softphone/register.go

@@ -1,12 +1,12 @@
 package softphone
 
 import (
-	"context"
 	"crypto/tls"
 	"fmt"
 	"github.com/gorilla/websocket"
 	"log"
 	"net/url"
+	"strings"
 )
 
 func (softphone *Softphone) register() {
@@ -40,7 +40,6 @@ func (softphone *Softphone) register() {
 			}
 		}
 	}()
-
 	sipMessage := SIPMessage{}
 	sipMessage.method = "REGISTER"
 	sipMessage.address = softphone.sipInfo.Domain
@@ -53,23 +52,29 @@ func (softphone *Softphone) register() {
 	sipMessage.headers["Supported"] = "path,ice"
 	sipMessage.addCseq(softphone).addCallID(*softphone).addUserAgent()
 
-	registered, registeredFunc := context.WithCancel(context.Background())
-
 	softphone.request(sipMessage, func(message string) bool {
 		authenticateHeader := SIPMessage{}.FromString(message).headers["WWW-Authenticate"]
-		ai :=  GetAuthInfo(authenticateHeader)
+		ai := GetAuthInfo(authenticateHeader)
 		ai.AuthType = "Authorization"
 		ai.Uri = "sip:" + softphone.sipInfo.Domain
 		ai.Method = "REGISTER"
-		sipMessage.addAuthorization(*softphone,ai).addCseq(softphone).newViaBranch()
+		sipMessage.addAuthorization(*softphone, ai).addCseq(softphone).newViaBranch()
 		softphone.request(sipMessage, func(msg string) bool {
-			registeredFunc()
 
-			return false
+			responseStatus := strings.Split(strings.Split(msg, "\r\n")[0], " ")[1]
+			textStatus := strings.Split(strings.Split(msg, "\r\n")[0], " ")[2]
+			switch responseStatus {
+			case "200":
+				fmt.Println("### SOFTPHONE CONNECTED ###")
+				break
+			default:
+				panic("AUTHENTICATION FAILED : " +  responseStatus  + " " + textStatus)
+				break
+			}
+
+			return true
 		})
 
 		return true
 	})
-
-	<-registered.Done()
 }

sip-to-webrtc/softphone/softphone.go

@@ -56,7 +56,6 @@ func (softphone *Softphone) removeMessageListener(key string) {
 
 func (softphone Softphone) request2(sipMessage SIPMessage, expectedResp string) string {
 
-
 	if err := softphone.wsConn.WriteMessage(1, []byte(sipMessage.ToString())); err != nil {
 		log.Panic(err)
 	}
@@ -91,7 +90,7 @@ func (softphone *Softphone) request(sipMessage SIPMessage, responseHandler func(
 }
 
 func (softphone *Softphone) response(message string) {
-//	log.Print("↑↑↑\n", message)
+	//	log.Print("↑↑↑\n", message)
 
 	if err := softphone.wsConn.WriteMessage(1, []byte(message)); err != nil {
 		log.Fatal(err)