diff --git a/appview/auth/auth.go b/appview/auth/auth.go index 8a2bd596..05d0e4b3 100644 --- a/appview/auth/auth.go +++ b/appview/auth/auth.go @@ -145,7 +145,7 @@ func (a *Auth) StoreSession(r *http.Request, w http.ResponseWriter, atSessionish clientSession.Values[appview.SessionPds] = pdsEndpoint clientSession.Values[appview.SessionAccessJwt] = atSessionish.GetAccessJwt() clientSession.Values[appview.SessionRefreshJwt] = atSessionish.GetRefreshJwt() - clientSession.Values[appview.SessionExpiry] = time.Now().Add(time.Hour).Format(appview.TimeLayout) + clientSession.Values[appview.SessionExpiry] = time.Now().Add(time.Hour).Format(time.RFC3339) clientSession.Values[appview.SessionAuthenticated] = true return clientSession.Save(r, w) } diff --git a/appview/consts.go b/appview/consts.go index 15d99021..594ec549 100644 --- a/appview/consts.go +++ b/appview/consts.go @@ -10,6 +10,5 @@ const ( SessionRefreshJwt = "refreshJwt" SessionExpiry = "expiry" SessionAuthenticated = "authenticated" - TimeLayout = "2006-01-02 15:04:05.999999999 -0700 MST" SqliteDbPath = "appview.db" ) diff --git a/appview/state/middleware.go b/appview/state/middleware.go index ddfe981a..daa3914f 100644 --- a/appview/state/middleware.go +++ b/appview/state/middleware.go @@ -28,7 +28,7 @@ func AuthMiddleware(s *State) Middleware { // refresh if nearing expiry // TODO: dedup with /login expiryStr := session.Values[appview.SessionExpiry].(string) - expiry, err := time.Parse(appview.TimeLayout, expiryStr) + expiry, err := time.Parse(time.RFC3339, expiryStr) if err != nil { log.Println("invalid expiry time", err) return diff --git a/appview/state/state.go b/appview/state/state.go index 60ef2b7b..f1d7102f 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -16,7 +16,6 @@ import ( lexutil "github.com/bluesky-social/indigo/lex/util" "github.com/gliderlabs/ssh" "github.com/go-chi/chi/v5" - "github.com/google/uuid" tangled "github.com/sotangled/tangled/api/tangled" "github.com/sotangled/tangled/appview" "github.com/sotangled/tangled/appview/auth"