feat: validity check before registration

Author: TP-O

README.md

@@ -16,26 +16,16 @@ Usage of goer:
   -d    Domain name (default "https://edusoftweb.hcmiu.edu.vn")
   -i    List of course IDs
   -p    Password
-  -s    Session ID
   -u    Student ID
 ```
 
 ## Example
 [How to get course ID](https://youtu.be/nPnCHI7AVZg)
 
-### Use username and password
 ```bash
 $ goer \
     -u ITITIU19180 \
     -p Mypassword \
     -i "IT092IU02  01|IT092IU|Principles of Programming Languages|02|4|0|01/01/0001|0|0|0| |0|ITIT19CS31" \
     -i "IT093IU02  01|IT093IU|Web Application Development|02|4|0|01/01/0001|0|0|0| |0|ITIT19CS31"
-```
-
-### Use session ID
-```bash
-$ goer \
-    -s SessionID \
-    -i "IT092IU02  01|IT092IU|Principles of Programming Languages|02|4|0|01/01/0001|0|0|0| |0|ITIT19CS31" \
-    -i "IT093IU02  01|IT093IU|Web Application Development|02|4|0|01/01/0001|0|0|0| |0|ITIT19CS31"
-```
+```

client.go

@@ -12,32 +12,11 @@ import (
 
 type Client struct {
 	Host             string
-	Session          string
 	Http             HttpInterface
 	PayloadGenerator PayloadGeneratorInterface
 }
 
-func (c *Client) CheckSession() bool {
-	if url, err := url.Parse(c.Host); err == nil && c.Session != "" {
-		c.Http.GetClient().Jar.SetCookies(url, []*http.Cookie{
-			{
-				Name:     "ASP.NET_SessionId",
-				Value:    c.Session,
-				HttpOnly: true,
-			},
-		})
-
-		return true
-	}
-
-	return false
-}
-
 func (c *Client) Login() (bool, string) {
-	if c.CheckSession() {
-		return true, "Session is used!!"
-	}
-
 	path := "/default.aspx"
 	payload := c.PayloadGenerator.LoginPayload()
 
@@ -49,14 +28,26 @@ func (c *Client) Login() (bool, string) {
 	} else if res.StatusCode != 302 || strings.Contains(res.Header.Values("Location")[0], "sessionreuse") {
 		return false, "Login failed 😢 Trying to login again..."
 	} else {
-		if url, err := url.Parse(c.Host); err == nil {
-			return true, "Login successfully!!! 😆 [" + c.Http.GetClient().Jar.Cookies(url)[0].Value + "]"
-		}
-
 		return true, "Login successfully!!! 😆"
 	}
 }
 
+func (c *Client) Reset() (bool, string) {
+	if url, err := url.Parse(c.Host); err == nil {
+		c.Http.GetClient().Jar.SetCookies(url, []*http.Cookie{
+			{
+				Name:     "ASP.NET_SessionId",
+				Value:    "",
+				HttpOnly: true,
+			},
+		})
+
+		return true, "Logut successfully!!! 😆"
+	}
+
+	return false, "Logout failed 😢"
+}
+
 func (c *Client) SayHi() string {
 	path := "/default.aspx"
 
@@ -71,6 +62,24 @@ func (c *Client) SayHi() string {
 	}
 }
 
+func (c *Client) IsReady() (bool, string) {
+	path := "/Default.aspx?page=dkmonhoc"
+
+	req, _ := http.NewRequest("GET", c.Host+path, nil)
+
+	if res, err := c.Http.Do(req); err != nil {
+		return false, "Registration is not ready 😢"
+	} else {
+		document, _ := goquery.NewDocumentFromReader(res.Body)
+
+		if document.Find("#ctl00_ContentPlaceHolder1_ctl00_lblThongBaoNgoaiTGDK").Text() == "" {
+			return true, "Registration is ready 😆"
+		}
+
+		return false, "Registration is not ready 😢"
+	}
+}
+
 func (c *Client) Register(id string) (bool, string) {
 	path := "/ajaxpro/EduSoft.Web.UC.DangKyMonHoc,EduSoft.Web.ashx"
 	payload, course := c.PayloadGenerator.RegistrationPayload(id)
@@ -85,7 +94,7 @@ func (c *Client) Register(id string) (bool, string) {
 		resBody, _ := io.ReadAll(res.Body)
 
 		if bytes.Contains(resBody, []byte(course)) {
-			return true, "Registered"
+			return true, "Registered 😆"
 		}
 
 		return false, "Register failed 😢"

client_test.go

@@ -58,33 +58,13 @@ var payloadGeneratorMock = PayloadGeneratorMock{}
 // Instance
 var client = Client{
 	Host:             "https://mock.com",
-	Session:          "session",
 	Http:             &httpMock,
 	PayloadGenerator: &payloadGeneratorMock,
 }
 
 // Cookie
 var jar, _ = cookiejar.New(nil)
 
-func TestCheckSession(t *testing.T) {
-	httpMock.On("GetClient").Return(&http.Client{Jar: jar})
-
-	assert.NotEmpty(t, client)
-
-	/* ============================= */
-	ok := client.CheckSession()
-
-	assert.True(t, ok)
-
-	// Delete session for the next tests
-	client.Session = ""
-
-	/* ============================= */
-	ok = client.CheckSession()
-
-	assert.False(t, ok)
-}
-
 func TestLogin(t *testing.T) {
 	payload := Payload{
 		Type: "xx",
@@ -95,19 +75,6 @@ func TestLogin(t *testing.T) {
 
 	assert.NotEmpty(t, client)
 
-	/* ============================= */
-	client.Session = "session"
-
-	httpMock.On("GetClient").Return(&http.Client{Jar: jar})
-
-	ok, _ := client.Login()
-
-	assert.True(t, ok)
-	httpMock.AssertNotCalled(t, "Do")
-
-	// Delete session for the next tests
-	client.Session = ""
-
 	/* ============================= */
 	httpMock.On("Do", mock.AnythingOfType("*http.Request")).Return(&http.Response{
 		StatusCode: 302,
@@ -116,7 +83,7 @@ func TestLogin(t *testing.T) {
 		},
 	}, nil).Once()
 
-	ok, _ = client.Login()
+	ok, _ := client.Login()
 
 	assert.True(t, ok)
 

main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bufio"
 	"os"
 	"runtime"
 	"strings"
@@ -12,17 +11,13 @@ import (
 
 func main() {
 	// Receive variables from CLI
-	id, password, host, session, careful, courseId := RunCLI()
+	id, password, host, careful, courseId := RunCLI()
 	registeredId := []string{}
 
 	// Careful mode will ignore this saved condition
 	// in the while loop below (always true).
 	saved := careful
 
-	// Read input from console
-	reader := bufio.NewReader(os.Stdin)
-	input := ""
-
 	// Init logger
 	logger := log.New(os.Stderr)
 
@@ -33,9 +28,8 @@ func main() {
 
 	// Client
 	client := Client{
-		Host:    host,
-		Session: session,
-		Http:    NewHttp(),
+		Host: host,
+		Http: NewHttp(),
 		PayloadGenerator: &PayloadGenerator{
 			credentials: Credentials{
 				ID:       id,
@@ -49,20 +43,23 @@ func main() {
 		if ok, message := client.Login(); ok {
 			logger.Info(message)
 
-			break
+			if isReady, isReadyMessage := client.IsReady(); isReady {
+				logger.Info(isReadyMessage)
+
+				break
+			} else {
+				logger.Warn(isReadyMessage)
+				logger.Warn("Logging in again...")
+
+				client.Reset()
+			}
 		} else {
 			logger.Warn(message)
 		}
 	}
 
-	// Wait for user accepting
-	for len(input) == 0 {
-		logger.Info("Press enter to continue")
-		input, _ = reader.ReadString('\n')
-	}
-
 	// Get student ID
-	// logger.Info(client.SayHi())
+	logger.Info(client.SayHi())
 
 	// If careful mode is enabled, `!saved`` condition is always false.
 	// Therefore, the condition to continue this while loop is

utils.go

@@ -95,22 +95,21 @@ func CreateRegistrationBody(id string) (*bytes.Buffer, string) {
 	return bytes.NewBuffer(byteBody), value[2]
 }
 
-func RunCLI() (string, string, string, string, bool, []string) {
+func RunCLI() (string, string, string, bool, []string) {
 	var courseId ArrayFlag
 	id := flag.String("u", "", "Student ID")
 	password := flag.String("p", "", "Password")
 	host := flag.String("d", "https://edusoftweb.hcmiu.edu.vn", "Domain name")
-	session := flag.String("s", "", "Session ID")
 	careful := flag.Bool("c", false, "Save after each selection")
 
 	flag.Var(&courseId, "i", "List of course IDs")
 	flag.Parse()
 
-	if (*id == "" || *password == "") && *session == "" {
+	if *id == "" || *password == "" {
 		fmt.Println("ID and Password are required!")
 
 		os.Exit(126)
 	}
 
-	return *id, *password, *host, *session, *careful, courseId
+	return *id, *password, *host, *careful, courseId
 }