From 4731057e5063c2d50ede9f4b621414881b520daf Mon Sep 17 00:00:00 2001
From: Jason Blais <jason@spinpunch.com>
Date: Mon, 6 Nov 2017 13:23:15 -0500
Subject: Revert PLT-7809 (#7793)

* Update webrtc_test.go

* Update webrtc.go

* Update config.go

* Update webrtc.go
---
 model/config.go      |  1 -
 model/webrtc.go      | 21 +++------------------
 model/webrtc_test.go |  6 +++---
 3 files changed, 6 insertions(+), 22 deletions(-)

(limited to 'model')

diff --git a/model/config.go b/model/config.go
index ae62626de..097a73ab3 100644
--- a/model/config.go
+++ b/model/config.go
@@ -474,7 +474,6 @@ type NativeAppSettings struct {
 
 type WebrtcSettings struct {
 	Enable              *bool
-	GatewayType         *string
 	GatewayWebsocketUrl *string
 	GatewayAdminUrl     *string
 	GatewayAdminSecret  *string
diff --git a/model/webrtc.go b/model/webrtc.go
index 3318128fe..fa15a4b71 100644
--- a/model/webrtc.go
+++ b/model/webrtc.go
@@ -11,24 +11,19 @@ import (
 type WebrtcInfoResponse struct {
 	Token        string `json:"token"`
 	GatewayUrl   string `json:"gateway_url"`
-	GatewayType  string `json:"gateway_type"`
 	StunUri      string `json:"stun_uri,omitempty"`
 	TurnUri      string `json:"turn_uri,omitempty"`
 	TurnPassword string `json:"turn_password,omitempty"`
 	TurnUsername string `json:"turn_username,omitempty"`
 }
 
-type JanusGatewayResponse struct {
+type GatewayResponse struct {
 	Status string `json:"janus"`
 }
 
-type KopanoWebmeetingsResponse struct {
-	Value string `json:"value"`
-}
-
-func JanusGatewayResponseFromJson(data io.Reader) *JanusGatewayResponse {
+func GatewayResponseFromJson(data io.Reader) *GatewayResponse {
 	decoder := json.NewDecoder(data)
-	var o JanusGatewayResponse
+	var o GatewayResponse
 	err := decoder.Decode(&o)
 	if err == nil {
 		return &o
@@ -56,13 +51,3 @@ func WebrtcInfoResponseFromJson(data io.Reader) *WebrtcInfoResponse {
 		return nil
 	}
 }
-
-func KopanoWebmeetingsResponseFromJson(data io.Reader) *KopanoWebmeetingsResponse {
-	decoder := json.NewDecoder(data)
-	var o KopanoWebmeetingsResponse
-	err := decoder.Decode(&o)
-	if err == nil {
-		return &o
-	}
-	return nil
-}
diff --git a/model/webrtc_test.go b/model/webrtc_test.go
index 30a92f2b1..4b8b26dc1 100644
--- a/model/webrtc_test.go
+++ b/model/webrtc_test.go
@@ -27,20 +27,20 @@ func TestWebrtcInfoResponseToFromJson(t *testing.T) {
 	}
 }
 
-func TestJanusGatewayResponseFromJson(t *testing.T) {
+func TestGatewayResponseFromJson(t *testing.T) {
 	if testing.Short() {
 		t.SkipNow()
 	}
 
 	// Valid Gateway Response
 	s1 := `{"janus": "something"}`
-	g1 := JanusGatewayResponseFromJson(strings.NewReader(s1))
+	g1 := GatewayResponseFromJson(strings.NewReader(s1))
 
 	CheckString(t, g1.Status, "something")
 
 	// Malformed JSON
 	s2 := `{"wat"`
-	g2 := JanusGatewayResponseFromJson(strings.NewReader(s2))
+	g2 := GatewayResponseFromJson(strings.NewReader(s2))
 
 	if g2 != nil {
 		t.Fatal("expected nil")
-- 
cgit v1.2.3-1-g7c22