Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Current user #36

Merged
merged 14 commits into from
Jul 26, 2024
Merged

Current user #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
34faa7e
Changed database CRUD to grab user info from session
APandamonium1 Jul 11, 2024
6849fc5
Changed adminHandler.go to grab user from session
APandamonium1 Jul 11, 2024
459ee5a
missed out on changing delete instructor
APandamonium1 Jul 12, 2024
f9872e1
test
APandamonium1 Jul 24, 2024
6bbbdc8
added tests to get current user + session
APandamonium1 Jul 24, 2024
d48788c
typo in createAnnouncement
APandamonium1 Jul 25, 2024
2c98069
Changed database to use getCurrrentUser function, tested successfully
APandamonium1 Jul 26, 2024
8f932a2
Merge branch 'main' into current-user
APandamonium1 Jul 26, 2024
6a24b84
correcting errors made during resolving merge conflicts
APandamonium1 Jul 26, 2024
186b709
test
APandamonium1 Jul 26, 2024
a8f70d5
TEST
APandamonium1 Jul 26, 2024
aab307b
test again
APandamonium1 Jul 26, 2024
e157b5c
test again 2
APandamonium1 Jul 26, 2024
40e2c7d
.
APandamonium1 Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/example.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

env:
DATABASE_URL: ${{secrets.DATABASE_URL}}
COOKIESTORE: ${{secrets.COOKIESTORE}}
# FIREBASE_ADMIN_PASSPHRASE: ${{secrets.FIREBASE_ADMIN_PASSPHRASE}}

jobs:
Expand Down
70 changes: 29 additions & 41 deletions adminHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,7 @@ func AdminHandler(router *mux.Router) {
vars := mux.Vars(req)
googleID := vars["googleID"]

currentUser, err := GetCurrentUser(req)
if err != nil {
http.Error(res, err.Error(), http.StatusInternalServerError)
return
}

student, err := readStudent(currentUser, googleID)
student, err := readStudent(googleID, req)
if err != nil {
http.Error(res, err.Error(), http.StatusInternalServerError)
return
Expand All @@ -67,15 +61,9 @@ func AdminHandler(router *mux.Router) {
vars := mux.Vars(req)
googleID := vars["googleID"]

currentUser, err := GetCurrentUser(req)
if err != nil {
http.Error(res, err.Error(), http.StatusInternalServerError)
return
}

switch req.Method {
case http.MethodGet:
student, err := readStudent(currentUser, googleID)
student, err := readStudent(googleID, req)
if err != nil {
http.Error(res, err.Error(), http.StatusInternalServerError)
return
Expand All @@ -88,7 +76,7 @@ func AdminHandler(router *mux.Router) {
http.Error(res, err.Error(), http.StatusBadRequest)
return
}
if err := updateStudent(currentUser, googleID, updates); err != nil {
if err := updateStudent(googleID, updates, req); err != nil {
http.Error(res, err.Error(), http.StatusInternalServerError)
return
}
Expand Down Expand Up @@ -120,13 +108,13 @@ func AdminHandler(router *mux.Router) {
vars := mux.Vars(req)
googleID := vars["googleID"]

currentUser, err := GetCurrentUser(req)
if err != nil {
http.Error(res, "Unauthorized", http.StatusUnauthorized)
return
}
// currentUser, err := GetCurrentUser(req)
// if err != nil {
// http.Error(res, "Unauthorized", http.StatusUnauthorized)
// return
// }

parent, err := readParent(currentUser, googleID)
parent, err := readParent(googleID, req)
if err != nil {
http.Error(res, err.Error(), http.StatusInternalServerError)
return
Expand All @@ -144,15 +132,15 @@ func AdminHandler(router *mux.Router) {
vars := mux.Vars(req)
googleID := vars["googleID"]

currentUser, err := GetCurrentUser(req)
if err != nil {
http.Error(res, "Unauthorized", http.StatusUnauthorized)
return
}
// currentUser, err := GetCurrentUser(req)
// if err != nil {
// http.Error(res, "Unauthorized", http.StatusUnauthorized)
// return
// }

switch req.Method {
case http.MethodGet:
parent, err := readParent(currentUser, googleID)
parent, err := readParent(googleID, req)
if err != nil {
http.Error(res, err.Error(), http.StatusInternalServerError)
return
Expand All @@ -165,7 +153,7 @@ func AdminHandler(router *mux.Router) {
http.Error(res, err.Error(), http.StatusBadRequest)
return
}
if err := updateParent(currentUser, googleID, updates); err != nil {
if err := updateParent(googleID, updates, req); err != nil {
http.Error(res, err.Error(), http.StatusInternalServerError)
return
}
Expand Down Expand Up @@ -197,13 +185,13 @@ func AdminHandler(router *mux.Router) {
vars := mux.Vars(req)
googleID := vars["googleID"]

currentUser, err := GetCurrentUser(req)
if err != nil {
http.Error(res, "Unauthorized", http.StatusUnauthorized)
return
}
// currentUser, err := GetCurrentUser(req)
// if err != nil {
// http.Error(res, "Unauthorized", http.StatusUnauthorized)
// return
// }

instructor, err := readInstructor(currentUser, googleID)
instructor, err := readInstructor(googleID, req)
if err != nil {
http.Error(res, err.Error(), http.StatusInternalServerError)
return
Expand All @@ -221,15 +209,15 @@ func AdminHandler(router *mux.Router) {
vars := mux.Vars(req)
googleID := vars["googleID"]

currentUser, err := GetCurrentUser(req)
if err != nil {
http.Error(res, "Unauthorized", http.StatusUnauthorized)
return
}
// currentUser, err := GetCurrentUser(req)
// if err != nil {
// http.Error(res, "Unauthorized", http.StatusUnauthorized)
// return
// }

switch req.Method {
case http.MethodGet:
instructor, err := readInstructor(currentUser, googleID)
instructor, err := readInstructor(googleID, req)
if err != nil {
http.Error(res, err.Error(), http.StatusInternalServerError)
return
Expand All @@ -242,7 +230,7 @@ func AdminHandler(router *mux.Router) {
http.Error(res, err.Error(), http.StatusBadRequest)
return
}
if err := updateInstructor(currentUser, googleID, updates); err != nil {
if err := updateInstructor(googleID, updates, req); err != nil {
http.Error(res, err.Error(), http.StatusInternalServerError)
return
}
Expand Down
Loading
Loading