diff --git a/alexa-plugin/build.gradle b/alexa-plugin/build.gradle
index 865f077..5518570 100644
--- a/alexa-plugin/build.gradle
+++ b/alexa-plugin/build.gradle
@@ -6,9 +6,9 @@ version rootProject.ext.versions.alexa
description 'The Alexa plugin for Dialog to write voice applications for Dialogflow and Alexa.'
dependencies {
- implementation project(":core")
+ implementation project(path: ":core", configuration: 'default')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
- implementation "com.amazon.alexa:ask-sdk-core:2.19.0"
+ implementation "com.amazon.alexa:ask-sdk-core:2.21.0"
}
dokka {
diff --git a/alexa-spring-plugin/build.gradle b/alexa-spring-plugin/build.gradle
index db17552..a8194f5 100644
--- a/alexa-spring-plugin/build.gradle
+++ b/alexa-spring-plugin/build.gradle
@@ -16,14 +16,14 @@ buildscript {
}
dependencies {
- implementation project(':core')
- implementation project(':alexa-plugin')
- implementation project(':spring-plugin')
+ implementation project(path: ':core', configuration: 'default')
+ implementation project(path: ':alexa-plugin', configuration: 'default')
+ implementation project(path: ':spring-plugin', configuration: 'default')
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
implementation 'org.jetbrains.kotlin:kotlin-reflect'
- implementation 'org.springframework:spring-context:5.1.8.RELEASE'
- implementation 'com.amazon.alexa:ask-sdk-core:2.19.0'
+ implementation 'org.springframework:spring-context:5.1.9.RELEASE'
+ implementation 'com.amazon.alexa:ask-sdk-core:2.21.0'
}
task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
diff --git a/build.gradle b/build.gradle
index 392711e..177cc48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.github.ben-manes.versions'
buildscript {
ext.versions = [:]
- ext.versions.kotlin = '1.3.41'
+ ext.versions.kotlin = '1.3.50'
ext.versions.dokka = '0.9.18'
ext.versions.core = '1.0.4'
ext.versions.alexa = '1.0.2'
@@ -19,7 +19,7 @@ buildscript {
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
- classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
+ classpath 'com.github.ben-manes:gradle-versions-plugin:0.25.0'
classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
classpath 'com.novoda:bintray-release:SNAPSHOT-13'
}
diff --git a/core/src/main/kotlin/org/rewedigital/dialog/handler/DialogflowHandler.kt b/core/src/main/kotlin/org/rewedigital/dialog/handler/DialogflowHandler.kt
index 077a955..d1f33fc 100644
--- a/core/src/main/kotlin/org/rewedigital/dialog/handler/DialogflowHandler.kt
+++ b/core/src/main/kotlin/org/rewedigital/dialog/handler/DialogflowHandler.kt
@@ -28,7 +28,7 @@ class DialogflowHandler(private val webhookRequest: WebhookRequest) {
/**
* The stored user data aka user storage.
- * @see https://developers.google.com/actions/assistant/save-data#json
+ * @see Assistant documentation
*/
val userData: MutableMap = run {
val userData = webhookRequest.originalDetectIntentRequest?.payload?.user?.userStorage
@@ -97,6 +97,14 @@ class DialogflowHandler(private val webhookRequest: WebhookRequest) {
val accessToken: String?
get() = webhookRequest.originalDetectIntentRequest?.payload?.user?.accessToken
+ /**
+ * True if the userVerificationStatus is VERIFIED
+ * False if the userVerificationStatus is GUEST or null
+ * @see Assistant documentation
+ */
+ val isUserVerified: Boolean
+ get() = webhookRequest.originalDetectIntentRequest?.payload?.user?.userVerificationStatus == "VERIFIED"
+
/**
* Returns an [DialogflowResponseBuilder] which can be used to construct a complete webhook response
* containing speech and visual components.
diff --git a/core/src/main/kotlin/org/rewedigital/dialog/model/google/User.kt b/core/src/main/kotlin/org/rewedigital/dialog/model/google/User.kt
index 0d838e1..59a5583 100644
--- a/core/src/main/kotlin/org/rewedigital/dialog/model/google/User.kt
+++ b/core/src/main/kotlin/org/rewedigital/dialog/model/google/User.kt
@@ -9,7 +9,8 @@ data class User(
val permissions: List?,
val locale: String?,
val lastSeen: String?,
- var userStorage: String?
+ var userStorage: String?,
+ val userVerificationStatus: String?
) {
data class Profile(
val displayName: String?,
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ba125a3..ef829ac 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
diff --git a/konversation-plugin/build.gradle b/konversation-plugin/build.gradle
index 9588c72..b39c891 100644
--- a/konversation-plugin/build.gradle
+++ b/konversation-plugin/build.gradle
@@ -6,10 +6,10 @@ version rootProject.ext.versions.konversation_plugin
description 'This is the Konversation plugin for Dialog to write voice applications fast.'
dependencies {
- implementation project(":core")
+ implementation project(path: ":core", configuration: 'default')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
- compile 'org.rewedigital.voice:konversation:1.0-rc1'
+ compile 'org.rewedigital.voice:konversation:1.0.1'
}
task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
diff --git a/spring-plugin/build.gradle b/spring-plugin/build.gradle
index f9266e4..7fe18f4 100644
--- a/spring-plugin/build.gradle
+++ b/spring-plugin/build.gradle
@@ -16,11 +16,11 @@ version rootProject.ext.versions.spring_plugin
description 'This is the Spring plugin from Dialog to write voice applications fast.'
dependencies {
- implementation project(':core')
+ implementation project(path: ':core', configuration: 'default')
implementation 'org.jetbrains.kotlin:kotlin-reflect'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
- implementation 'org.springframework:spring-context:5.1.8.RELEASE'
+ implementation 'org.springframework:spring-context:5.1.9.RELEASE'
}
dokka {
diff --git a/spring-sample/build.gradle b/spring-sample/build.gradle
index 95f7145..4bc0df0 100644
--- a/spring-sample/build.gradle
+++ b/spring-sample/build.gradle
@@ -3,7 +3,7 @@ version '1.0.0-SNAPSHOT'
buildscript {
ext {
- springBootVersion = '2.1.6.RELEASE'
+ springBootVersion = '2.1.8.RELEASE'
}
repositories {
jcenter()
@@ -35,15 +35,15 @@ compileTestKotlin {
}
dependencies {
- def askSdkVersion = '2.19.0'
+ def askSdkVersion = '2.21.0'
- implementation project(':core')
- implementation project(':ssml-builder')
- implementation project(':ssml-plugin')
- implementation project(':spring-plugin')
- implementation project(':konversation-plugin')
- implementation project(':alexa-plugin')
- implementation project(':alexa-spring-plugin')
+ implementation project(path: ':core', configuration: 'default')
+ implementation project(path: ':ssml-builder', configuration: 'default')
+ implementation project(path: ':ssml-plugin', configuration: 'default')
+ implementation project(path: ':spring-plugin', configuration: 'default')
+ implementation project(path: ':konversation-plugin', configuration: 'default')
+ implementation project(path: ':alexa-plugin', configuration: 'default')
+ implementation project(path: ':alexa-spring-plugin', configuration: 'default')
implementation('org.springframework.boot:spring-boot-starter-web')
implementation('com.fasterxml.jackson.module:jackson-module-kotlin')
diff --git a/ssml-plugin/build.gradle b/ssml-plugin/build.gradle
index dad1188..64216ed 100644
--- a/ssml-plugin/build.gradle
+++ b/ssml-plugin/build.gradle
@@ -9,8 +9,8 @@ apply from: '../docu.gradle'
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
- implementation project(':core')
- implementation project(':ssml-builder')
+ implementation project(path: ':core', configuration: 'default')
+ implementation project(path: ':ssml-builder', configuration: 'default')
}
dokka {