Merge pull request #187 from beeper/highest/plat-37557

fix: more specific error message

Author: highesttt

pkg/connector/connector.go

@@ -204,11 +204,10 @@ func (ll *LineEmailLogin) SubmitUserInput(ctx context.Context, input map[string]
 }
 
 func (ll *LineEmailLogin) loginErrorStep(message string) *bridgev2.LoginStep {
-	instructions := fmt.Sprintf("Error when logging in: %s", message)
 	return &bridgev2.LoginStep{
 		Type:         bridgev2.LoginStepTypeUserInput,
 		StepID:       "dev.highest.matrix.line.enter_creds",
-		Instructions: instructions,
+		Instructions: loginErrorInstructions(message),
 		UserInputParams: &bridgev2.LoginUserInputParams{
 			Fields: []bridgev2.LoginInputDataField{
 				{
@@ -226,6 +225,17 @@ func (ll *LineEmailLogin) loginErrorStep(message string) *bridgev2.LoginStep {
 	}
 }
 
+func loginErrorInstructions(message string) string {
+	message = strings.TrimSpace(message)
+	if message == "" {
+		return "Could not log in to LINE. Please check your email and password and try again."
+	}
+	if strings.EqualFold(message, "Account ID or password is invalid") {
+		return "LINE rejected the email or password. Make sure you used the email from LINE Settings -> Account -> Email Address, then try again."
+	}
+	return fmt.Sprintf("Could not log in to LINE: %s", message)
+}
+
 func loginErrorReason(err error) string {
 	if err == nil {
 		return ""

pkg/line/password/password.go

@@ -1,6 +1,7 @@
 package password
 
 import (
+	"bytes"
 	"crypto/rand"
 	"crypto/rsa"
 	"encoding/hex"
@@ -11,7 +12,10 @@ import (
 // EncryptPassword constructs the payload and encrypts it using RSA-PKCS1v15.
 func EncryptPassword(email, password, sessionKey, nHex, eHex string) (string, error) {
 	// 1. Construct the payload: [len + val]...
-	payload := createPayload(email, password, sessionKey)
+	payload, err := createPayload(email, password, sessionKey)
+	if err != nil {
+		return "", fmt.Errorf("failed to create password payload: %w", err)
+	}
 
 	// 2. Parse Public Key from Hex
 	pubKey, err := parseRSAPublicKey(nHex, eHex)
@@ -20,7 +24,7 @@ func EncryptPassword(email, password, sessionKey, nHex, eHex string) (string, er
 	}
 
 	// 3. Encrypt using RSA-PKCS1-v1.5
-	encryptedBytes, err := rsa.EncryptPKCS1v15(rand.Reader, pubKey, []byte(payload))
+	encryptedBytes, err := rsa.EncryptPKCS1v15(rand.Reader, pubKey, payload)
 	if err != nil {
 		return "", fmt.Errorf("failed to encrypt payload: %w", err)
 	}
@@ -30,12 +34,16 @@ func EncryptPassword(email, password, sessionKey, nHex, eHex string) (string, er
 }
 
 // Format: [len(sessionKey) + sessionKey + len(email) + email + len(password) + password]
-func createPayload(email, password, sessionKey string) string {
-	return fmt.Sprintf("%c%s%c%s%c%s",
-		len(sessionKey), sessionKey,
-		len(email), email,
-		len(password), password,
-	)
+func createPayload(email, password, sessionKey string) ([]byte, error) {
+	var payload bytes.Buffer
+	for _, field := range []string{sessionKey, email, password} {
+		if len(field) > 255 {
+			return nil, fmt.Errorf("field is too long: %d bytes", len(field))
+		}
+		payload.WriteByte(byte(len(field)))
+		payload.WriteString(field)
+	}
+	return payload.Bytes(), nil
 }
 
 // parseRSAPublicKey converts hex modulus and exponent into *rsa.PublicKey.