Skip to content

Commit e89b755

Browse files
committed
resolves PR comments
1 parent 0a4c311 commit e89b755

File tree

3 files changed

+11
-37
lines changed

3 files changed

+11
-37
lines changed

auth0/src/main/java/com/auth0/android/authentication/storage/SecureCredentialsManager.kt

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -257,45 +257,14 @@ public class SecureCredentialsManager @VisibleForTesting(otherwise = VisibleForT
257257
}
258258
}
259259

260-
private fun retrieveCredentials() : Credentials? {
261-
val encryptedEncoded = storage.retrieveString(KEY_CREDENTIALS)
262-
if (encryptedEncoded.isNullOrBlank()) {
263-
return null
264-
}
265-
val encrypted = Base64.decode(encryptedEncoded, Base64.DEFAULT)
266-
val json: String
267-
try {
268-
json = String(crypto.decrypt(encrypted))
269-
} catch (e: IncompatibleDeviceException) {
270-
return null
271-
} catch (e: CryptoException) {
272-
return null
273-
}
274-
val bridgeCredentials = gson.fromJson(json, OptionalCredentials::class.java)/* OPTIONAL CREDENTIALS
275-
* This bridge is required to prevent users from being logged out when
276-
* migrating from Credentials with optional Access Token and ID token
277-
*/
278-
val credentials = Credentials(
279-
bridgeCredentials.idToken.orEmpty(),
280-
bridgeCredentials.accessToken.orEmpty(),
281-
bridgeCredentials.type.orEmpty(),
282-
bridgeCredentials.refreshToken,
283-
bridgeCredentials.expiresAt ?: Date(),
284-
bridgeCredentials.scope
285-
)
286-
return credentials
287-
}
288-
289260
public override val userProfile: UserProfile?
290261
get() {
291-
val credentials: Credentials? = retrieveCredentials()
262+
val credentials: Credentials? = getExistingCredentials()
292263
// Handle null credentials gracefully
293264
if (credentials == null) {
294265
return null
295266
}
296-
val (_, payload) = Jwt.splitToken(credentials.idToken)
297-
val gson = GsonProvider.gson
298-
return gson.fromJson(Jwt.decodeBase64(payload), UserProfile::class.java)
267+
return credentials.user
299268
}
300269

301270
/**

auth0/src/test/java/com/auth0/android/authentication/storage/SecureCredentialsManagerTest.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -832,6 +832,11 @@ public class SecureCredentialsManagerTest {
832832
manager.saveCredentials(credentials)
833833
}
834834

835+
// @Test
836+
// public fun retrieveCredentials() {
837+
//
838+
// }
839+
835840
/*
836841
* GET Credentials tests
837842
*/

gradle/jacoco.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ afterEvaluate {
4444
sourceDirectories.from = ['src/main/java'].plus(android.sourceSets[name].java.srcDirs)
4545
executionData.from = "${buildDir}/jacoco/${testTaskName}.exec"
4646

47-
reports {
48-
xml.enabled = true
49-
html.enabled = true
50-
}
47+
// reports {
48+
// xml.enabled = true
49+
// html.enabled = true
50+
// }
5151
}
5252
jacocoTestReportTask.dependsOn reportTask
5353
}

0 commit comments

Comments
 (0)