From 38e68a215b67a736c25690d1b91cdc741767064b Mon Sep 17 00:00:00 2001 From: Sameet Sapra Date: Sun, 12 Feb 2017 09:59:19 -0600 Subject: [PATCH 1/3] Get login flow working --- services/members.go | 97 +++++++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 43 deletions(-) diff --git a/services/members.go b/services/members.go index b58d575..d0ee2d1 100644 --- a/services/members.go +++ b/services/members.go @@ -1,8 +1,8 @@ /** * Copyright © 2017, ACM@UIUC * -* This file is part of the Groot Project. -* +* This file is part of the Groot Project. +* * The Groot Project is open source software, released under the University of * Illinois/NCSA Open Source License. You should have received a copy of * this license in a file with the distribution. @@ -12,6 +12,7 @@ package services import ( "net/http" + "github.com/acm-uiuc/groot/proxy" ) @@ -23,42 +24,48 @@ const MembersFormat string = "JSON" //API Interface var MembersRoutes = RouteCollection{ - Route{ - "PreMembers", - "POST", - "/users/pre", - PreMembers, - }, - Route{ - "CurrentMembers", - "POST", - "/users/current", - CurrentMembers, - }, - Route{ - "MemberInfo", - "POST", - "/users/{netid}", - MemberInfo, - }, - Route{ - "IsMember", - "POST", - "/users/{netid}/isMember", - IsMember, - }, - Route{ - "NewMember", - "POST", - "/users/newUser", - NewMember, - }, - Route{ - "ConfirmMember", - "POST", - "/users/paid", - ConfirmMember, - }, + Route{ + "PreMembers", + "POST", + "/users/pre", + PreMembers, + }, + Route{ + "CurrentMembers", + "POST", + "/users/current", + CurrentMembers, + }, + Route{ + "MemberInfo", + "POST", + "/users/{netid}", + MemberInfo, + }, + Route{ + "IsMember", + "POST", + "/users/{netid}/isMember", + IsMember, + }, + Route{ + "NewMember", + "POST", + "/users/newUser", + NewMember, + }, + Route{ + "ConfirmMember", + "POST", + "/users/paid", + ConfirmMember, + }, + Route{ + "UsersLogin", + "POST", + "/users/login", + UsersLogin, + }, } //Route handler @@ -67,21 +74,25 @@ func PreMembers(w http.ResponseWriter, r *http.Request) { } func CurrentMembers(w http.ResponseWriter, r *http.Request) { - proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) + proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) } func MemberInfo(w http.ResponseWriter, r *http.Request) { - proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) + proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) } func IsMember(w http.ResponseWriter, r *http.Request) { - proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) + proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) } func NewMember(w http.ResponseWriter, r *http.Request) { - proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) + proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) } func ConfirmMember(w http.ResponseWriter, r *http.Request) { - proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) + proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) +} + +func UsersLogin(w http.ResponseWriter, r *http.Request) { + proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) } From d17865055a073353aecc0c0f7953b08ce43d2ea6 Mon Sep 17 00:00:00 2001 From: Sameet Sapra Date: Sun, 12 Feb 2017 14:23:05 -0600 Subject: [PATCH 2/3] Rename members to users to reflect service name --- services/services.go | 6 +-- services/{members.go => users.go} | 72 +++++++++++++++---------------- 2 files changed, 39 insertions(+), 39 deletions(-) rename services/{members.go => users.go} (50%) diff --git a/services/services.go b/services/services.go index 0c08b9c..5e0a0f0 100644 --- a/services/services.go +++ b/services/services.go @@ -1,8 +1,8 @@ /** * Copyright © 2017, ACM@UIUC * -* This file is part of the Groot Project. -* +* This file is part of the Groot Project. +* * The Groot Project is open source software, released under the University of * Illinois/NCSA Open Source License. You should have received a copy of * this license in a file with the distribution. @@ -40,7 +40,7 @@ func Index(w http.ResponseWriter, r *http.Request) { func RegisterAPIs() { Routes = append(Routes, AuthRoutes...) Routes = append(Routes, GroupsRoutes...) - Routes = append(Routes, MembersRoutes...) + Routes = append(Routes, UsersRoutes...) Routes = append(Routes, QuotesRoutes...) Routes = append(Routes, RecruitersRoutes...) Routes = append(Routes, HardwareRoutes...) diff --git a/services/members.go b/services/users.go similarity index 50% rename from services/members.go rename to services/users.go index d0ee2d1..f8d3861 100644 --- a/services/members.go +++ b/services/users.go @@ -17,30 +17,18 @@ import ( ) //Location -const MembersURL string = "http://localhost:8001" +const UsersURL string = "http://localhost:8001" //Service Data Type -const MembersFormat string = "JSON" +const UsersFormat string = "JSON" //API Interface -var MembersRoutes = RouteCollection{ +var UsersRoutes = RouteCollection{ Route{ - "PreMembers", - "POST", - "/users/pre", - PreMembers, - }, - Route{ - "CurrentMembers", - "POST", - "/users/current", - CurrentMembers, - }, - Route{ - "MemberInfo", - "POST", - "/users/{netid}", - MemberInfo, + "GetUsers", + "GET", + "/users", + GetUsers, }, Route{ "IsMember", @@ -51,48 +39,60 @@ var MembersRoutes = RouteCollection{ Route{ "NewMember", "POST", - "/users/newUser", + "/users", NewMember, }, Route{ "ConfirmMember", - "POST", - "/users/paid", + "PUT", + "/users/{user_id}/paid", ConfirmMember, }, + Route{ + "DeleteMember", + "DELETE", + "/users/{user_id}", + DeleteMember, + }, Route{ "UsersLogin", "POST", "/users/login", UsersLogin, }, + Route{ + "UsersLogout", + "POST", + "/users/logout", + UsersLogout, + }, } //Route handler -func PreMembers(w http.ResponseWriter, r *http.Request) { - proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) -} - -func CurrentMembers(w http.ResponseWriter, r *http.Request) { - proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) -} - -func MemberInfo(w http.ResponseWriter, r *http.Request) { - proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) +func GetUsers(w http.ResponseWriter, r *http.Request) { + proxy.GET(w, UsersURL+r.URL.String(), UsersFormat, "", r) } func IsMember(w http.ResponseWriter, r *http.Request) { - proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) + proxy.POST(w, UsersURL+r.URL.String(), UsersFormat, "", r) } func NewMember(w http.ResponseWriter, r *http.Request) { - proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) + proxy.POST(w, UsersURL+r.URL.String(), UsersFormat, "", r) } func ConfirmMember(w http.ResponseWriter, r *http.Request) { - proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) + proxy.PUT(w, UsersURL+r.URL.String(), UsersFormat, "", r) +} + +func DeleteMember(w http.ResponseWriter, r *http.Request) { + proxy.DELETE(w, UsersURL+r.URL.String(), UsersFormat, "", r) } func UsersLogin(w http.ResponseWriter, r *http.Request) { - proxy.POST(w, MembersURL+r.URL.String(), MembersFormat, "", r) + proxy.POST(w, UsersURL+r.URL.String(), UsersFormat, "", r) +} + +func UsersLogout(w http.ResponseWriter, r *http.Request) { + proxy.POST(w, UsersURL+r.URL.String(), UsersFormat, "", r) } From 2bd066380517104d403f3128fa9ca372ef820fac Mon Sep 17 00:00:00 2001 From: Sameet Sapra Date: Sun, 12 Feb 2017 22:03:31 -0600 Subject: [PATCH 3/3] Update year --- LICENSE | 2 +- services/users.go | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/LICENSE b/LICENSE index a5a0dcd..dc43b1f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ University of Illinois/NCSA Open Source License -Copyright (c) 2016 ACM@UIUC +Copyright (c) 2017 ACM@UIUC All rights reserved. Developed by: Groot Development Team diff --git a/services/users.go b/services/users.go index f8d3861..b524b42 100644 --- a/services/users.go +++ b/services/users.go @@ -31,28 +31,28 @@ var UsersRoutes = RouteCollection{ GetUsers, }, Route{ - "IsMember", + "IsUser", "POST", - "/users/{netid}/isMember", - IsMember, + "/users/{netid}/isUser", + IsUser, }, Route{ - "NewMember", + "NewUser", "POST", "/users", - NewMember, + NewUser, }, Route{ - "ConfirmMember", + "ConfirmUser", "PUT", "/users/{user_id}/paid", - ConfirmMember, + ConfirmUser, }, Route{ - "DeleteMember", + "DeleteUser", "DELETE", "/users/{user_id}", - DeleteMember, + DeleteUser, }, Route{ "UsersLogin", @@ -73,19 +73,19 @@ func GetUsers(w http.ResponseWriter, r *http.Request) { proxy.GET(w, UsersURL+r.URL.String(), UsersFormat, "", r) } -func IsMember(w http.ResponseWriter, r *http.Request) { +func IsUser(w http.ResponseWriter, r *http.Request) { proxy.POST(w, UsersURL+r.URL.String(), UsersFormat, "", r) } -func NewMember(w http.ResponseWriter, r *http.Request) { +func NewUser(w http.ResponseWriter, r *http.Request) { proxy.POST(w, UsersURL+r.URL.String(), UsersFormat, "", r) } -func ConfirmMember(w http.ResponseWriter, r *http.Request) { +func ConfirmUser(w http.ResponseWriter, r *http.Request) { proxy.PUT(w, UsersURL+r.URL.String(), UsersFormat, "", r) } -func DeleteMember(w http.ResponseWriter, r *http.Request) { +func DeleteUser(w http.ResponseWriter, r *http.Request) { proxy.DELETE(w, UsersURL+r.URL.String(), UsersFormat, "", r) }