Skip to content

Commit 13a58d0

Browse files
jeongY-ChojeongY-Cho
committed
rename endpoints
1 parent 5472f39 commit 13a58d0

8 files changed

+55
-46
lines changed

‎getConfig_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func Test_server_getConfig(t *testing.T) {
2424

2525
t.Run("test get on missing query", func(t *testing.T) {
2626
w := httptest.NewRecorder()
27-
req, _ := http.NewRequest("GET", "/getConfig", nil)
27+
req, _ := http.NewRequest("GET", "/session/config", nil)
2828
router.ServeHTTP(w, req)
2929

3030
if w.Code != 400 {
@@ -34,7 +34,7 @@ func Test_server_getConfig(t *testing.T) {
3434

3535
t.Run("test get on missing config", func(t *testing.T) {
3636
w := httptest.NewRecorder()
37-
req, _ := http.NewRequest("GET", "/getConfig?session=test", nil)
37+
req, _ := http.NewRequest("GET", "/session/config?session=test", nil)
3838
router.ServeHTTP(w, req)
3939

4040
if w.Code != 404 {
@@ -45,7 +45,7 @@ func Test_server_getConfig(t *testing.T) {
4545
t.Run("test get on missing config", func(t *testing.T) {
4646
mr.HSet("session:test:config", "RefreshInterval", "100")
4747
w := httptest.NewRecorder()
48-
req, _ := http.NewRequest("GET", "/getConfig?session=test", nil)
48+
req, _ := http.NewRequest("GET", "/session/config?session=test", nil)
4949
router.ServeHTTP(w, req)
5050

5151
if w.Code != 200 {

‎makeRequest_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func Test_server_makeRequest(t *testing.T) {
2525

2626
t.Run("empty call", func(t *testing.T) {
2727
w := httptest.NewRecorder()
28-
req, _ := http.NewRequest("POST", "/makeRequest", nil)
28+
req, _ := http.NewRequest("POST", "/session/request", nil)
2929
router.ServeHTTP(w, req)
3030

3131
if w.Code != 400 {
@@ -35,7 +35,7 @@ func Test_server_makeRequest(t *testing.T) {
3535

3636
t.Run("invalid body, inactive session", func(t *testing.T) {
3737
w := httptest.NewRecorder()
38-
req, _ := http.NewRequest("POST", "/makeRequest", strings.NewReader("{\"invalid\":\"invalid\"}"))
38+
req, _ := http.NewRequest("POST", "/session/request", strings.NewReader("{\"invalid\":\"invalid\"}"))
3939
router.ServeHTTP(w, req)
4040

4141
if w.Code != 400 {
@@ -52,7 +52,7 @@ func Test_server_makeRequest(t *testing.T) {
5252
validBodyBytes, _ := json.Marshal(validBody)
5353

5454
w := httptest.NewRecorder()
55-
req, _ := http.NewRequest("POST", "/makeRequest", bytes.NewReader(validBodyBytes))
55+
req, _ := http.NewRequest("POST", "/session/request", bytes.NewReader(validBodyBytes))
5656
router.ServeHTTP(w, req)
5757

5858
if expect := 404; w.Code != expect {
@@ -71,7 +71,7 @@ func Test_server_makeRequest(t *testing.T) {
7171
validBodyBytes, _ := json.Marshal(validBody)
7272

7373
w := httptest.NewRecorder()
74-
req, _ := http.NewRequest("POST", "/makeRequest", bytes.NewReader(validBodyBytes))
74+
req, _ := http.NewRequest("POST", "/session/request", bytes.NewReader(validBodyBytes))
7575
router.ServeHTTP(w, req)
7676

7777
if expect := 200; w.Code != expect {
@@ -90,7 +90,7 @@ func Test_server_makeRequest(t *testing.T) {
9090
validBodyBytes, _ := json.Marshal(validBody)
9191

9292
w := httptest.NewRecorder()
93-
req, _ := http.NewRequest("POST", "/makeRequest", bytes.NewReader(validBodyBytes))
93+
req, _ := http.NewRequest("POST", "/session/request", bytes.NewReader(validBodyBytes))
9494
router.ServeHTTP(w, req)
9595

9696
if expect := 429; w.Code != expect {

‎pogifyApi.go

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,22 @@ func Server(rr *gin.RouterGroup) {
9292
go a.getTwitchKeys()
9393
s.auth = a
9494

95-
rr.POST("/startSession", s.startSession)
96-
rr.POST("/refreshSession", s.refreshSession)
97-
rr.OPTIONS("/postUpdate", s.cors)
98-
rr.POST("/postUpdate", s.postUpdate)
99-
rr.POST("/makeRequest", s.makeRequest)
100-
rr.OPTIONS("/makeRequest", s.cors)
101-
rr.POST("/setConfig", s.setConfig)
102-
rr.OPTIONS("/setConfig", s.cors)
103-
rr.GET("/getConfig", s.getConfig)
104-
rr.GET("/auth/twitch", s.twitchAuth)
95+
sessionEndpoints := rr.Group("/session")
96+
{
97+
sessionEndpoints.POST("/start", s.startSession)
98+
99+
sessionEndpoints.POST("/refresh", s.refreshSession)
100+
101+
sessionEndpoints.OPTIONS("/update", s.cors)
102+
sessionEndpoints.POST("/update", s.postUpdate)
103+
104+
sessionEndpoints.OPTIONS("/request", s.cors)
105+
sessionEndpoints.POST("/request", s.makeRequest)
106+
107+
sessionEndpoints.POST("/config", s.setConfig)
108+
sessionEndpoints.OPTIONS("/config", s.cors)
109+
110+
sessionEndpoints.GET("/config", s.getConfig)
111+
}
112+
rr.POST("/auth/twitch", s.twitchAuth)
105113
}

‎pogifyApi_test.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,16 @@ func TestServerV1(t *testing.T) {
7171
endpoint string
7272
method string
7373
}{
74-
{"/startSession", "POST"},
75-
{"/refreshSession", "POST"},
76-
{"/postUpdate", "OPTIONS"},
77-
{"/postUpdate", "POST"},
78-
{"/makeRequest", "POST"},
79-
{"/makeRequest", "OPTIONS"},
80-
{"/setConfig", "OPTIONS"},
81-
{"/getConfig", "GET"},
82-
{"/auth/twitch", "GET"},
74+
{"/session/start", "POST"},
75+
{"/session/refresh", "POST"},
76+
{"/session/update", "OPTIONS"},
77+
{"/session/update", "POST"},
78+
{"/session/request", "POST"},
79+
{"/session/request", "OPTIONS"},
80+
{"/session/config", "OPTIONS"},
81+
{"/session/config", "GET"},
82+
{"/session/config", "POST"},
83+
{"/auth/twitch", "POST"},
8384
}
8485

8586
for _, testCase := range cases {

‎postUpdate_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func Test_server_postUpdate(t *testing.T) {
4545

4646
t.Run("empty call", func(t *testing.T) {
4747
w := httptest.NewRecorder()
48-
req, _ := http.NewRequest("POST", "/postUpdate", nil)
48+
req, _ := http.NewRequest("POST", "/session/update", nil)
4949
router.ServeHTTP(w, req)
5050

5151
if w.Code != 400 {
@@ -55,7 +55,7 @@ func Test_server_postUpdate(t *testing.T) {
5555
t.Run("invalid token", func(t *testing.T) {
5656
invalidToken, _ := token.SignedString([]byte("aaaa"))
5757
w := httptest.NewRecorder()
58-
req, _ := http.NewRequest("POST", "/postUpdate", nil)
58+
req, _ := http.NewRequest("POST", "/session/update", nil)
5959
req.Header.Add("X-Session-Token", invalidToken)
6060
router.ServeHTTP(w, req)
6161

@@ -65,7 +65,7 @@ func Test_server_postUpdate(t *testing.T) {
6565
})
6666
t.Run("proper token, empty body", func(t *testing.T) {
6767
w := httptest.NewRecorder()
68-
req, _ := http.NewRequest("POST", "/postUpdate", nil)
68+
req, _ := http.NewRequest("POST", "/session/update", nil)
6969
req.Header.Add("x-session-token", mockToken)
7070
router.ServeHTTP(w, req)
7171

@@ -76,7 +76,7 @@ func Test_server_postUpdate(t *testing.T) {
7676

7777
t.Run("proper token, body", func(t *testing.T) {
7878
w := httptest.NewRecorder()
79-
req, _ := http.NewRequest("POST", "/postUpdate", strings.NewReader("{\"nothing\":\"nothing\"}"))
79+
req, _ := http.NewRequest("POST", "/session/update", strings.NewReader("{\"nothing\":\"nothing\"}"))
8080
req.Header.Add("x-session-token", mockToken)
8181
router.ServeHTTP(w, req)
8282

‎refreshSession_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func Test_server_refreshSession(t *testing.T) {
4545

4646
t.Run("empty call", func(t *testing.T) {
4747
w := httptest.NewRecorder()
48-
req, _ := http.NewRequest("POST", "/refreshSession", nil)
48+
req, _ := http.NewRequest("POST", "/session/refresh", nil)
4949
router.ServeHTTP(w, req)
5050

5151
if w.Code != 400 {
@@ -54,7 +54,7 @@ func Test_server_refreshSession(t *testing.T) {
5454
})
5555
t.Run("with sessionToken without refreshToken", func(t *testing.T) {
5656
w := httptest.NewRecorder()
57-
req, _ := http.NewRequest("POST", "/refreshSession", nil)
57+
req, _ := http.NewRequest("POST", "/session/refresh", nil)
5858
q := req.URL.Query()
5959
q.Add("sessionToken", mockToken)
6060

@@ -68,7 +68,7 @@ func Test_server_refreshSession(t *testing.T) {
6868
t.Run("with invalid sessionToken, with refreshToken", func(t *testing.T) {
6969
invalidToken, _ := token.SignedString([]byte("aaaa"))
7070
w := httptest.NewRecorder()
71-
req, _ := http.NewRequest("POST", "/refreshSession", nil)
71+
req, _ := http.NewRequest("POST", "/session/refresh", nil)
7272
q := req.URL.Query()
7373
q.Add("sessionToken", invalidToken)
7474
q.Add("refreshToken", "aaaaaaa")
@@ -82,7 +82,7 @@ func Test_server_refreshSession(t *testing.T) {
8282
})
8383
t.Run("with sessionToken, with expired refreshToken", func(t *testing.T) {
8484
w := httptest.NewRecorder()
85-
req, _ := http.NewRequest("POST", "/refreshSession", nil)
85+
req, _ := http.NewRequest("POST", "/session/refresh", nil)
8686
q := req.URL.Query()
8787
q.Add("sessionToken", mockToken)
8888
q.Add("refreshToken", "aaaaa")
@@ -97,7 +97,7 @@ func Test_server_refreshSession(t *testing.T) {
9797
t.Run("with sessionToken, with invalid refreshToken", func(t *testing.T) {
9898
mr.Set("session:"+sessionCode, "abc")
9999
w := httptest.NewRecorder()
100-
req, _ := http.NewRequest("POST", "/refreshSession", nil)
100+
req, _ := http.NewRequest("POST", "/session/refresh", nil)
101101
q := req.URL.Query()
102102
q.Add("sessionToken", mockToken)
103103
q.Add("refreshToken", "aaaaa")
@@ -112,7 +112,7 @@ func Test_server_refreshSession(t *testing.T) {
112112
t.Run("with sessionToken, with good refreshToken", func(t *testing.T) {
113113
mr.Set("session:"+sessionCode, "abc")
114114
w := httptest.NewRecorder()
115-
req, _ := http.NewRequest("POST", "/refreshSession", nil)
115+
req, _ := http.NewRequest("POST", "/session/refresh", nil)
116116
q := req.URL.Query()
117117
q.Add("sessionToken", mockToken)
118118
q.Add("refreshToken", "abc")

‎setConfig_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func Test_server_setConfig(t *testing.T) {
4242

4343
t.Run("test without token", func(t *testing.T) {
4444
w := httptest.NewRecorder()
45-
req, _ := http.NewRequest("POST", "/setConfig", nil)
45+
req, _ := http.NewRequest("POST", "/session/config", nil)
4646
router.ServeHTTP(w, req)
4747

4848
if w.Code != 400 {
@@ -54,7 +54,7 @@ func Test_server_setConfig(t *testing.T) {
5454
t.Run("test with token, no body", func(t *testing.T) {
5555

5656
w := httptest.NewRecorder()
57-
req, _ := http.NewRequest("POST", "/setConfig", nil)
57+
req, _ := http.NewRequest("POST", "/session/config", nil)
5858
req.Header.Add("X-Session-Token", mockToken)
5959
router.ServeHTTP(w, req)
6060

@@ -66,7 +66,7 @@ func Test_server_setConfig(t *testing.T) {
6666
t.Run("test with invalid token", func(t *testing.T) {
6767
invalidToken, _ := token.SignedString([]byte("aaaa"))
6868
w := httptest.NewRecorder()
69-
req, _ := http.NewRequest("POST", "/setConfig", nil)
69+
req, _ := http.NewRequest("POST", "/session/config", nil)
7070
req.Header.Add("X-Session-Token", invalidToken)
7171
router.ServeHTTP(w, req)
7272

@@ -80,7 +80,7 @@ func Test_server_setConfig(t *testing.T) {
8080
conf := []byte("{\"requestInterval\":100}")
8181

8282
w := httptest.NewRecorder()
83-
req, _ := http.NewRequest("POST", "/setConfig", bytes.NewReader(conf))
83+
req, _ := http.NewRequest("POST", "/session/config", bytes.NewReader(conf))
8484
req.Header.Add("X-Session-Token", mockToken)
8585
router.ServeHTTP(w, req)
8686

‎startSession_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ func Test_server_startSession(t *testing.T) {
2424

2525
Server(router.Group("/"))
2626
var key1 string
27-
t.Run("Test /startSession returns 200", func(t *testing.T) {
27+
t.Run("Test /session/start returns 200", func(t *testing.T) {
2828
w := httptest.NewRecorder()
29-
req, _ := http.NewRequest("POST", "/startSession", nil)
29+
req, _ := http.NewRequest("POST", "/session/start", nil)
3030
router.ServeHTTP(w, req)
3131

3232
if w.Code != 200 {
33-
t.Fatal("/startSession didn't return 200 on normal operation")
33+
t.Fatal("/session/start didn't return 200 on normal operation")
3434
}
3535

3636
body, err := ioutil.ReadAll(w.Body)
@@ -64,7 +64,7 @@ func Test_server_startSession(t *testing.T) {
6464

6565
})
6666

67-
t.Run("Test /startSession returns 200 the other key", func(t *testing.T) {
67+
t.Run("Test /session/start returns 200 the other key", func(t *testing.T) {
6868
var otherKey string
6969
if key1 == "test1" {
7070
otherKey = "test2"
@@ -73,7 +73,7 @@ func Test_server_startSession(t *testing.T) {
7373
}
7474

7575
w := httptest.NewRecorder()
76-
req, _ := http.NewRequest("POST", "/startSession", nil)
76+
req, _ := http.NewRequest("POST", "/session/start", nil)
7777
router.ServeHTTP(w, req)
7878
body, _ := ioutil.ReadAll(w.Body)
7979

0 commit comments

Comments
 (0)