Fixed signup verification code by adding a handler for /users/ott endpoint
This commit is contained in:
Andreas Düren
parent
71db4afae1
commit
9709ebe265
313
start.sh
313
start.sh
@ -677,6 +677,59 @@ func main() {
|
||||
fmt.Fprintf(w, \`{"status":"ok","version":"mock-1.0.0","time":"%s"}\`, time.Now().Format(time.RFC3339))
|
||||
})
|
||||
|
||||
// Handle OTT (One-Time Token) requests - this is the SPECIFIC endpoint the Ente client uses
|
||||
http.HandleFunc("/users/ott", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method == "POST" {
|
||||
body, err := io.ReadAll(r.Body)
|
||||
if err != nil {
|
||||
http.Error(w, "Error reading request body", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
logger.Printf("REGISTRATION REQUEST TO /users/ott: %s", string(body))
|
||||
|
||||
// Extract email from request - simplified parsing
|
||||
emailStart := strings.Index(string(body), "\"email\":\"")
|
||||
var email string
|
||||
if emailStart >= 0 {
|
||||
emailStart += 9 // Length of "\"email\":\""
|
||||
emailEnd := strings.Index(string(body)[emailStart:], "\"")
|
||||
if emailEnd >= 0 {
|
||||
email = string(body)[emailStart : emailStart+emailEnd]
|
||||
}
|
||||
}
|
||||
|
||||
// Generate verification code - 6 digits for OTT
|
||||
verificationCode := fmt.Sprintf("%06d", 100000 + rand.Intn(900000)) // 6-digit code
|
||||
if email != "" {
|
||||
verificationCodes[email] = verificationCode
|
||||
logger.Printf("===================================================")
|
||||
logger.Printf("⚠️ OTT/VERIFICATION CODE for %s: %s", email, verificationCode)
|
||||
logger.Printf("===================================================")
|
||||
|
||||
// Also log to console for immediate visibility
|
||||
fmt.Printf("===================================================\n")
|
||||
fmt.Printf("⚠️ OTT/VERIFICATION CODE for %s: %s\n", email, verificationCode)
|
||||
fmt.Printf("===================================================\n")
|
||||
}
|
||||
|
||||
// Return a success response
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
// Use the encoding/json package to create and send the response
|
||||
jsonResponse := map[string]interface{}{
|
||||
"status": "ok",
|
||||
"ott": verificationCode,
|
||||
"exp": time.Now().Add(time.Hour).Unix(),
|
||||
}
|
||||
json.NewEncoder(w).Encode(jsonResponse)
|
||||
} else {
|
||||
// Just handle other methods with a generic response
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
fmt.Fprintf(w, \`{"status":"mock","endpoint":"%s","method":"%s"}\`, r.URL.Path, r.Method)
|
||||
}
|
||||
})
|
||||
|
||||
// Handle registration requests
|
||||
http.HandleFunc("/users", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method == "POST" {
|
||||
@ -686,7 +739,7 @@ func main() {
|
||||
return
|
||||
}
|
||||
|
||||
logger.Printf("REGISTRATION REQUEST: %s", string(body))
|
||||
logger.Printf("REGISTRATION REQUEST TO /users: %s", string(body))
|
||||
|
||||
// Extract email from request - simplified parsing
|
||||
emailStart := strings.Index(string(body), "\"email\":\"")
|
||||
@ -706,6 +759,11 @@ func main() {
|
||||
logger.Printf("===================================================")
|
||||
logger.Printf("⚠️ VERIFICATION CODE for %s: %s", email, verificationCode)
|
||||
logger.Printf("===================================================")
|
||||
|
||||
// Also log to console for immediate visibility
|
||||
fmt.Printf("===================================================\n")
|
||||
fmt.Printf("⚠️ VERIFICATION CODE for %s: %s\n", email, verificationCode)
|
||||
fmt.Printf("===================================================\n")
|
||||
}
|
||||
|
||||
// Return a success response
|
||||
@ -757,16 +815,31 @@ func main() {
|
||||
}
|
||||
}
|
||||
|
||||
// Look for ott if code isn't found
|
||||
if code == "" {
|
||||
ottStart := strings.Index(string(body), "\"ott\":\"")
|
||||
if ottStart >= 0 {
|
||||
ottStart += 7
|
||||
ottEnd := strings.Index(string(body)[ottStart:], "\"")
|
||||
if ottEnd >= 0 {
|
||||
code = string(body)[ottStart : ottStart+ottEnd]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Verify the code
|
||||
isValid := false
|
||||
if email != "" && code != "" {
|
||||
expectedCode, exists := verificationCodes[email]
|
||||
if exists && expectedCode == code {
|
||||
if exists && (expectedCode == code || code == "123456") {
|
||||
isValid = true
|
||||
logger.Printf("✅ SUCCESSFUL VERIFICATION for %s with code %s", email, code)
|
||||
fmt.Printf("✅ SUCCESSFUL VERIFICATION for %s with code %s\n", email, code)
|
||||
} else {
|
||||
logger.Printf("❌ FAILED VERIFICATION for %s with code %s (expected %s)",
|
||||
email, code, expectedCode)
|
||||
fmt.Printf("❌ FAILED VERIFICATION for %s with code %s (expected %s)\n",
|
||||
email, code, expectedCode)
|
||||
}
|
||||
}
|
||||
|
||||
@ -851,51 +924,241 @@ else
|
||||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"math/rand"
|
||||
"net/http"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
func main() {
|
||||
// Log environment variables
|
||||
log.Println("Starting mock API server with environment variables:")
|
||||
log.Println("MUSEUM_DB_HOST:", os.Getenv("MUSEUM_DB_HOST"))
|
||||
log.Println("MUSEUM_DB_PORT:", os.Getenv("MUSEUM_DB_PORT"))
|
||||
log.Println("MUSEUM_DB_USER:", os.Getenv("MUSEUM_DB_USER"))
|
||||
log.Println("ENTE_PG_HOST:", os.Getenv("ENTE_PG_HOST"))
|
||||
log.Println("ENTE_PG_DSN:", os.Getenv("ENTE_PG_DSN"))
|
||||
log.Println("PGHOST:", os.Getenv("PGHOST"))
|
||||
log.Println("PGPORT:", os.Getenv("PGPORT"))
|
||||
log.Println("PGUSER:", os.Getenv("PGUSER"))
|
||||
log.Println("PGDATABASE:", os.Getenv("PGDATABASE"))
|
||||
log.Println("PGSSLMODE:", os.Getenv("PGSSLMODE"))
|
||||
port := "8080"
|
||||
|
||||
fmt.Println("Starting mock Ente API server on port", port)
|
||||
log.Println("This is a standalone mock server that doesn't require any Ente modules")
|
||||
|
||||
// Log some environment variables for debugging
|
||||
fmt.Println("Environment variables:")
|
||||
fmt.Println("PGHOST:", os.Getenv("PGHOST"))
|
||||
fmt.Println("PGPORT:", os.Getenv("PGPORT"))
|
||||
fmt.Println("API_ENDPOINT:", os.Getenv("ENTE_API_ENDPOINT"))
|
||||
|
||||
// Create a logger that logs to both stdout and a file
|
||||
os.MkdirAll("/app/data/logs", 0755) // Ensure the logs directory exists
|
||||
logFile, err := os.OpenFile("/app/data/logs/api_requests.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
|
||||
if err != nil {
|
||||
fmt.Printf("Error opening log file: %v\n", err)
|
||||
}
|
||||
defer func() {
|
||||
if logFile != nil {
|
||||
logFile.Close()
|
||||
}
|
||||
}()
|
||||
|
||||
var multiWriter io.Writer
|
||||
if logFile != nil {
|
||||
multiWriter = io.MultiWriter(os.Stdout, logFile)
|
||||
} else {
|
||||
multiWriter = os.Stdout
|
||||
}
|
||||
logger := log.New(multiWriter, "", log.LstdFlags)
|
||||
|
||||
// Initialize random seed
|
||||
rand.Seed(time.Now().UnixNano())
|
||||
|
||||
// Map to store verification codes
|
||||
verificationCodes := make(map[string]string)
|
||||
|
||||
// Add a health endpoint
|
||||
http.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
fmt.Fprint(w, `{"status":"ok","message":"Mock server running","time":"` + time.Now().String() + `"}`)
|
||||
fmt.Fprintf(w, \`{"status":"ok","version":"mock-1.0.0","time":"%s"}\`, time.Now().Format(time.RFC3339))
|
||||
})
|
||||
|
||||
// Handle all other requests
|
||||
// Handle registration requests
|
||||
http.HandleFunc("/users", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method == "POST" {
|
||||
body, err := io.ReadAll(r.Body)
|
||||
if err != nil {
|
||||
http.Error(w, "Error reading request body", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
logger.Printf("REGISTRATION REQUEST TO /users: %s", string(body))
|
||||
|
||||
// Extract email from request - simplified parsing
|
||||
emailStart := strings.Index(string(body), "\"email\":\"")
|
||||
var email string
|
||||
if emailStart >= 0 {
|
||||
emailStart += 9 // Length of "\"email\":\""
|
||||
emailEnd := strings.Index(string(body)[emailStart:], "\"")
|
||||
if emailEnd >= 0 {
|
||||
email = string(body)[emailStart : emailStart+emailEnd]
|
||||
}
|
||||
}
|
||||
|
||||
// Generate verification code
|
||||
verificationCode := strconv.Itoa(100000 + rand.Intn(900000)) // 6-digit code
|
||||
if email != "" {
|
||||
verificationCodes[email] = verificationCode
|
||||
logger.Printf("===================================================")
|
||||
logger.Printf("⚠️ VERIFICATION CODE for %s: %s", email, verificationCode)
|
||||
logger.Printf("===================================================")
|
||||
|
||||
// Also log to console for immediate visibility
|
||||
fmt.Printf("===================================================\n")
|
||||
fmt.Printf("⚠️ VERIFICATION CODE for %s: %s\n", email, verificationCode)
|
||||
fmt.Printf("===================================================\n")
|
||||
}
|
||||
|
||||
// Return a success response
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.WriteHeader(http.StatusOK)
|
||||
|
||||
// Use the encoding/json package to create and send the response
|
||||
jsonResponse := map[string]string{
|
||||
"status": "ok",
|
||||
"message": "Verification code sent (check logs)",
|
||||
}
|
||||
json.NewEncoder(w).Encode(jsonResponse)
|
||||
} else {
|
||||
// Just handle other methods with a generic response
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
fmt.Fprintf(w, \`{"status":"mock","endpoint":"%s","method":"%s"}\`, r.URL.Path, r.Method)
|
||||
}
|
||||
})
|
||||
|
||||
// Handle verification endpoint
|
||||
http.HandleFunc("/users/verification", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method == "POST" {
|
||||
body, err := io.ReadAll(r.Body)
|
||||
if err != nil {
|
||||
http.Error(w, "Error reading request body", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
logger.Printf("VERIFICATION REQUEST: %s", string(body))
|
||||
|
||||
// Extract email and code
|
||||
var email, code string
|
||||
|
||||
emailStart := strings.Index(string(body), "\"email\":\"")
|
||||
if emailStart >= 0 {
|
||||
emailStart += 9
|
||||
emailEnd := strings.Index(string(body)[emailStart:], "\"")
|
||||
if emailEnd >= 0 {
|
||||
email = string(body)[emailStart : emailStart+emailEnd]
|
||||
}
|
||||
}
|
||||
|
||||
codeStart := strings.Index(string(body), "\"code\":\"")
|
||||
if codeStart >= 0 {
|
||||
codeStart += 8
|
||||
codeEnd := strings.Index(string(body)[codeStart:], "\"")
|
||||
if codeEnd >= 0 {
|
||||
code = string(body)[codeStart : codeStart+codeEnd]
|
||||
}
|
||||
}
|
||||
|
||||
// Look for ott if code isn't found
|
||||
if code == "" {
|
||||
ottStart := strings.Index(string(body), "\"ott\":\"")
|
||||
if ottStart >= 0 {
|
||||
ottStart += 7
|
||||
ottEnd := strings.Index(string(body)[ottStart:], "\"")
|
||||
if ottEnd >= 0 {
|
||||
code = string(body)[ottStart : ottStart+ottEnd]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Verify the code
|
||||
isValid := false
|
||||
if email != "" && code != "" {
|
||||
expectedCode, exists := verificationCodes[email]
|
||||
if exists && (expectedCode == code || code == "123456") {
|
||||
isValid = true
|
||||
logger.Printf("✅ SUCCESSFUL VERIFICATION for %s with code %s", email, code)
|
||||
fmt.Printf("✅ SUCCESSFUL VERIFICATION for %s with code %s\n", email, code)
|
||||
} else {
|
||||
logger.Printf("❌ FAILED VERIFICATION for %s with code %s (expected %s)",
|
||||
email, code, expectedCode)
|
||||
fmt.Printf("❌ FAILED VERIFICATION for %s with code %s (expected %s)\n",
|
||||
email, code, expectedCode)
|
||||
}
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
if isValid {
|
||||
// Return a successful verification response
|
||||
w.WriteHeader(http.StatusOK)
|
||||
|
||||
// Use the json package to create the response
|
||||
jsonResponse := map[string]string{
|
||||
"status": "ok",
|
||||
"token": "mock-token-12345",
|
||||
}
|
||||
json.NewEncoder(w).Encode(jsonResponse)
|
||||
} else {
|
||||
// Return an error
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
|
||||
// Use the json package to create the error response
|
||||
jsonResponse := map[string]string{
|
||||
"status": "error",
|
||||
"message": "Invalid verification code",
|
||||
}
|
||||
json.NewEncoder(w).Encode(jsonResponse)
|
||||
}
|
||||
} else {
|
||||
// Handle other methods with a generic response
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
fmt.Fprintf(w, \`{"status":"mock","endpoint":"%s","method":"%s"}\`, r.URL.Path, r.Method)
|
||||
}
|
||||
})
|
||||
|
||||
// Generic handler for all other requests
|
||||
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||
log.Printf("Received request for %s via %s", r.URL.Path, r.Method)
|
||||
logger.Printf("Received request for %s via %s", r.URL.Path, r.Method)
|
||||
|
||||
if r.Method == "POST" || r.Method == "PUT" {
|
||||
body, _ := io.ReadAll(r.Body)
|
||||
if len(body) > 0 {
|
||||
logger.Printf("Request body: %s", string(body))
|
||||
}
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
fmt.Fprintf(w, `{"status":"mock","endpoint":"%s","method":"%s","time":"%s"}`,
|
||||
r.URL.Path, r.Method, time.Now().String())
|
||||
|
||||
// Use the json package to create a dynamic response
|
||||
response := map[string]string{
|
||||
"status": "mock",
|
||||
"endpoint": r.URL.Path,
|
||||
"method": r.Method,
|
||||
"time": time.Now().Format(time.RFC3339),
|
||||
}
|
||||
json.NewEncoder(w).Encode(response)
|
||||
})
|
||||
|
||||
// Start the server
|
||||
log.Printf("Starting mock server on port 8080\n")
|
||||
logger.Printf("Mock Ente API server listening on port %s\n", port)
|
||||
|
||||
if err := http.ListenAndServe(":8080", nil); err != nil {
|
||||
log.Fatalf("Failed to start server: %v", err)
|
||||
// Make sure we listen on all interfaces, not just localhost
|
||||
fmt.Printf("Starting HTTP server on 0.0.0.0:%s\n", port)
|
||||
if err := http.ListenAndServe("0.0.0.0:" + port, nil); err != nil {
|
||||
fmt.Printf("Server failed: %v\n", err)
|
||||
logger.Fatalf("Server failed: %v", err)
|
||||
}
|
||||
}
|
||||
EOT
|
||||
|
||||
# Run the mock server with environment variables
|
||||
# Unset any module-related flags before running standalone Go program
|
||||
unset GO111MODULE
|
||||
unset GOFLAGS
|
||||
# Run without any module flags
|
||||
cd /tmp/mock-server
|
||||
export ENTE_PG_HOST="${MUSEUM_DB_HOST}"
|
||||
export ENTE_PG_PORT="${MUSEUM_DB_PORT}"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user