Skip to content

Commit

Permalink
Merge pull request #94 from VAuthenticator/make-aws-endpoint-configur…
Browse files Browse the repository at this point in the history 
…able

make aws clients endpoint configurable
  • Loading branch information
@mrFlick72
mrFlick72 authored Jan 6, 2023
2 parents d66453e + 4c5540a commit 74f34f3
Show file tree
Hide file tree
Showing 160 changed files with 672 additions and 643 deletions.
44 changes: 0 additions & 44 deletions src/main/kotlin/com/vauthenticator/config/AwsConfig.kt
View file

This file was deleted.

6 changes: 3 additions & 3 deletions ...uthenticator/VAuthenticatorApplication.kt → ...cator/server/VAuthenticatorApplication.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.vauthenticator
package com.vauthenticator.server

import com.vauthenticator.mail.NoReplyMailConfiguration
import com.vauthenticator.mfa.OtpConfigurationProperties
import com.vauthenticator.server.mail.NoReplyMailConfiguration
import com.vauthenticator.server.mfa.OtpConfigurationProperties
import org.springframework.beans.factory.annotation.Value
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.context.properties.EnableConfigurationProperties
Expand Down
6 changes: 3 additions & 3 deletions ...lin/com/vauthenticator/account/Account.kt → .../vauthenticator/server/account/Account.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vauthenticator.account
package com.vauthenticator.server.account

import com.fasterxml.jackson.databind.ObjectMapper
import com.vauthenticator.cache.CacheContentConverter
import com.vauthenticator.extentions.toSha256
import com.vauthenticator.server.cache.CacheContentConverter
import com.vauthenticator.server.extentions.toSha256
import java.time.LocalDate
import java.time.format.DateTimeFormatter
import java.util.*
Expand Down
16 changes: 8 additions & 8 deletions ...henticator/account/api/AccountEndPoint.kt → ...tor/server/account/api/AccountEndPoint.kt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.vauthenticator.account.api
package com.vauthenticator.server.account.api

import com.vauthenticator.account.Account
import com.vauthenticator.account.Date
import com.vauthenticator.account.Phone
import com.vauthenticator.account.repository.AccountRepository
import com.vauthenticator.account.signup.SignUpUseCase
import com.vauthenticator.extentions.clientAppId
import com.vauthenticator.oauth2.clientapp.ClientAppId
import com.vauthenticator.server.account.Account
import com.vauthenticator.server.account.Date
import com.vauthenticator.server.account.Phone
import com.vauthenticator.server.account.repository.AccountRepository
import com.vauthenticator.server.account.signup.SignUpUseCase
import com.vauthenticator.server.extentions.clientAppId
import com.vauthenticator.server.oauth2.clientapp.ClientAppId
import jakarta.servlet.http.HttpSession
import org.slf4j.Logger
import org.slf4j.LoggerFactory
Expand Down
6 changes: 3 additions & 3 deletions ...cator/account/api/AdminAccountEndPoint.kt → ...erver/account/api/AdminAccountEndPoint.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.vauthenticator.account.api
package com.vauthenticator.server.account.api

import com.vauthenticator.account.Account
import com.vauthenticator.account.repository.AccountRepository
import com.vauthenticator.server.account.Account
import com.vauthenticator.server.account.repository.AccountRepository
import org.springframework.http.ResponseEntity.*
import org.springframework.security.core.Authentication
import org.springframework.web.bind.annotation.*
Expand Down
4 changes: 2 additions & 2 deletions ...lverification/MailVerificationEndPoint.kt → ...lverification/MailVerificationEndPoint.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vauthenticator.account.mailverification
package com.vauthenticator.server.account.mailverification

import com.vauthenticator.extentions.clientAppId
import com.vauthenticator.server.extentions.clientAppId
import org.springframework.http.ResponseEntity.*
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken
import org.springframework.stereotype.Controller
Expand Down
16 changes: 8 additions & 8 deletions ...ilverification/SendVerifyMailChallenge.kt → ...ilverification/SendVerifyMailChallenge.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.vauthenticator.account.mailverification

import com.vauthenticator.account.AccountNotFoundException
import com.vauthenticator.account.repository.AccountRepository
import com.vauthenticator.account.tiket.VerificationTicket
import com.vauthenticator.account.tiket.VerificationTicketFactory
import com.vauthenticator.mail.MailSenderService
import com.vauthenticator.oauth2.clientapp.*
package com.vauthenticator.server.account.mailverification

import com.vauthenticator.server.account.AccountNotFoundException
import com.vauthenticator.server.account.repository.AccountRepository
import com.vauthenticator.server.account.tiket.VerificationTicket
import com.vauthenticator.server.account.tiket.VerificationTicketFactory
import com.vauthenticator.server.mail.MailSenderService
import com.vauthenticator.server.oauth2.clientapp.*

private const val LINK_KEY = "verificationMailLink"

Expand Down
26 changes: 13 additions & 13 deletions ...ilverification/VerifyMailChallengeSent.kt → ...ilverification/VerifyMailChallengeSent.kt
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.vauthenticator.account.mailverification
package com.vauthenticator.server.account.mailverification

import com.vauthenticator.account.Account
import com.vauthenticator.account.repository.AccountRepository
import com.vauthenticator.account.tiket.InvalidTicketException
import com.vauthenticator.account.tiket.Ticket
import com.vauthenticator.account.tiket.TicketRepository
import com.vauthenticator.account.tiket.VerificationTicket
import com.vauthenticator.mfa.MfaMethod
import com.vauthenticator.mfa.MfaMethodsEnrolmentAssociation
import com.vauthenticator.oauth2.clientapp.ClientAppId
import com.vauthenticator.oauth2.clientapp.ClientApplicationRepository
import com.vauthenticator.oauth2.clientapp.InsufficientClientApplicationScopeException
import com.vauthenticator.oauth2.clientapp.Scope
import com.vauthenticator.server.account.Account
import com.vauthenticator.server.account.repository.AccountRepository
import com.vauthenticator.server.account.tiket.InvalidTicketException
import com.vauthenticator.server.account.tiket.Ticket
import com.vauthenticator.server.account.tiket.TicketRepository
import com.vauthenticator.server.account.tiket.VerificationTicket
import com.vauthenticator.server.mfa.MfaMethod
import com.vauthenticator.server.mfa.MfaMethodsEnrolmentAssociation
import com.vauthenticator.server.oauth2.clientapp.ClientAppId
import com.vauthenticator.server.oauth2.clientapp.ClientApplicationRepository
import com.vauthenticator.server.oauth2.clientapp.InsufficientClientApplicationScopeException
import com.vauthenticator.server.oauth2.clientapp.Scope

class VerifyMailChallengeSent(
private val clientAccountRepository: ClientApplicationRepository,
Expand Down
2 changes: 1 addition & 1 deletion .../account/repository/AccountAuthorities.kt → .../account/repository/AccountAuthorities.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vauthenticator.account.repository
package com.vauthenticator.server.account.repository

object AccountAuthorities {
fun removeAuthorities(
Expand Down
4 changes: 2 additions & 2 deletions ...r/account/repository/AccountRepository.kt → ...r/account/repository/AccountRepository.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vauthenticator.account.repository
package com.vauthenticator.server.account.repository

import com.vauthenticator.account.Account
import com.vauthenticator.server.account.Account
import java.util.*

interface AccountRepository {
Expand Down
6 changes: 3 additions & 3 deletions ...ry/AccountRepositoryWithPasswordPolicy.kt → ...ry/AccountRepositoryWithPasswordPolicy.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.vauthenticator.account.repository
package com.vauthenticator.server.account.repository

import com.vauthenticator.account.Account
import com.vauthenticator.password.PasswordPolicy
import com.vauthenticator.server.account.Account
import com.vauthenticator.server.password.PasswordPolicy

class AccountRepositoryWithPasswordPolicy(
private val accountRepository: AccountRepository,
Expand Down
8 changes: 4 additions & 4 deletions ...unt/repository/CachedAccountRepository.kt → ...unt/repository/CachedAccountRepository.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vauthenticator.account.repository
package com.vauthenticator.server.account.repository

import com.vauthenticator.account.Account
import com.vauthenticator.cache.CacheContentConverter
import com.vauthenticator.cache.CacheOperation
import com.vauthenticator.server.account.Account
import com.vauthenticator.server.cache.CacheContentConverter
import com.vauthenticator.server.cache.CacheOperation
import java.util.*

class CachedAccountRepository(
Expand Down
14 changes: 7 additions & 7 deletions ...ount/repository/DynamoAccountConverter.kt → ...ount/repository/DynamoAccountConverter.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.vauthenticator.account.repository
package com.vauthenticator.server.account.repository

import com.vauthenticator.account.Account
import com.vauthenticator.account.Date
import com.vauthenticator.account.Phone
import com.vauthenticator.extentions.asDynamoAttribute
import com.vauthenticator.extentions.valueAsBoolFor
import com.vauthenticator.extentions.valueAsStringFor
import com.vauthenticator.server.account.Account
import com.vauthenticator.server.account.Date
import com.vauthenticator.server.account.Phone
import com.vauthenticator.server.extentions.asDynamoAttribute
import com.vauthenticator.server.extentions.valueAsBoolFor
import com.vauthenticator.server.extentions.valueAsStringFor
import software.amazon.awssdk.services.dynamodb.model.AttributeValue

object DynamoAccountConverter {
Expand Down
6 changes: 3 additions & 3 deletions ...t/repository/DynamoAccountQueryFactory.kt → ...t/repository/DynamoAccountQueryFactory.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.vauthenticator.account.repository
package com.vauthenticator.server.account.repository

import com.vauthenticator.account.Account
import com.vauthenticator.extentions.asDynamoAttribute
import com.vauthenticator.server.account.Account
import com.vauthenticator.server.extentions.asDynamoAttribute
import software.amazon.awssdk.services.dynamodb.model.*

object DynamoAccountQueryFactory {
Expand Down
28 changes: 14 additions & 14 deletions ...t/repository/DynamoDbAccountRepository.kt → ...t/repository/DynamoDbAccountRepository.kt
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.vauthenticator.account.repository

import com.vauthenticator.account.Account
import com.vauthenticator.account.repository.AccountAuthorities.addAuthorities
import com.vauthenticator.account.repository.AccountAuthorities.removeAuthorities
import com.vauthenticator.account.repository.DynamoAccountConverter.fromDynamoToDomain
import com.vauthenticator.account.repository.DynamoAccountQueryFactory.deleteAccountRoleQueryFor
import com.vauthenticator.account.repository.DynamoAccountQueryFactory.findAccountQueryForUserName
import com.vauthenticator.account.repository.DynamoAccountQueryFactory.findAccountRoleByUserNameQueryFor
import com.vauthenticator.account.repository.DynamoAccountQueryFactory.findAllAccountQueryFor
import com.vauthenticator.account.repository.DynamoAccountQueryFactory.storeAccountQueryFor
import com.vauthenticator.account.repository.DynamoAccountQueryFactory.storeAccountRoleQueryFor
import com.vauthenticator.extentions.filterEmptyAccountMetadata
import com.vauthenticator.extentions.valueAsStringFor
package com.vauthenticator.server.account.repository

import com.vauthenticator.server.account.Account
import com.vauthenticator.server.account.repository.AccountAuthorities.addAuthorities
import com.vauthenticator.server.account.repository.AccountAuthorities.removeAuthorities
import com.vauthenticator.server.account.repository.DynamoAccountConverter.fromDynamoToDomain
import com.vauthenticator.server.account.repository.DynamoAccountQueryFactory.deleteAccountRoleQueryFor
import com.vauthenticator.server.account.repository.DynamoAccountQueryFactory.findAccountQueryForUserName
import com.vauthenticator.server.account.repository.DynamoAccountQueryFactory.findAccountRoleByUserNameQueryFor
import com.vauthenticator.server.account.repository.DynamoAccountQueryFactory.findAllAccountQueryFor
import com.vauthenticator.server.account.repository.DynamoAccountQueryFactory.storeAccountQueryFor
import com.vauthenticator.server.account.repository.DynamoAccountQueryFactory.storeAccountRoleQueryFor
import com.vauthenticator.server.extentions.filterEmptyAccountMetadata
import com.vauthenticator.server.extentions.valueAsStringFor
import software.amazon.awssdk.services.dynamodb.DynamoDbClient
import software.amazon.awssdk.services.dynamodb.model.AttributeValue
import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException
Expand Down
14 changes: 7 additions & 7 deletions ...unt/resetpassword/ResetAccountPassword.kt → ...unt/resetpassword/ResetAccountPassword.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.vauthenticator.account.resetpassword
package com.vauthenticator.server.account.resetpassword

import com.vauthenticator.account.repository.AccountRepository
import com.vauthenticator.account.tiket.InvalidTicketException
import com.vauthenticator.account.tiket.Ticket
import com.vauthenticator.account.tiket.TicketRepository
import com.vauthenticator.account.tiket.VerificationTicket
import com.vauthenticator.password.VAuthenticatorPasswordEncoder
import com.vauthenticator.server.account.repository.AccountRepository
import com.vauthenticator.server.account.tiket.InvalidTicketException
import com.vauthenticator.server.account.tiket.Ticket
import com.vauthenticator.server.account.tiket.TicketRepository
import com.vauthenticator.server.account.tiket.VerificationTicket
import com.vauthenticator.server.password.VAuthenticatorPasswordEncoder
import java.util.*

class ResetAccountPassword(
Expand Down
8 changes: 4 additions & 4 deletions ...nt/resetpassword/RestePasswordEndPoint.kt → ...nt/resetpassword/RestePasswordEndPoint.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.vauthenticator.account.resetpassword
package com.vauthenticator.server.account.resetpassword

import com.fasterxml.jackson.databind.ObjectMapper
import com.vauthenticator.account.tiket.VerificationTicket
import com.vauthenticator.extentions.clientAppId
import com.vauthenticator.oauth2.clientapp.ClientAppId
import com.vauthenticator.server.account.tiket.VerificationTicket
import com.vauthenticator.server.extentions.clientAppId
import com.vauthenticator.server.oauth2.clientapp.ClientAppId
import jakarta.servlet.http.HttpSession
import org.springframework.http.ResponseEntity
import org.springframework.http.ResponseEntity.*
Expand Down
10 changes: 5 additions & 5 deletions ...assword/SendResetPasswordMailChallenge.kt → ...assword/SendResetPasswordMailChallenge.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.vauthenticator.account.resetpassword
package com.vauthenticator.server.account.resetpassword

import com.vauthenticator.account.repository.AccountRepository
import com.vauthenticator.account.tiket.VerificationTicketFactory
import com.vauthenticator.mail.MailSenderService
import com.vauthenticator.oauth2.clientapp.*
import com.vauthenticator.server.account.repository.AccountRepository
import com.vauthenticator.server.account.tiket.VerificationTicketFactory
import com.vauthenticator.server.mail.MailSenderService
import com.vauthenticator.server.oauth2.clientapp.*

class SendResetPasswordMailChallenge(
private val clientApplicationRepository: ClientApplicationRepository,
Expand Down
2 changes: 1 addition & 1 deletion ...icator/account/signup/SignUpController.kt → ...server/account/signup/SignUpController.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vauthenticator.account.signup
package com.vauthenticator.server.account.signup

import org.springframework.stereotype.Controller
import org.springframework.ui.Model
Expand Down
20 changes: 10 additions & 10 deletions ...enticator/account/signup/SignUpUseCase.kt → ...or/server/account/signup/SignUpUseCase.kt
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.vauthenticator.account.signup
package com.vauthenticator.server.account.signup

import com.vauthenticator.account.Account
import com.vauthenticator.account.mailverification.SendVerifyMailChallenge
import com.vauthenticator.account.repository.AccountRepository
import com.vauthenticator.account.welcome.SayWelcome
import com.vauthenticator.oauth2.clientapp.ClientAppId
import com.vauthenticator.oauth2.clientapp.ClientApplicationRepository
import com.vauthenticator.oauth2.clientapp.InsufficientClientApplicationScopeException
import com.vauthenticator.oauth2.clientapp.Scope
import com.vauthenticator.password.VAuthenticatorPasswordEncoder
import com.vauthenticator.server.account.Account
import com.vauthenticator.server.account.mailverification.SendVerifyMailChallenge
import com.vauthenticator.server.account.repository.AccountRepository
import com.vauthenticator.server.account.welcome.SayWelcome
import com.vauthenticator.server.oauth2.clientapp.ClientAppId
import com.vauthenticator.server.oauth2.clientapp.ClientApplicationRepository
import com.vauthenticator.server.oauth2.clientapp.InsufficientClientApplicationScopeException
import com.vauthenticator.server.oauth2.clientapp.Scope
import com.vauthenticator.server.password.VAuthenticatorPasswordEncoder

open class SignUpUseCase(
private val clientAccountRepository: ClientApplicationRepository,
Expand Down
2 changes: 1 addition & 1 deletion ...om/vauthenticator/account/tiket/Ticket.kt → ...henticator/server/account/tiket/Ticket.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vauthenticator.account.tiket
package com.vauthenticator.server.account.tiket

import java.time.Duration

Expand Down
10 changes: 5 additions & 5 deletions ...ticator/account/tiket/TicketRepository.kt → .../server/account/tiket/TicketRepository.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.vauthenticator.account.tiket
package com.vauthenticator.server.account.tiket

import com.vauthenticator.extentions.asDynamoAttribute
import com.vauthenticator.extentions.filterEmptyAccountMetadata
import com.vauthenticator.extentions.valueAsLongFor
import com.vauthenticator.extentions.valueAsStringFor
import com.vauthenticator.server.extentions.asDynamoAttribute
import com.vauthenticator.server.extentions.filterEmptyAccountMetadata
import com.vauthenticator.server.extentions.valueAsLongFor
import com.vauthenticator.server.extentions.valueAsStringFor
import software.amazon.awssdk.services.dynamodb.DynamoDbClient
import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest
import software.amazon.awssdk.services.dynamodb.model.GetItemRequest
Expand Down
8 changes: 4 additions & 4 deletions ...ccount/tiket/VerificationTicketFactory.kt → ...ccount/tiket/VerificationTicketFactory.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vauthenticator.account.tiket
package com.vauthenticator.server.account.tiket

import com.vauthenticator.account.Account
import com.vauthenticator.oauth2.clientapp.ClientAppId
import com.vauthenticator.time.Clocker
import com.vauthenticator.server.account.Account
import com.vauthenticator.server.oauth2.clientapp.ClientAppId
import com.vauthenticator.server.time.Clocker
import java.time.Duration


Expand Down
8 changes: 4 additions & 4 deletions ...thenticator/account/welcome/SayWelcome.kt → ...ator/server/account/welcome/SayWelcome.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vauthenticator.account.welcome
package com.vauthenticator.server.account.welcome

import com.vauthenticator.account.AccountNotFoundException
import com.vauthenticator.account.repository.AccountRepository
import com.vauthenticator.mail.MailSenderService
import com.vauthenticator.server.account.AccountNotFoundException
import com.vauthenticator.server.account.repository.AccountRepository
import com.vauthenticator.server.mail.MailSenderService

class SayWelcome(
private val accountRepository: AccountRepository,
Expand Down
4 changes: 2 additions & 2 deletions ...or/account/welcome/WelcomeMailEndPoint.kt → ...er/account/welcome/WelcomeMailEndPoint.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vauthenticator.account.welcome
package com.vauthenticator.server.account.welcome

import com.vauthenticator.account.AccountNotFoundException
import com.vauthenticator.server.account.AccountNotFoundException
import org.springframework.http.ResponseEntity
import org.springframework.web.bind.annotation.ExceptionHandler
import org.springframework.web.bind.annotation.PathVariable
Expand Down
Loading

0 comments on commit 74f34f3

Please sign in to comment.