Commit 90cf3f80 authored by Ghitha Dinan's avatar Ghitha Dinan

add sso token

parent 43a35ff0
......@@ -2,8 +2,8 @@ package id.co.sangkuriang.inovasi.daerah.master.constant
import java.io.File
//const val ROOT_DIR = "D:\\app-files\\inovasi_daerah_master\\files\\"
const val ROOT_DIR = "/home/inovasi-daerah/data/files/inovasi_daerah_master/"
const val ROOT_DIR = "D:\\app-files\\inovasi_daerah_master\\files\\"
//const val ROOT_DIR = "/home/inovasi-daerah/data/files/inovasi_daerah_master/"
//const val ROOT_DIR = "/home/inovasi-daerah-prod/data/files/inovasi_daerah_master/"
val UPLOAD_DIR = "${ROOT_DIR}uploads${File.separator}"
......
......@@ -2,9 +2,9 @@ package id.co.sangkuriang.inovasi.daerah.master.constant
const val TOKEN_PREFIX = "Bearer "
const val HEADER_STRING = "Authorization"
//const val AUTH_URL = "http://localhost:8081/auth"
const val AUTH_URL = "http://localhost:8081/auth"
//const val AUTH_URL = "https://auth.inovasi-daerah.dev.layanan.go.id/auth"
const val AUTH_URL = "http://inovasi-daerah-auth.inovasi-daerah.svc.cluster.local:8081/auth"
//const val AUTH_URL = "http://inovasi-daerah-auth.inovasi-daerah.svc.cluster.local:8081/auth"
//const val AUTH_URL = "http://inovasi-daerah-auth-prod.inovasi-daerah-prod.svc.cluster.local:8081/auth"
val USER_ALLOWED_PATH = emptyList<String>()
......
package id.co.sangkuriang.inovasi.daerah.master.constant
//const val APPLICATION_URL = "http://localhost:8082"
const val APPLICATION_URL = "http://localhost:8082"
//const val APPLICATION_URL = "https://application.inovasi-daerah.dev.layanan.go.id"
const val APPLICATION_URL = "http://inovasi-daerah-application.inovasi-daerah.svc.cluster.local:8082"
//const val APPLICATION_URL = "http://inovasi-daerah-application.inovasi-daerah.svc.cluster.local:8082"
//const val APPLICATION_URL = "http://inovasi-daerah-application-prod.inovasi-daerah-prod.svc.cluster.local:8082"
......@@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature
import com.fasterxml.jackson.databind.ObjectMapper
import id.co.sangkuriang.inovasi.daerah.master.constant.*
import id.co.sangkuriang.inovasi.daerah.master.helpers.RequestHelpers
import id.co.sangkuriang.inovasi.daerah.master.model.jwt.UserJwtSso
import id.co.sangkuriang.inovasi.daerah.master.model.jwt.UserJwt
import id.co.sangkuriang.inovasi.daerah.master.model.response.ReturnData
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
import org.springframework.security.core.context.SecurityContextHolder
......@@ -97,8 +97,8 @@ class TokenInterceptor : Filter {
val objectMapper = ObjectMapper()
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
val users: UserJwtSso =
objectMapper.readValue(objectMapper.writeValueAsString(reqAuthDetail.data), UserJwtSso::class.java)
val users: UserJwt =
objectMapper.readValue(objectMapper.writeValueAsString(reqAuthDetail.data), UserJwt::class.java)
var audience = "user-admin"
if (users.roleId == ROLE_USER_ID) {
......
......@@ -4,7 +4,7 @@ import id.co.sangkuriang.inovasi.daerah.master.pojo.Province
import id.co.sangkuriang.inovasi.daerah.master.pojo.Regency
import id.co.sangkuriang.inovasi.daerah.master.pojo.Role
data class UserJwtSso(
data class UserJwt(
var id: String? = null,
......
......@@ -4,7 +4,8 @@ import com.fasterxml.jackson.databind.DeserializationFeature
import com.fasterxml.jackson.databind.ObjectMapper
import id.co.sangkuriang.inovasi.daerah.master.constant.UPLOAD_ICON_APPLICATION_CATEGORY_DIR
import id.co.sangkuriang.inovasi.daerah.master.constant.UPLOAD_IMAGE_APPLICATION_CATEGORY_DIR
import id.co.sangkuriang.inovasi.daerah.master.model.jwt.UserJwtSso
import id.co.sangkuriang.inovasi.daerah.master.model.jwt.UserJwt
import id.co.sangkuriang.inovasi.daerah.master.pojo.Users
import org.apache.commons.io.FileUtils
import org.springframework.security.core.context.SecurityContextHolder
import org.springframework.web.multipart.MultipartFile
......@@ -14,12 +15,22 @@ import java.net.MalformedURLException
import java.net.URL
import javax.servlet.http.HttpServletRequest
fun getUsersLogin(): UserJwtSso? {
fun getUsersJwt(): UserJwt? {
return try {
val principal = SecurityContextHolder.getContext().authentication.principal as Any
val objectMapper = ObjectMapper()
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
objectMapper.readValue(principal.toString(), UserJwtSso::class.java)
objectMapper.readValue(principal.toString(), UserJwt::class.java)
} catch (e: Exception) {
null
}
}
fun getUserLogin(): Users? {
return try {
val objectMapper = ObjectMapper()
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
objectMapper.readValue(objectMapper.writeValueAsString(getUserLogin()), Users::class.java)
} catch (e: Exception) {
null
}
......
......@@ -5,14 +5,14 @@ server.port=8080
# DATABASE CONFIG
# local
#spring.datasource.url=jdbc:postgresql://localhost:5432/inovasi_daerah_backup
#spring.datasource.username=postgres
#spring.datasource.password=root
spring.datasource.url=jdbc:postgresql://localhost:5432/inovasi_daerah_backup
spring.datasource.username=postgres
spring.datasource.password=root
# dev
spring.datasource.url=jdbc:postgresql://pg-dev.spbe.sangkuriang.co.id:5432/inovasi_daerah_db
spring.datasource.username=u_inovasi_daerah
spring.datasource.password=wV9Tnx6S8TmmUYXdgkmN4pzreSD3RE
#spring.datasource.url=jdbc:postgresql://pg-dev.spbe.sangkuriang.co.id:5432/inovasi_daerah_db
#spring.datasource.username=u_inovasi_daerah
#spring.datasource.password=wV9Tnx6S8TmmUYXdgkmN4pzreSD3RE
# prod
#spring.datasource.url=jdbc:postgresql://pg.spbe-prd.sangkuriang.co.id:5432/inovasi_daerah_db
......
......@@ -2,8 +2,8 @@
<!-- configuration file for LogBack (slf4J implementation)
See here for more details: http://gordondickens.com/wordpress/2013/03/27/sawing-through-the-java-loggers/ -->
<configuration scan="true" scanPeriod="30 seconds">
<!-- <property name="DEV_HOME" value="D://app-files//inovasi_daerah_master//log"/>-->
<property name="DEV_HOME" value="/home/inovasi-daerah/data/log/inovasi_daerah_master"/>
<property name="DEV_HOME" value="D://app-files//inovasi_daerah_master//log"/>
<!-- <property name="DEV_HOME" value="/home/inovasi-daerah/data/log/inovasi_daerah_master"/>-->
<!-- <property name="DEV_HOME" value="/home/inovasi-daerah-prod/data/log/inovasi_daerah_master"/>-->
<appender name="ACCESS-LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment