Merge pull request #50 from line/feature/settable-nonce

Add settable nonce

Author: onevdog

android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:7.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 

android/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-7.2-all.zip

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

@@ -63,13 +63,15 @@ class FlutterLineSdkPlugin : MethodCallHandler, PluginRegistry.ActivityResultLis
                 val scopes = call.argument("scopes") ?: emptyList<String>()
                 val isWebLogin = call.argument("onlyWebLogin") ?: false
                 val botPrompt  = call.argument("botPrompt") ?: "normal"
+                val idTokenNonce: String? = call.argument("idTokenNonce")
                 val loginRequestCode = call.argument<Int?>("loginRequestCode") ?: DEFAULT_ACTIVITY_RESULT_REQUEST_CODE
                 lineSdkWrapper.login(
                         loginRequestCode,
                         activity,
                         scopes = scopes,
                         onlyWebLogin = isWebLogin,
                         botPromptString = botPrompt,
+                        idTokenNonce = idTokenNonce,
                         result = result
                 )
             }

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

@@ -55,6 +55,7 @@ class LineSdkWrapper {
         scopes: List<String> = listOf("profile"),
         onlyWebLogin: Boolean = false,
         botPromptString: String = "normal",
+        idTokenNonce: String? = null,
         result: Result
     ) {
         runIfDebugBuild {
@@ -69,6 +70,7 @@ class LineSdkWrapper {
             .scopes(Scope.convertToScopeList(scopes))
             .apply {
                 botPrompt(LineAuthenticationParams.BotPrompt.valueOf(botPromptString))
+                idTokenNonce?.let { nonce(it) }
             }
             .build()
 

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

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.linecorp.linesdk.example">
+    package="com.linecorp.linesdk.sample">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

example/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

example/android/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.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

ios/Classes/SwiftFlutterLineSdkPlugin.swift

@@ -130,23 +130,23 @@ extension LineChannelMethod {
     }
 
     let scopes = (args["scopes"] as? [String])?.map { LoginPermission(rawValue: $0) } ?? [.profile]
-    let onlyWebLogin = (args["onlyWebLogin"] as? Bool) ?? false
-
-    var options: LoginManagerOptions = []
-    if onlyWebLogin { options = .onlyWebLogin }
-
+    
+    var parameters = LoginManager.Parameters()
+    parameters.onlyWebLogin = (args["onlyWebLogin"] as? Bool) ?? false
+    parameters.IDTokenNonce = args["idTokenNonce"] as? String
+      
     if let botPrompt = args["botPrompt"] as? String {
       switch botPrompt {
-      case "aggressive": options.insert(.botPromptAggressive)
-      case "normal": options.insert(.botPromptNormal)
+      case "aggressive": parameters.botPromptStyle = .aggressive
+      case "normal": parameters.botPromptStyle = .normal
       default: break
       }
     }
 
     LoginManager.shared.login(
       permissions: Set(scopes),
       in: nil,
-      options: options) { r in
+      parameters: parameters) { r in
         switch r {
         case .success(let value): result(value.json)
         case .failure(let error): result(error.flutterError)
@@ -173,7 +173,7 @@ extension LineChannelMethod {
   }
 
   func refreshToken(arguments: [String: Any]?, result: @escaping FlutterResult) {
-    API.refreshAccessToken { r in
+    API.Auth.refreshAccessToken { r in
       switch r {
       case .success(let value): result(value.json)
       case .failure(let error): result(error.flutterError)
@@ -182,7 +182,7 @@ extension LineChannelMethod {
   }
 
   func verifyAccessToken(arguments: [String: Any]?, result: @escaping FlutterResult) {
-    API.verifyAccessToken { r in
+    API.Auth.verifyAccessToken { r in
       switch r {
       case .success(let value): result(value.json)
       case .failure(let error): result(error.flutterError)

lib/src/line_sdk.dart

@@ -100,7 +100,8 @@ class LineSDK {
       'loginRequestCode': option?.requestCode,
       'scopes': scopes,
       'onlyWebLogin': option?.onlyWebLogin,
-      'botPrompt': option?.botPrompt
+      'botPrompt': option?.botPrompt,
+      'idTokenNonce': option?.idTokenNonce,
     }).then((value) => LoginResult._(_decodeJson(value)));
   }
 

lib/src/model/login_option.dart

@@ -42,6 +42,12 @@ class LoginOption {
   /// Request code that LINE login activity will be called with.
   int requestCode;
 
+  /// Sets the nonce value for ID token verification. This value is used when requesting user authorization
+  /// with `.openID` permission to prevent replay attacks to your backend server. If not set, LINE SDK will
+  /// generate a random value as the token nonce. Whether set or not, LINE SDK verifies against the nonce value
+  /// in received ID token locally.
+  String? idTokenNonce;
+
   LoginOption(this.onlyWebLogin, this.botPrompt,
       {this.requestCode = DEFAULT_ACTIVITY_RESULT_REQUEST_CODE});
 }