Merge pull request #32 from Web3Auth/feat/id_token

Return new parameters

Author: chaitanyapotti

.idea/gradle.xml

@@ -166,7 +166,6 @@ data class Web3AuthOptions(
 
 data class LoginParams(
     val loginProvider: Provider,
-    val reLogin: Boolean? = null,
     val skipTKey: Boolean? = null,
     val extraLoginOptions: ExtraLoginOptions? = null,
     val redirectUrl: Uri? = null,

README.md

@@ -48,16 +48,16 @@ android {
 dependencies {
     // Default
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     // Completable Futures support
     implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.4'
 
     // Encoding
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.9.0'
 
     // Web3Auth
     implementation project(":core")

app/build.gradle

@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlin_version = "1.6.0"
+    ext.kotlin_version = "1.7.10"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

build.gradle

@@ -34,8 +34,8 @@ android {
 dependencies {
     // Default
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
 
     // Completable Futures support
     implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.4'
@@ -44,7 +44,7 @@ dependencies {
     implementation 'androidx.browser:browser:1.4.0'
 
     // Encoding
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.9.0'
 
     // Test
     testImplementation 'junit:junit:4.+'

core/build.gradle

@@ -0,0 +1,10 @@
+package com.web3auth.core.types
+
+import com.google.gson.annotations.SerializedName
+
+enum class Curve {
+    @SerializedName("secp256k1")
+    SECP256K1,
+    @SerializedName("ed25519")
+    ED25519
+}

core/src/main/java/com/web3auth/core/types/Curve.kt

@@ -5,10 +5,11 @@ import com.web3auth.core.Web3Auth
 
 data class LoginParams (
     val loginProvider: Provider,
-    val relogin: Boolean? = null,
     val dappShare: String? = null,
     val extraLoginOptions: ExtraLoginOptions? = null,
     val redirectUrl: Uri? = null,
     val appState: String? = null,
-    val mfaLevel: MFALevel? = null
+    val mfaLevel: MFALevel? = null,
+    val sessionTime: Int? = null,
+    val curve: Curve? = null
 )

core/src/main/java/com/web3auth/core/types/LoginParams.kt

@@ -3,12 +3,16 @@ package com.web3auth.core.types
 import androidx.annotation.Keep
 
 @Keep
-data class UserInfo (var email: String = "",
+data class UserInfo (
+    var email: String = "",
     var name: String = "",
     var profileImage: String = "",
     var aggregateVerifier: String = "",
     var verifier: String = "",
     var verifierId: String = "",
     var typeOfLogin: String = "",
-    var dappShare: String = ""
+    var dappShare: String = "",
+    var idToken: String = "",
+    var oAuthIdToken: String = "",
+    var oAuthAccessToken: String = ""
 )

core/src/main/java/com/web3auth/core/types/UserInfo.kt

@@ -7,5 +7,6 @@ data class Web3AuthResponse(
     val privKey: String? = null,
     val ed25519PrivKey: String? = null,
     val userInfo: UserInfo? = null,
-    val error: String? = null
+    val error: String? = null,
+    val sessionId: String? = null
 )

core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt

@@ -1,6 +1,6 @@
 #Mon Nov 22 12:32:04 SGT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME