first working login and editing of file. bugg is för rendering with tiptap
This commit is contained in:
@@ -285,21 +285,27 @@ func (s *Server) handleServerDirectories(w http.ResponseWriter, req gqlRequest,
|
||||
// ── Session helpers ───────────────────────────────────────────────────────────
|
||||
|
||||
func (s *Server) sessionFromRequest(r *http.Request) *auth.Session {
|
||||
raw := r.Header.Get("Authorization")
|
||||
if !strings.HasPrefix(raw, "Bearer ") {
|
||||
return nil
|
||||
}
|
||||
token := strings.TrimPrefix(raw, "Bearer ")
|
||||
raw := r.Header.Get("Authorization")
|
||||
if !strings.HasPrefix(raw, "Bearer ") {
|
||||
log.Printf("[auth] No Bearer token found in header")
|
||||
return nil
|
||||
}
|
||||
token := strings.TrimPrefix(raw, "Bearer ")
|
||||
|
||||
s.mu.RLock()
|
||||
mgr := s.authMgr
|
||||
s.mu.RUnlock()
|
||||
s.mu.RLock()
|
||||
mgr := s.authMgr
|
||||
s.mu.RUnlock()
|
||||
|
||||
if mgr == nil {
|
||||
return nil
|
||||
}
|
||||
sess, _ := mgr.Validate(token)
|
||||
return sess
|
||||
if mgr == nil {
|
||||
log.Printf("[auth] authmgr is nil")
|
||||
return nil
|
||||
}
|
||||
sess, err := mgr.Validate(token)
|
||||
if err != nil {
|
||||
log.Printf("[auth] Token validation failed: %v", err)
|
||||
return nil
|
||||
}
|
||||
return sess
|
||||
}
|
||||
|
||||
// ── Document handlers ─────────────────────────────────────────────────────────
|
||||
@@ -514,16 +520,12 @@ func (s *Server) handleLogin(w http.ResponseWriter, req gqlRequest) {
|
||||
return
|
||||
}
|
||||
|
||||
log.Printf("[auth] login: %s (%s)", username, role)
|
||||
writeJSONObj(w, map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"login": map[string]interface{}{
|
||||
"token": token,
|
||||
"username": username,
|
||||
"role": role,
|
||||
},
|
||||
},
|
||||
})
|
||||
log.Printf("[auth] login: %s (%s)", username, role)
|
||||
writeJSONObj(w, map[string]interface{}{
|
||||
"data": map[string]interface{}{
|
||||
"login": token,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Server) handleLogout(w http.ResponseWriter, sess *auth.Session) {
|
||||
@@ -1213,3 +1215,5 @@ func (s *Server) handleDocumentAtCommit(w http.ResponseWriter, req gqlRequest, s
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user