From d33b5918560cbdab4310adad90fe9fab989b0c11 Mon Sep 17 00:00:00 2001 From: yetju000 Date: Sat, 30 Nov 2019 12:03:28 +0100 Subject: [PATCH 1/3] usos group preparation --- .../usos/AuthorizationService.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java b/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java index 805c357..95ba12c 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java @@ -72,11 +72,30 @@ public class AuthorizationService { String[] tokens = response.split("&"); oauth_token = tokens[0].replace("oauth_token=", ""); oauth_token_secret = tokens[1].replace("oauth_token_secret=", ""); - return createUserAccountAndReturnHeaderToken(oauth_token, oauth_token_secret); + TokenResponseDTO tokenResponseDTO = createUserAccountAndReturnHeaderToken(oauth_token, oauth_token_secret); + updateUserGroupsAndStudents(oauth_token, oauth_token_secret); + logOut(oauth_token, oauth_token_secret); + return tokenResponseDTO; } return new TokenResponseDTO("authorization failed", null); } + private void updateUserGroupsAndStudents(String oauth_token, String oauth_token_secret) throws UnsupportedEncodingException, InvalidKeyException, NoSuchAlgorithmException { + List queryParams = new ArrayList<>(); + queryParams.add(new BasicNameValuePair("oauth_consumer_key", propertiesLoader.getKey())); + queryParams.add(new BasicNameValuePair("oauth_nonce", "" + (int) (Math.random() * 100000000))); + queryParams.add(new BasicNameValuePair("oauth_signature_method", "HMAC-SHA1")); + queryParams.add(new BasicNameValuePair("oauth_timestamp", "" + (System.currentTimeMillis() / 1000))); + queryParams.add(new BasicNameValuePair("oauth_token", oauth_token)); + queryParams.add(new BasicNameValuePair("oauth_version", "1.0")); + String oauth_signature = getSignature("GET", URLEncoder.encode(propertiesLoader.getUsosApiURL() + "/groups/user", ENC), URLEncoder.encode(URLEncodedUtils.format(queryParams, ENC), ENC), oauth_token_secret); + queryParams.add(new BasicNameValuePair("oauth_signature", oauth_signature)); + String url = "/groups/user?" + URLEncodedUtils.format(queryParams, ENC); + + String courses = when().get(url).body().asString(); + System.out.println(courses); + } + public String requestToken(String oauth_callback) throws UnsupportedEncodingException, InvalidKeyException, NoSuchAlgorithmException { List queryParams = new ArrayList<>(); queryParams.add(new BasicNameValuePair("oauth_callback", oauth_callback)); From 6d3339b058d030b0859c770ac76bf8067c06c886 Mon Sep 17 00:00:00 2001 From: yetju000 Date: Sat, 30 Nov 2019 14:49:53 +0100 Subject: [PATCH 2/3] usos groups refactoring --- .../studycaverestservice/usos/AuthorizationService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java b/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java index 95ba12c..d9b18d0 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java @@ -74,7 +74,7 @@ public class AuthorizationService { oauth_token_secret = tokens[1].replace("oauth_token_secret=", ""); TokenResponseDTO tokenResponseDTO = createUserAccountAndReturnHeaderToken(oauth_token, oauth_token_secret); updateUserGroupsAndStudents(oauth_token, oauth_token_secret); - logOut(oauth_token, oauth_token_secret); + //logOut(oauth_token, oauth_token_secret); return tokenResponseDTO; } return new TokenResponseDTO("authorization failed", null); @@ -82,6 +82,7 @@ public class AuthorizationService { private void updateUserGroupsAndStudents(String oauth_token, String oauth_token_secret) throws UnsupportedEncodingException, InvalidKeyException, NoSuchAlgorithmException { List queryParams = new ArrayList<>(); + queryParams.add(new BasicNameValuePair("fields", "course_unit_id|group_number|class_type|class_type_id|course_id|course_name|course_lang_id")); queryParams.add(new BasicNameValuePair("oauth_consumer_key", propertiesLoader.getKey())); queryParams.add(new BasicNameValuePair("oauth_nonce", "" + (int) (Math.random() * 100000000))); queryParams.add(new BasicNameValuePair("oauth_signature_method", "HMAC-SHA1")); From e1111196e04e89da0ee42b79719c9e8b2108b035 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 1 Dec 2019 12:38:05 +0100 Subject: [PATCH 3/3] poprawki grup --- .../studycaverestservice/usos/AuthorizationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java b/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java index d9b18d0..a5540be 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java @@ -82,7 +82,7 @@ public class AuthorizationService { private void updateUserGroupsAndStudents(String oauth_token, String oauth_token_secret) throws UnsupportedEncodingException, InvalidKeyException, NoSuchAlgorithmException { List queryParams = new ArrayList<>(); - queryParams.add(new BasicNameValuePair("fields", "course_unit_id|group_number|class_type|class_type_id|course_id|course_name|course_lang_id")); + queryParams.add(new BasicNameValuePair("fields", "course%5Funit%5Fid")); queryParams.add(new BasicNameValuePair("oauth_consumer_key", propertiesLoader.getKey())); queryParams.add(new BasicNameValuePair("oauth_nonce", "" + (int) (Math.random() * 100000000))); queryParams.add(new BasicNameValuePair("oauth_signature_method", "HMAC-SHA1"));