Skip to content

Commit f6460eb

Browse files
committed
Implement setable idTokenNonce for Android
And also upgrade build tool version
1 parent fd10347 commit f6460eb

File tree

7 files changed

+9
-5
lines changed

7 files changed

+9
-5
lines changed

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.3.1'
12+
classpath 'com.android.tools.build:gradle:7.0.1'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
}
1515

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

android/src/main/kotlin/com/linecorp/flutter_line_sdk/FlutterLineSdkPlugin.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,15 @@ class FlutterLineSdkPlugin : MethodCallHandler, PluginRegistry.ActivityResultLis
6363
val scopes = call.argument("scopes") ?: emptyList<String>()
6464
val isWebLogin = call.argument("onlyWebLogin") ?: false
6565
val botPrompt = call.argument("botPrompt") ?: "normal"
66+
val idTokenNonce: String? = call.argument("idTokenNonce")
6667
val loginRequestCode = call.argument<Int?>("loginRequestCode") ?: DEFAULT_ACTIVITY_RESULT_REQUEST_CODE
6768
lineSdkWrapper.login(
6869
loginRequestCode,
6970
activity,
7071
scopes = scopes,
7172
onlyWebLogin = isWebLogin,
7273
botPromptString = botPrompt,
74+
idTokenNonce = idTokenNonce,
7375
result = result
7476
)
7577
}

android/src/main/kotlin/com/linecorp/flutter_line_sdk/LineSdkWrapper.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class LineSdkWrapper {
5555
scopes: List<String> = listOf("profile"),
5656
onlyWebLogin: Boolean = false,
5757
botPromptString: String = "normal",
58+
idTokenNonce: String? = null,
5859
result: Result
5960
) {
6061
runIfDebugBuild {
@@ -69,6 +70,7 @@ class LineSdkWrapper {
6970
.scopes(Scope.convertToScopeList(scopes))
7071
.apply {
7172
botPrompt(LineAuthenticationParams.BotPrompt.valueOf(botPromptString))
73+
idTokenNonce.let { nonce(it) }
7274
}
7375
.build()
7476

example/android/app/src/profile/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.linecorp.linesdk.example">
2+
package="com.linecorp.linesdk.sample">
33
<!-- Flutter needs it to communicate with the running application
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->

example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.5.0'
9+
classpath 'com.android.tools.build:gradle:7.0.1'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}

example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

0 commit comments

Comments
 (0)