Merge pull request #64 from YoungMaker/Sprint

Access control version into master

Author: hwilling

.gitignore

@@ -2,8 +2,8 @@
 /build/
 !gradle/wrapper/gradle-wrapper.jar
 
-/src/main/resources/application.yml
-/src/main/resources/application.properties
+src/main/resources/application.yml
+src/main/resources/application.properties
 application.yml
 application.properties
 

build.gradle

@@ -38,7 +38,7 @@ compileTestKotlin {
 jar {
 	baseName = "api-iorc"
 	group    = "edu.ycp.cs482.iorcapi"
-	version  = "0.0.1-dev"
+	version  = "0.1.0-dep"
 	manifest { attributes "Main-Class": "edu.ycp.cs482.IorcApiApplication" }
 }
 
@@ -80,9 +80,8 @@ dependencies {
 	compile "org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
 	//this needs to be here for some reason otherwise bean registration fails
 	compile("com.fasterxml.jackson.module:jackson-module-kotlin:2.9.2")
-
+	compile('commons-validator:commons-validator:1.6')
 	compile('com.graphql-java:graphql-spring-boot-starter:4.0.0')
-
 	compile('com.graphql-java:graphiql-spring-boot-starter:4.0.0')
 	compile('com.graphql-java:graphql-java-tools:4.3.0')
 	compile('org.springframework.cloud:spring-cloud-starter-oauth2')
@@ -91,14 +90,12 @@ dependencies {
 	compile('org.springframework.boot:spring-boot-starter-data-mongodb')
 	compile('org.springframework.boot:spring-boot-starter-data-rest')
 	compile('org.springframework.retry:spring-retry')
-	//compile('org.springframework.boot:spring-boot-starter-security')
 	compile('org.springframework.boot:spring-boot-starter-web')
 	compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
 	compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
-	testCompile('org.springframework.boot:spring-boot-starter-test')
-	//testCompile('org.springframework.security:spring-security-test')
-
+	compile('io.jsonwebtoken:jjwt:0.9.0')
 	compile('com.mmnaseri.utils:spring-data-mock:1.1.4')
+	testCompile('org.springframework.boot:spring-boot-starter-test')
 
 }
 

src/main/kotlin/edu/ycp/cs482/iorcapi/IorcApiApplication.kt

@@ -6,6 +6,8 @@ import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.autoconfigure.SpringBootApplication
 
+
+
 //@EnableAutoConfiguration
 @SpringBootApplication
 open class IorcApiApplication : CommandLineRunner {

src/main/kotlin/edu/ycp/cs482/iorcapi/config/ApplicationConfig.kt

@@ -3,6 +3,8 @@ package edu.ycp.cs482.iorcapi.config
 import com.mongodb.Mongo
 import com.mongodb.MongoClient
 import com.mongodb.MongoClientURI
+import graphql.GraphQLError
+import graphql.servlet.GraphQLErrorHandler
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration

src/main/kotlin/edu/ycp/cs482/iorcapi/error/CustomGraphQlErrorHandler.kt

@@ -0,0 +1,17 @@
+package edu.ycp.cs482.iorcapi.error
+
+import graphql.GraphQLError
+import graphql.servlet.GenericGraphQLError
+import graphql.servlet.GraphQLErrorHandler
+import org.springframework.stereotype.Component
+
+@Component
+class CustomGraphQlErrorHandler: GraphQLErrorHandler {
+
+    override fun processErrors(errors: MutableList<GraphQLError>?): MutableList<GraphQLError> {
+        val errorList = mutableListOf<GraphQLError>()
+        errors!!.mapTo(errorList) { GenericGraphQLError(it.message) }
+        return errorList
+    }
+
+}

src/main/kotlin/edu/ycp/cs482/iorcapi/error/SimpleDataFetcherExceptionHandler.kt

@@ -4,12 +4,14 @@ import graphql.ExceptionWhileDataFetching
 import graphql.execution.DataFetcherExceptionHandler
 import graphql.execution.DataFetcherExceptionHandlerParameters
 import graphql.execution.ExecutionPath
+import graphql.execution.SimpleDataFetcherExceptionHandler
 import graphql.language.SourceLocation
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
 
-
-class SimpleDataFetcherExceptionHandler : DataFetcherExceptionHandler {
+@Component
+class CustomDataFetcherExceptionHandler : SimpleDataFetcherExceptionHandler() {
 
     override fun accept(handlerParameters: DataFetcherExceptionHandlerParameters) {
         val exception = handlerParameters.exception
@@ -23,6 +25,6 @@ class SimpleDataFetcherExceptionHandler : DataFetcherExceptionHandler {
 
     companion object {
 
-        private val log = LoggerFactory.getLogger(SimpleDataFetcherExceptionHandler::class.java)
+        private val log = LoggerFactory.getLogger(CustomDataFetcherExceptionHandler::class.java)
     }
 }