Skip to content

Commit ceda43f

Browse files
authored
Added user authorization in Cosv (#2912)
* Added user authorization in Cosv
1 parent a6811b9 commit ceda43f

32 files changed

Lines changed: 2597 additions & 14 deletions

save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/AvatarController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package com.saveourtool.save.backend.controllers
33
import com.saveourtool.save.authservice.utils.username
44
import com.saveourtool.save.backend.service.OrganizationService
55
import com.saveourtool.save.backend.service.UserDetailsService
6-
import com.saveourtool.save.backend.storage.AvatarKey
76
import com.saveourtool.save.backend.storage.AvatarStorage
87
import com.saveourtool.save.configs.ApiSwaggerSupport
8+
import com.saveourtool.save.storage.AvatarKey
99
import com.saveourtool.save.utils.*
1010
import com.saveourtool.save.utils.ByteBufferFluxResponse
1111
import com.saveourtool.save.v1

save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/OrganizationRepository.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.saveourtool.save.backend.repository
22

33
import com.saveourtool.save.entities.Organization
44
import com.saveourtool.save.entities.OrganizationStatus
5+
import com.saveourtool.save.repository.ValidateRepository
56
import org.springframework.data.domain.Pageable
67
import org.springframework.data.jpa.repository.JpaRepository
78
import org.springframework.data.jpa.repository.JpaSpecificationExecutor

save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/UserRepository.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.saveourtool.save.backend.repository
22

33
import com.saveourtool.save.entities.User
44
import com.saveourtool.save.info.UserStatus
5+
import com.saveourtool.save.repository.ValidateRepository
56
import com.saveourtool.save.spring.repository.BaseEntityRepository
67
import org.springframework.data.domain.Page
78
import org.springframework.data.domain.Pageable

save-backend/src/main/kotlin/com/saveourtool/save/backend/service/UserDetailsService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import com.saveourtool.save.backend.repository.LnkUserOrganizationRepository
55
import com.saveourtool.save.backend.repository.LnkUserProjectRepository
66
import com.saveourtool.save.backend.repository.OriginalLoginRepository
77
import com.saveourtool.save.backend.repository.UserRepository
8-
import com.saveourtool.save.backend.storage.AvatarKey
98
import com.saveourtool.save.backend.storage.AvatarStorage
109
import com.saveourtool.save.domain.Role
1110
import com.saveourtool.save.domain.UserSaveStatus
1211
import com.saveourtool.save.entities.OriginalLogin
1312
import com.saveourtool.save.entities.User
1413
import com.saveourtool.save.evententities.UserEvent
1514
import com.saveourtool.save.info.UserStatus
15+
import com.saveourtool.save.storage.AvatarKey
1616
import com.saveourtool.save.utils.*
1717
import org.slf4j.Logger
1818
import org.springframework.context.ApplicationEventPublisher

save-backend/src/main/kotlin/com/saveourtool/save/backend/storage/AvatarStorage.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.saveourtool.save.backend.storage
33
import com.saveourtool.save.backend.configs.ConfigProperties
44
import com.saveourtool.save.s3.S3Operations
55
import com.saveourtool.save.storage.AbstractSimpleReactiveStorage
6+
import com.saveourtool.save.storage.AvatarKey
67
import com.saveourtool.save.storage.concatS3Key
78
import com.saveourtool.save.storage.s3KeyToParts
89
import com.saveourtool.save.utils.AvatarType

save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/LnkUserOrganization.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import javax.persistence.ManyToOne
1414
* @property role of [user] in [organization]
1515
*/
1616
@Entity
17+
@Table(schema = "save_cloud", name = "lnk_user_organization")
1718
class LnkUserOrganization(
1819
@ManyToOne
1920
@JoinColumn(name = "organization_id")

save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/LnkUserProject.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import javax.persistence.ManyToOne
1414
* @property role role of this user
1515
*/
1616
@Entity
17+
@Table(schema = "save_cloud", name = "lnk_user_project")
1718
class LnkUserProject(
1819
@ManyToOne
1920
@JoinColumn(name = "project_id")

save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/ValidateRepository.kt renamed to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/repository/ValidateRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.saveourtool.save.backend.repository
1+
package com.saveourtool.save.repository
22

33
import org.springframework.data.jpa.repository.Modifying
44
import org.springframework.data.jpa.repository.Query

save-backend/src/main/kotlin/com/saveourtool/save/backend/storage/AvatarKey.kt renamed to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/storage/AvatarKey.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.saveourtool.save.backend.storage
1+
package com.saveourtool.save.storage
22

33
import com.saveourtool.save.utils.AvatarType
44

save-cosv/src/main/kotlin/com/saveourtool/save/cosv/configs/ConfigProperties.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ import java.nio.file.Path
1111
* @property s3Storage configuration of S3 storage
1212
* @property workingDir a local folder for tmp files
1313
* @property gatewayUrl
14+
* @property preprocessorUrl
1415
*/
1516
@ConstructorBinding
1617
@ConfigurationProperties(prefix = "cosv")
1718
data class ConfigProperties(
1819
override val s3Storage: S3OperationsProperties,
1920
val workingDir: Path,
2021
val gatewayUrl: String,
22+
val preprocessorUrl: String,
2123
) : S3OperationsProperties.Provider

0 commit comments

Comments
 (0)