diff --git a/resources/view/login.html b/resources/view/login.html
index 8765ca8ff..c43932edd 100644
--- a/resources/view/login.html
+++ b/resources/view/login.html
@@ -47,15 +47,6 @@ Sign in
-
-
-
-
-
-
-
diff --git a/src/main/java/com/javarush/jira/bugtracking/attachment/FileUtil.java b/src/main/java/com/javarush/jira/bugtracking/attachment/FileUtil.java
index 6cffbe175..c36522170 100644
--- a/src/main/java/com/javarush/jira/bugtracking/attachment/FileUtil.java
+++ b/src/main/java/com/javarush/jira/bugtracking/attachment/FileUtil.java
@@ -24,15 +24,17 @@ public static void upload(MultipartFile multipartFile, String directoryPath, Str
if (multipartFile.isEmpty()) {
throw new IllegalRequestDataException("Select a file to upload.");
}
-
- File dir = new File(directoryPath);
- if (dir.exists() || dir.mkdirs()) {
- File file = new File(directoryPath + fileName);
- try (OutputStream outStream = new FileOutputStream(file)) {
+ Path dirPath = Paths.get(directoryPath);
+ try {
+ if (!Files.exists(dirPath)) {
+ Files.createDirectories(dirPath);
+ }
+ Path filePath = dirPath.resolve(fileName);
+ try (OutputStream outStream = Files.newOutputStream(filePath)) {
outStream.write(multipartFile.getBytes());
- } catch (IOException ex) {
- throw new IllegalRequestDataException("Failed to upload file" + multipartFile.getOriginalFilename());
}
+ } catch (IOException e) {
+ throw new IllegalRequestDataException("Failed to upload file: " + multipartFile.getOriginalFilename());
}
}
diff --git a/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/VkOAuth2UserDataHandler.java b/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/VkOAuth2UserDataHandler.java
deleted file mode 100644
index e8e05be05..000000000
--- a/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/VkOAuth2UserDataHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.javarush.jira.login.internal.sociallogin.handler;
-
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-@Component("vk")
-public class VkOAuth2UserDataHandler implements OAuth2UserDataHandler {
- @Override
- public String getFirstName(OAuth2UserData oAuth2UserData) {
- return getAttribute(oAuth2UserData, "first_name");
- }
-
- @Override
- public String getLastName(OAuth2UserData oAuth2UserData) {
- return getAttribute(oAuth2UserData, "last_name");
- }
-
- @Override
- public String getEmail(OAuth2UserData oAuth2UserData) {
- return oAuth2UserData.getData("email");
- }
-
- private String getAttribute(OAuth2UserData oAuth2UserData, String name) {
- List> attributesResponse = oAuth2UserData.getData("response");
- if (attributesResponse != null) {
- Map attributes = attributesResponse.get(0);
- if (attributes != null) {
- return (String) attributes.get(name);
- }
- }
- return null;
- }
-}
diff --git a/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/YandexOAuth2UserDataHandler.java b/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/YandexOAuth2UserDataHandler.java
deleted file mode 100644
index e8ea1ac1d..000000000
--- a/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/YandexOAuth2UserDataHandler.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.javarush.jira.login.internal.sociallogin.handler;
-
-import org.springframework.stereotype.Component;
-
-@Component("yandex")
-public class YandexOAuth2UserDataHandler implements OAuth2UserDataHandler {
- @Override
- public String getFirstName(OAuth2UserData oAuth2UserData) {
- return oAuth2UserData.getData("first_name");
- }
-
- @Override
- public String getLastName(OAuth2UserData oAuth2UserData) {
- return oAuth2UserData.getData("last_name");
- }
-
- @Override
- public String getEmail(OAuth2UserData oAuth2UserData) {
- return oAuth2UserData.getData("default_email");
- }
-}
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 7fcba1570..d9660eb05 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -61,20 +61,6 @@ spring:
scope:
- email
- profile
- vk:
- client-id: 51562377
- client-secret: jNM1YHQy1362Mqs49wUN
- client-name: Vkontakte
- redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}"
- client-authentication-method: client_secret_post
- authorization-grant-type: authorization_code
- scope: email
- yandex:
- client-id: 2f3395214ba84075956b76a34b231985
- client-secret: ed236c501e444a609b0f419e5e88f1e1
- client-name: Yandex
- redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}"
- authorization-grant-type: authorization_code
gitlab:
client-id: b8520a3266089063c0d8261cce36971defa513f5ffd9f9b7a3d16728fc83a494
client-secret: e72c65320cf9d6495984a37b0f9cc03ec46be0bb6f071feaebbfe75168117004
@@ -83,16 +69,6 @@ spring:
authorization-grant-type: authorization_code
scope: read_user
provider:
- vk:
- authorization-uri: https://oauth.vk.com/authorize
- token-uri: https://oauth.vk.com/access_token
- user-info-uri: https://api.vk.com/method/users.get?v=8.1
- user-name-attribute: response
- yandex:
- authorization-uri: https://oauth.yandex.ru/authorize
- token-uri: https://oauth.yandex.ru/token
- user-info-uri: https://login.yandex.ru/info
- user-name-attribute: login
gitlab:
authorization-uri: https://gitlab.com/oauth/authorize
token-uri: https://gitlab.com/oauth/token
diff --git a/src/test/java/com/javarush/jira/profile/internal/web/ProfileTestData.java b/src/test/java/com/javarush/jira/profile/internal/web/ProfileTestData.java
index fb4407268..cc0513971 100644
--- a/src/test/java/com/javarush/jira/profile/internal/web/ProfileTestData.java
+++ b/src/test/java/com/javarush/jira/profile/internal/web/ProfileTestData.java
@@ -44,7 +44,6 @@ public static ProfileTo getUpdatedTo() {
new ContactTo("website", "new.com"),
new ContactTo("github", "newGitHub"),
new ContactTo("tg", "newTg"),
- new ContactTo("vk", "newVk"),
new ContactTo("linkedin", "newLinkedin")));
}
@@ -57,7 +56,6 @@ public static Profile getUpdated(long id) {
new Contact(id, "website", "new.com"),
new Contact(id, "github", "newGitHub"),
new Contact(id, "tg", "newTg"),
- new Contact(id, "vk", "newVk"),
new Contact(id, "linkedin", "newLinkedin")));
return profile;
}
diff --git a/src/test/resources/data.sql b/src/test/resources/data.sql
index 5087dbddc..bc26161e4 100644
--- a/src/test/resources/data.sql
+++ b/src/test/resources/data.sql
@@ -53,8 +53,7 @@ values (1, 'skype', 'userSkype'),
(1, 'mobile', '+01234567890'),
(1, 'website', 'user.com'),
(2, 'github', 'adminGitHub'),
- (2, 'tg', 'adminTg'),
- (2, 'vk', 'adminVk');
+ (2, 'tg', 'adminTg');
insert into PROJECT (code, title, description, type_code, parent_id)