reformat some stuff

auth/auth.go

@@ -0,0 +1,42 @@
+package auth
+
+import (
+	"fmt"
+	"strings"
+
+	"astraltech.xyz/calendar/v2/caldav"
+	ics "github.com/arran4/golang-ical"
+)
+
+func HandleAuthRequest(username string, password string) bool {
+	calDavData := caldav.GetCalDAVData(username, password)
+
+	fmt.Printf("Users display name: %s\n", calDavData.DisplayName)
+	fmt.Printf("Calandar Count: %d\n", len(calDavData.Calandars))
+	for i := range len(calDavData.Calandars) {
+		calDavData.Calandars[i] = caldav.GetCalendarData(calDavData.Calandars[i], username, password)
+
+		fmt.Printf("Cal %d is named %s\n", i, calDavData.Calandars[i].DisplayName)
+		fmt.Printf("\tLink to cal: %s\n", calDavData.Calandars[i].Link)
+		fmt.Printf("\tEvent count: %d\n", len(calDavData.Calandars[i].Events))
+		for j := range len(calDavData.Calandars[i].Events) {
+			cal, err := ics.ParseCalendar(strings.NewReader(calDavData.Calandars[i].Events[j].CalData))
+			if err != nil {
+				fmt.Print(err.Error())
+			}
+			events := cal.Events()
+			for k := range len(events) {
+				name := events[k].GetProperty(ics.ComponentProperty(ics.PropertySummary)).Value
+				start, _ := events[k].GetStartAt()
+				end, _ := events[k].GetEndAt()
+				time := end.Sub(start)
+				fmt.Printf("\t\tEvent name: %s\n", name)
+				fmt.Printf("\t\t\tEvent start date: %s\n", end.UTC().String())
+				fmt.Printf("\t\t\tEvent length date: %s\n", time.String())
+
+			}
+		}
+	}
+
+	return true
+}

auth/token.go

@@ -0,0 +1 @@
+package auth

caldav/dav_response.go

@@ -1,4 +1,4 @@
-package main
+package caldav
 
 type MultiStatus struct {
 	Responses []Response `xml:"response"`

caldav/dav_server.go

@@ -1,4 +1,4 @@
-package main
+package caldav
 
 import (
 	"encoding/xml"
@@ -21,9 +21,11 @@ const neededXML string = `
 	`
 
 var client *http.Client
+var serverURL string
 
-func init_dav_client() {
+func InitDavClient(url string) {
 	client = &http.Client{}
+	serverURL = url
 }
 
 type Event struct {
@@ -42,10 +44,10 @@ type SimpleCalDavData struct {
 }
 
 // this makes stalwart assumptions
-func get_caldav_data(username string, password string) SimpleCalDavData {
+func GetCalDAVData(username string, password string) SimpleCalDavData {
 	req, _ := http.NewRequest(
 		"PROPFIND",
-		serverConfig.URL+"/dav/cal/"+convert_username_into_url(username),
+		serverURL+"/dav/cal/"+convert_username_into_url(username),
 		strings.NewReader(neededXML),
 	)
 
@@ -78,7 +80,7 @@ func get_caldav_data(username string, password string) SimpleCalDavData {
 
 		var new_cal Calandar = Calandar{
 			DisplayName: davResp.Responses[i].PropStat[0].Prop.DisplayName,
-			Link:        serverConfig.URL + davResp.Responses[i].Href,
+			Link:        serverURL + davResp.Responses[i].Href,
 		}
 
 		calandars = append(calandars, new_cal)
@@ -107,7 +109,7 @@ const XML_cal string = `
 </C:calendar-query>
 `
 
-func get_calandar_data(cal Calandar, username string, password string) Calandar {
+func GetCalendarData(cal Calandar, username string, password string) Calandar {
 	req, _ := http.NewRequest(
 		"REPORT",
 		cal.Link,

caldav/helpers.go

@@ -1,4 +1,4 @@
-package main
+package caldav
 
 import "strings"
 

go.mod

@@ -2,4 +2,7 @@ module astraltech.xyz/calendar/v2
 
 go 1.26.1
 
-require github.com/arran4/golang-ical v0.3.5 // indirect
+require (
+	github.com/arran4/golang-ical v0.3.5 // indirect
+	golang.org/x/oauth2 v0.36.0 // indirect
+)

go.sum

@@ -1,2 +1,4 @@
 github.com/arran4/golang-ical v0.3.5 h1:bbz6ld4dC+MmCKiFfOd6SkmIGnhNMBACZ485ULh7p9A=
 github.com/arran4/golang-ical v0.3.5/go.mod h1:OnguFgjN0Hmx8jzpmWcC+AkHio94ujmLHKoaef7xQh8=
+golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
+golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=

main/main.go

@@ -1,53 +1,18 @@
 package main
 
 import (
-	"fmt"
-	"strings"
-
+	"astraltech.xyz/calendar/v2/auth"
+	"astraltech.xyz/calendar/v2/caldav"
 	"astraltech.xyz/calendar/v2/webserver"
-	ics "github.com/arran4/golang-ical"
 )
 
-func HandleAuthRequest(username string, password string) bool {
-	calDavData := get_caldav_data(username, password)
-
-	fmt.Printf("Users display name: %s\n", calDavData.DisplayName)
-	fmt.Printf("Calandar Count: %d\n", len(calDavData.Calandars))
-	for i := range len(calDavData.Calandars) {
-		calDavData.Calandars[i] = get_calandar_data(calDavData.Calandars[i], username, password)
-
-		fmt.Printf("Cal %d is named %s\n", i, calDavData.Calandars[i].DisplayName)
-		fmt.Printf("\tLink to cal: %s\n", calDavData.Calandars[i].Link)
-		fmt.Printf("\tEvent count: %d\n", len(calDavData.Calandars[i].Events))
-		for j := range len(calDavData.Calandars[i].Events) {
-			cal, err := ics.ParseCalendar(strings.NewReader(calDavData.Calandars[i].Events[j].CalData))
-			if err != nil {
-				fmt.Print(err.Error())
-			}
-			events := cal.Events()
-			for k := range len(events) {
-				name := events[k].GetProperty(ics.ComponentProperty(ics.PropertySummary)).Value
-				start, _ := events[k].GetStartAt()
-				end, _ := events[k].GetEndAt()
-				time := end.Sub(start)
-				fmt.Printf("\t\tEvent name: %s\n", name)
-				fmt.Printf("\t\t\tEvent start date: %s\n", end.UTC().String())
-				fmt.Printf("\t\t\tEvent length date: %s\n", time.String())
-
-			}
-		}
-	}
-
-	return true
-}
-
 func main() {
 	read_config()
-	init_dav_client()
+	caldav.InitDavClient(serverConfig.URL)
 
 	webserver.ServeLoginPage("/login", webserver.CustomizableLoginData{
 		ServiceName:         "Astral Calendar",
-		AuthRequestFunction: HandleAuthRequest,
+		AuthRequestFunction: auth.HandleAuthRequest,
 	})
 	webserver.EnableLogoRoute()
 	webserver.EnableStaticRoute()