From 53a9b1ea2ef49799e29804cfc669affb4cecf3e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Jedy=C5=84ski?= Date: Sat, 25 Aug 2018 06:50:28 +0200 Subject: [PATCH 1/5] v1 of userService and models --- .idea/caches/build_file_checksums.ser | Bin 537 -> 540 bytes .../findmytutor/model/IsUsingListBool.java | 20 +++ .../wmi/findmytutor/model/PagedResult.java | 87 ++++++++++ .../com/uam/wmi/findmytutor/model/Result.java | 163 +++++++++++++++++ .../wmi/findmytutor/model/StudentIdModel.java | 31 ++++ .../com/uam/wmi/findmytutor/model/User.java | 164 ++++++++++++++++++ .../wmi/findmytutor/service/UserService.java | 75 ++++++++ build.gradle | 2 +- 8 files changed, 541 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/com/uam/wmi/findmytutor/model/IsUsingListBool.java create mode 100644 app/src/main/java/com/uam/wmi/findmytutor/model/PagedResult.java create mode 100644 app/src/main/java/com/uam/wmi/findmytutor/model/Result.java create mode 100644 app/src/main/java/com/uam/wmi/findmytutor/model/StudentIdModel.java create mode 100644 app/src/main/java/com/uam/wmi/findmytutor/model/User.java create mode 100644 app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 0349eb789b5963e54a80a5c2d6dc8162ad8c714f..f7feae91852b188555d60a2737ba5b7286cc2c32 100644 GIT binary patch delta 90 zcmV-g0Hyz#1e^qrm;`9NfWncSwGt~sI$TwAWpZ;|ZDDe1Wn?ijlePgilTiT|5Yh{i w7N#CD$|K`wyN_am1gFo=%p7WrsSlS7BbW^urV+&2o#hrDvq|8@~Yr# zqD)h0sOjVbjIvtmC9>oqzVOz)`uJPtA7`gj34?~SRZM7cYEf}aUTS_$ehk!{n8_a) Or6;#D3Qc~`s0#o{=PG^x diff --git a/app/src/main/java/com/uam/wmi/findmytutor/model/IsUsingListBool.java b/app/src/main/java/com/uam/wmi/findmytutor/model/IsUsingListBool.java new file mode 100644 index 0000000..e11d6ac --- /dev/null +++ b/app/src/main/java/com/uam/wmi/findmytutor/model/IsUsingListBool.java @@ -0,0 +1,20 @@ +package com.uam.wmi.findmytutor.model; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +public class IsUsingListBool { + + @SerializedName("isUsing") + @Expose + private Boolean isUsing; + + public Boolean getIsUsing() { + return isUsing; + } + + public void setIsUsing(Boolean isUsing) { + this.isUsing = isUsing; + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/uam/wmi/findmytutor/model/PagedResult.java b/app/src/main/java/com/uam/wmi/findmytutor/model/PagedResult.java new file mode 100644 index 0000000..9e7ad33 --- /dev/null +++ b/app/src/main/java/com/uam/wmi/findmytutor/model/PagedResult.java @@ -0,0 +1,87 @@ +package com.uam.wmi.findmytutor.model; + +import java.util.List; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +public class PagedResult { + + @SerializedName("results") + @Expose + private List results = null; + @SerializedName("currentPage") + @Expose + private Integer currentPage; + @SerializedName("pageCount") + @Expose + private Integer pageCount; + @SerializedName("pageSize") + @Expose + private Integer pageSize; + @SerializedName("rowCount") + @Expose + private Integer rowCount; + @SerializedName("firstRowOnPage") + @Expose + private Integer firstRowOnPage; + @SerializedName("lastRowOnPage") + @Expose + private Integer lastRowOnPage; + + public List getResults() { + return results; + } + + public void setResults(List results) { + this.results = results; + } + + public Integer getCurrentPage() { + return currentPage; + } + + public void setCurrentPage(Integer currentPage) { + this.currentPage = currentPage; + } + + public Integer getPageCount() { + return pageCount; + } + + public void setPageCount(Integer pageCount) { + this.pageCount = pageCount; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public Integer getRowCount() { + return rowCount; + } + + public void setRowCount(Integer rowCount) { + this.rowCount = rowCount; + } + + public Integer getFirstRowOnPage() { + return firstRowOnPage; + } + + public void setFirstRowOnPage(Integer firstRowOnPage) { + this.firstRowOnPage = firstRowOnPage; + } + + public Integer getLastRowOnPage() { + return lastRowOnPage; + } + + public void setLastRowOnPage(Integer lastRowOnPage) { + this.lastRowOnPage = lastRowOnPage; + } + +} diff --git a/app/src/main/java/com/uam/wmi/findmytutor/model/Result.java b/app/src/main/java/com/uam/wmi/findmytutor/model/Result.java new file mode 100644 index 0000000..6fc4336 --- /dev/null +++ b/app/src/main/java/com/uam/wmi/findmytutor/model/Result.java @@ -0,0 +1,163 @@ +package com.uam.wmi.findmytutor.model; +import java.util.List; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +public class Result { + + @SerializedName("id") + @Expose + private String id; + @SerializedName("isOnline") + @Expose + private Boolean isOnline; + @SerializedName("isUsingBlacklist") + @Expose + private Boolean isUsingBlacklist; + @SerializedName("isUsingWhitelist") + @Expose + private Boolean isUsingWhitelist; + @SerializedName("blacklist") + @Expose + private List blacklist = null; + @SerializedName("whitelist") + @Expose + private List whitelist = null; + @SerializedName("ldapLogin") + @Expose + private String ldapLogin; + @SerializedName("title") + @Expose + private String title; + @SerializedName("firstName") + @Expose + private String firstName; + @SerializedName("lastName") + @Expose + private String lastName; + @SerializedName("department") + @Expose + private String department; + @SerializedName("userName") + @Expose + private String userName; + @SerializedName("email") + @Expose + private String email; + @SerializedName("isActive") + @Expose + private Boolean isActive; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Boolean getIsOnline() { + return isOnline; + } + + public void setIsOnline(Boolean isOnline) { + this.isOnline = isOnline; + } + + public Boolean getIsUsingBlacklist() { + return isUsingBlacklist; + } + + public void setIsUsingBlacklist(Boolean isUsingBlacklist) { + this.isUsingBlacklist = isUsingBlacklist; + } + + public Boolean getIsUsingWhitelist() { + return isUsingWhitelist; + } + + public void setIsUsingWhitelist(Boolean isUsingWhitelist) { + this.isUsingWhitelist = isUsingWhitelist; + } + + public List getBlacklist() { + return blacklist; + } + + public void setBlacklist(List blacklist) { + this.blacklist = blacklist; + } + + public List getWhitelist() { + return whitelist; + } + + public void setWhitelist(List whitelist) { + this.whitelist = whitelist; + } + + public String getLdapLogin() { + return ldapLogin; + } + + public void setLdapLogin(String ldapLogin) { + this.ldapLogin = ldapLogin; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Boolean getIsActive() { + return isActive; + } + + public void setIsActive(Boolean isActive) { + this.isActive = isActive; + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/uam/wmi/findmytutor/model/StudentIdModel.java b/app/src/main/java/com/uam/wmi/findmytutor/model/StudentIdModel.java new file mode 100644 index 0000000..518cf24 --- /dev/null +++ b/app/src/main/java/com/uam/wmi/findmytutor/model/StudentIdModel.java @@ -0,0 +1,31 @@ +package com.uam.wmi.findmytutor.model; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +public class StudentIdModel { + + @SerializedName("studentId") + @Expose + private String studentId; + @SerializedName("ldapLogin") + @Expose + private String ldapLogin; + + public String getStudentId() { + return studentId; + } + + public void setStudentId(String studentId) { + this.studentId = studentId; + } + + public String getLdapLogin() { + return ldapLogin; + } + + public void setLdapLogin(String ldapLogin) { + this.ldapLogin = ldapLogin; + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/uam/wmi/findmytutor/model/User.java b/app/src/main/java/com/uam/wmi/findmytutor/model/User.java new file mode 100644 index 0000000..6c37884 --- /dev/null +++ b/app/src/main/java/com/uam/wmi/findmytutor/model/User.java @@ -0,0 +1,164 @@ +package com.uam.wmi.findmytutor.model; + +import java.util.List; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +public class User { + + @SerializedName("id") + @Expose + private String id; + @SerializedName("isOnline") + @Expose + private Boolean isOnline; + @SerializedName("isUsingBlacklist") + @Expose + private Boolean isUsingBlacklist; + @SerializedName("isUsingWhitelist") + @Expose + private Boolean isUsingWhitelist; + @SerializedName("blacklist") + @Expose + private List blacklist = null; + @SerializedName("whitelist") + @Expose + private List whitelist = null; + @SerializedName("ldapLogin") + @Expose + private String ldapLogin; + @SerializedName("title") + @Expose + private String title; + @SerializedName("firstName") + @Expose + private String firstName; + @SerializedName("lastName") + @Expose + private String lastName; + @SerializedName("department") + @Expose + private String department; + @SerializedName("userName") + @Expose + private String userName; + @SerializedName("email") + @Expose + private String email; + @SerializedName("isActive") + @Expose + private Boolean isActive; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Boolean getIsOnline() { + return isOnline; + } + + public void setIsOnline(Boolean isOnline) { + this.isOnline = isOnline; + } + + public Boolean getIsUsingBlacklist() { + return isUsingBlacklist; + } + + public void setIsUsingBlacklist(Boolean isUsingBlacklist) { + this.isUsingBlacklist = isUsingBlacklist; + } + + public Boolean getIsUsingWhitelist() { + return isUsingWhitelist; + } + + public void setIsUsingWhitelist(Boolean isUsingWhitelist) { + this.isUsingWhitelist = isUsingWhitelist; + } + + public List getBlacklist() { + return blacklist; + } + + public void setBlacklist(List blacklist) { + this.blacklist = blacklist; + } + + public List getWhitelist() { + return whitelist; + } + + public void setWhitelist(List whitelist) { + this.whitelist = whitelist; + } + + public String getLdapLogin() { + return ldapLogin; + } + + public void setLdapLogin(String ldapLogin) { + this.ldapLogin = ldapLogin; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Boolean getIsActive() { + return isActive; + } + + public void setIsActive(Boolean isActive) { + this.isActive = isActive; + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java b/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java new file mode 100644 index 0000000..e74aaac --- /dev/null +++ b/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java @@ -0,0 +1,75 @@ +package com.uam.wmi.findmytutor.service; +import com.uam.wmi.findmytutor.model.JwtToken; +import com.uam.wmi.findmytutor.model.PagedResult; +import com.uam.wmi.findmytutor.model.User; +import com.uam.wmi.findmytutor.model.IsUsingListBool; +import com.uam.wmi.findmytutor.model.StudentIdModel; +import java.util.List; + +import retrofit2.Call; +import retrofit2.http.Body; +import retrofit2.http.DELETE; +import retrofit2.http.GET; +import retrofit2.http.PUT; +import retrofit2.http.POST; +import retrofit2.http.Path; +import retrofit2.http.Header; + +public interface UserService { + @GET("api/users") + Call> getAllUsers(@Header("Authorization") JwtToken token); + + @POST("api/users") + Call> postAllUsers(@Header("Authorization") JwtToken token); + + @GET("api/users/page/{pageNum}") + Call getPagedUsers(@Path("pageNum") String pageNum, @Header("Authorization") JwtToken token); + + @GET("/api/users/tutors/page/{pageNum}") + Call getPagedTutors(@Path("pageNum") String pageNum, @Header("Authorization") JwtToken token); + + @GET("/api/users/students/page/{pageNum}") + Call getPagedStudents(@Path("pageNum") String pageNum, @Header("Authorization") JwtToken token); + + @GET("api/users/{id}") + Call getUserByID(@Path("id") String userID, @Header("Authorization") JwtToken token); + + @PUT("api/users/{id}") + Call updateUserByID(@Path("id") String userID, @Body User user,@Header("Authorization") JwtToken token); + + @DELETE("api/users/{id}") + Call deleteUserByID(@Path("id") String userID, @Header("Authorization") JwtToken token); + + @GET("api/users/userLogin/{ldapLogin}") + Call getUserLdapLogin(@Path("ldapLogin") String ldapLogin,@Header("Authorization") JwtToken token); + + @PUT("api/users/setActive/{userID}") + Call setUserActive(@Path("userID") String userID,@Header("Authorization") JwtToken token); + + @PUT("api/users/setInActive/{userID}") + Call setUserInActive(@Path("userID") String userID,@Header("Authorization") JwtToken token); + + @GET("api/users/blacklist/{tutorID}") + Call> getTutorBlacklistedByID(@Path("tutorID") String tutorID,@Header("Authorization") JwtToken token); + + @PUT("api/users/blacklist/{tutorID}") + Call setTutorBlacklist(@Path("tutorID") String tutorID, @Body IsUsingListBool isUsing,@Header("Authorization") JwtToken token); + + @POST("api/users/blacklist/{tutorID}") + Call> addStudentToBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); + + @DELETE("api/users/blacklist/{tutorID}") + Call> removeStudentFromBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); + + @GET("api/users/whitelist/{tutorID}") + Call> getTutorwhitelistedByID(@Path("tutorID") String tutorID,@Header("Authorization") JwtToken token); + + @PUT("api/users/whitelist/{tutorID}") + Call setTutorWhitelist(@Path("tutorID") String tutorID, @Body IsUsingListBool isUsing,@Header("Authorization") JwtToken token); + + @POST("api/users/whitelist/{tutorID}") + Call> addStudentTowhitelist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); + + @DELETE("api/users/whitelist/{tutorID}") + Call> removeStudentFromWhitelist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); +} diff --git a/build.gradle b/build.gradle index 1a3d812..077cb2f 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.1.4' // NOTE: Do not place your application dependencies here; they belong From ceeb62bcecd4d77a3ed28621c33997ad56d918f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Jedy=C5=84ski?= Date: Sat, 25 Aug 2018 22:48:37 +0200 Subject: [PATCH 2/5] updated gitignore and removed .idea cache from tracked files --- .gitignore | 71 +++++++++++++++++++++++--- .idea/caches/build_file_checksums.ser | Bin 540 -> 0 bytes 2 files changed, 63 insertions(+), 8 deletions(-) delete mode 100644 .idea/caches/build_file_checksums.ser diff --git a/.gitignore b/.gitignore index 5edb4ee..3c117df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,65 @@ +# Built application files +*.apk +*.ap_ + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ *.iml -.gradle -/local.properties -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -.DS_Store -/build -/captures +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +.idea/caches + +# Keystore files +# Uncomment the following line if you do not want to check your keystore files in. +#*.jks + +# External native build folder generated in Android Studio 2.2 and later .externalNativeBuild + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md \ No newline at end of file diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser deleted file mode 100644 index f7feae91852b188555d60a2737ba5b7286cc2c32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 540 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}uGBYr_F>vMNC#JY1CYR(Fc`|U8WE7{mc1 z7N?e!Wagz8!!#B$)G@Gu)Xuw^u+Qc`d!BBBo>aKg;e{m(+Rj!np~b01#WA^wMOmpS zhDI?^T``EjEJ!UX$xJOSg`0Clw&!L)!zPxO4V*LH{BWu(Vc Date: Sun, 26 Aug 2018 16:19:04 +0200 Subject: [PATCH 3/5] fixed response type for post methods --- .gitignore | 6 ++++-- .idea/caches/build_file_checksums.ser | Bin 0 -> 540 bytes .idea/misc.xml | 2 +- .../uam/wmi/findmytutor/service/UserService.java | 8 +++++--- 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser diff --git a/.gitignore b/.gitignore index 3c117df..0c1fdca 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,9 @@ captures/ .idea/dictionaries .idea/libraries .idea/caches - +.idea/vcs.xml +.idea/workspace.xml +.idea/modules.xml # Keystore files # Uncomment the following line if you do not want to check your keystore files in. #*.jks @@ -62,4 +64,4 @@ fastlane/report.xml fastlane/Preview.html fastlane/screenshots fastlane/test_output -fastlane/readme.md \ No newline at end of file +fastlane/readme.md diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..065fdfe34a95bb8b03dcca74561cfff4cc6a7a85 GIT binary patch literal 540 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}Q#7BMhIJFWRF{)3GpI3_o-C@VF^ z&?p9~D+Upm1*t_PnW@F4aC5H6_T21e*u?U(fpf;2A5L{83_K_47&`?vLw{r566LUaOgkfsH+?5_iXBZyT^R;EYec5hV!XSvp4WE0NSM5ny>bJ=@ L&G^|_fusrms{FdJ literal 0 HcmV?d00001 diff --git a/.idea/misc.xml b/.idea/misc.xml index c0f68ed..99202cc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java b/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java index e74aaac..8aad341 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java @@ -6,6 +6,7 @@ import com.uam.wmi.findmytutor.model.IsUsingListBool; import com.uam.wmi.findmytutor.model.StudentIdModel; import java.util.List; +import okhttp3.ResponseBody; import retrofit2.Call; import retrofit2.http.Body; import retrofit2.http.DELETE; @@ -15,12 +16,13 @@ import retrofit2.http.POST; import retrofit2.http.Path; import retrofit2.http.Header; + public interface UserService { @GET("api/users") Call> getAllUsers(@Header("Authorization") JwtToken token); @POST("api/users") - Call> postAllUsers(@Header("Authorization") JwtToken token); + Call createUser(@Body User user,@Header("Authorization") JwtToken token); @GET("api/users/page/{pageNum}") Call getPagedUsers(@Path("pageNum") String pageNum, @Header("Authorization") JwtToken token); @@ -56,7 +58,7 @@ public interface UserService { Call setTutorBlacklist(@Path("tutorID") String tutorID, @Body IsUsingListBool isUsing,@Header("Authorization") JwtToken token); @POST("api/users/blacklist/{tutorID}") - Call> addStudentToBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); + Call addStudentToBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); @DELETE("api/users/blacklist/{tutorID}") Call> removeStudentFromBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); @@ -68,7 +70,7 @@ public interface UserService { Call setTutorWhitelist(@Path("tutorID") String tutorID, @Body IsUsingListBool isUsing,@Header("Authorization") JwtToken token); @POST("api/users/whitelist/{tutorID}") - Call> addStudentTowhitelist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); + Call addStudentTowhitelist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); @DELETE("api/users/whitelist/{tutorID}") Call> removeStudentFromWhitelist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); From 6dcad78524870b012f49f34bb308244aa1238d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Jedy=C5=84ski?= Date: Sun, 26 Aug 2018 16:30:19 +0200 Subject: [PATCH 4/5] removed token from arg list --- .../wmi/findmytutor/service/UserService.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java b/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java index 8aad341..0dc77a0 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java @@ -22,7 +22,7 @@ public interface UserService { Call> getAllUsers(@Header("Authorization") JwtToken token); @POST("api/users") - Call createUser(@Body User user,@Header("Authorization") JwtToken token); + Call createUser(@Body User user); @GET("api/users/page/{pageNum}") Call getPagedUsers(@Path("pageNum") String pageNum, @Header("Authorization") JwtToken token); @@ -37,41 +37,41 @@ public interface UserService { Call getUserByID(@Path("id") String userID, @Header("Authorization") JwtToken token); @PUT("api/users/{id}") - Call updateUserByID(@Path("id") String userID, @Body User user,@Header("Authorization") JwtToken token); + Call updateUserByID(@Path("id") String userID, @Body User user); @DELETE("api/users/{id}") Call deleteUserByID(@Path("id") String userID, @Header("Authorization") JwtToken token); @GET("api/users/userLogin/{ldapLogin}") - Call getUserLdapLogin(@Path("ldapLogin") String ldapLogin,@Header("Authorization") JwtToken token); + Call getUserLdapLogin(@Path("ldapLogin") String ldapLogin); @PUT("api/users/setActive/{userID}") - Call setUserActive(@Path("userID") String userID,@Header("Authorization") JwtToken token); + Call setUserActive(@Path("userID") String userID); @PUT("api/users/setInActive/{userID}") - Call setUserInActive(@Path("userID") String userID,@Header("Authorization") JwtToken token); + Call setUserInActive(@Path("userID") String userID); @GET("api/users/blacklist/{tutorID}") - Call> getTutorBlacklistedByID(@Path("tutorID") String tutorID,@Header("Authorization") JwtToken token); + Call> getTutorBlacklistedByID(@Path("tutorID") String tutorID); @PUT("api/users/blacklist/{tutorID}") - Call setTutorBlacklist(@Path("tutorID") String tutorID, @Body IsUsingListBool isUsing,@Header("Authorization") JwtToken token); + Call setTutorBlacklist(@Path("tutorID") String tutorID, @Body IsUsingListBool isUsing); @POST("api/users/blacklist/{tutorID}") - Call addStudentToBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); + Call addStudentToBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student); @DELETE("api/users/blacklist/{tutorID}") - Call> removeStudentFromBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); + Call> removeStudentFromBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student); @GET("api/users/whitelist/{tutorID}") - Call> getTutorwhitelistedByID(@Path("tutorID") String tutorID,@Header("Authorization") JwtToken token); + Call> getTutorwhitelistedByID(@Path("tutorID") String tutorID); @PUT("api/users/whitelist/{tutorID}") - Call setTutorWhitelist(@Path("tutorID") String tutorID, @Body IsUsingListBool isUsing,@Header("Authorization") JwtToken token); + Call setTutorWhitelist(@Path("tutorID") String tutorID, @Body IsUsingListBool isUsing); @POST("api/users/whitelist/{tutorID}") - Call addStudentTowhitelist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); + Call addStudentTowhitelist(@Path("tutorID") String tutorID, @Body StudentIdModel student); @DELETE("api/users/whitelist/{tutorID}") - Call> removeStudentFromWhitelist(@Path("tutorID") String tutorID, @Body StudentIdModel student,@Header("Authorization") JwtToken token); + Call> removeStudentFromWhitelist(@Path("tutorID") String tutorID, @Body StudentIdModel student); } From 9c17221e65887256a187db2123ff4b99a1639a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Jedy=C5=84ski?= Date: Sun, 26 Aug 2018 16:32:01 +0200 Subject: [PATCH 5/5] removed token from arg list v2 --- .../com/uam/wmi/findmytutor/service/UserService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java b/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java index 0dc77a0..0df22c1 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java @@ -19,28 +19,28 @@ import retrofit2.http.Header; public interface UserService { @GET("api/users") - Call> getAllUsers(@Header("Authorization") JwtToken token); + Call> getAllUsers(); @POST("api/users") Call createUser(@Body User user); @GET("api/users/page/{pageNum}") - Call getPagedUsers(@Path("pageNum") String pageNum, @Header("Authorization") JwtToken token); + Call getPagedUsers(@Path("pageNum") String pageNum ); @GET("/api/users/tutors/page/{pageNum}") - Call getPagedTutors(@Path("pageNum") String pageNum, @Header("Authorization") JwtToken token); + Call getPagedTutors(@Path("pageNum") String pageNum); @GET("/api/users/students/page/{pageNum}") - Call getPagedStudents(@Path("pageNum") String pageNum, @Header("Authorization") JwtToken token); + Call getPagedStudents(@Path("pageNum") String pageNum); @GET("api/users/{id}") - Call getUserByID(@Path("id") String userID, @Header("Authorization") JwtToken token); + Call getUserByID(@Path("id") String userID); @PUT("api/users/{id}") Call updateUserByID(@Path("id") String userID, @Body User user); @DELETE("api/users/{id}") - Call deleteUserByID(@Path("id") String userID, @Header("Authorization") JwtToken token); + Call deleteUserByID(@Path("id") String userID); @GET("api/users/userLogin/{ldapLogin}") Call getUserLdapLogin(@Path("ldapLogin") String ldapLogin);