Clean up native auth msal logging

msal/src/main/java/com/microsoft/identity/nativeauth/NativeAuthPublicClientApplication.kt

@@ -120,7 +120,7 @@ class NativeAuthPublicClientApplication(
             LogSession.logMethodCall(
                 tag = TAG,
                 correlationId = null,
-                methodName = "${TAG}.getCurrentAccountInternal"
+                methodName = "${TAG}.getCurrentAccountInternal(config: NativeAuthPublicClientApplicationConfiguration)"
             )
 
             val params = CommandParametersAdapter.createCommandParameters(
@@ -164,7 +164,7 @@ class NativeAuthPublicClientApplication(
             LogSession.logMethodCall(
                 tag = TAG,
                 correlationId = null,
-                methodName = "${TAG}.getAccountFromICacheRecordsList"
+                methodName = "${TAG}.getAccountFromICacheRecordsList(cacheRecords: List<ICacheRecord?>?)"
             )
             if (cacheRecords.isNullOrEmpty()) {
                 return null
@@ -230,6 +230,11 @@ class NativeAuthPublicClientApplication(
      * @return [com.microsoft.identity.nativeauth.statemachine.states.AccountState] if there is a signed in account, null otherwise.
      */
     override fun getCurrentAccount(callback: GetCurrentAccountCallback) {
+        LogSession.logMethodCall(
+            tag = TAG,
+            correlationId = null,
+            methodName = "${TAG}.getCurrentAccount(callback: GetCurrentAccountCallback)"
+        )
         pcaScope.launch {
             try {
                 val result = getCurrentAccount()
@@ -246,6 +251,11 @@ class NativeAuthPublicClientApplication(
      * @return [com.microsoft.identity.nativeauth.statemachine.states.AccountState] if there is a signed in account, null otherwise.
      */
     override suspend fun getCurrentAccount(): GetAccountResult {
+        LogSession.logMethodCall(
+            tag = TAG,
+            correlationId = null,
+            methodName = "${TAG}.getCurrentAccount"
+        )
         return withContext(Dispatchers.IO) {
             try {
                 val account = getCurrentAccountInternal(nativeAuthConfig)
@@ -291,7 +301,7 @@ class NativeAuthPublicClientApplication(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = null,
-            methodName = "${TAG}.signIn"
+            methodName = "${TAG}.signIn(username: String, password: CharArray?, scopes: List<String>?, callback: SignInCallback)"
         )
         pcaScope.launch {
             try {
@@ -321,7 +331,7 @@ class NativeAuthPublicClientApplication(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = null,
-            methodName = "${TAG}.signIn"
+            methodName = "${TAG}.signIn(username: String, password: CharArray?, scopes: List<String>?)"
         )
         return withContext(Dispatchers.IO) {
             try {
@@ -373,6 +383,7 @@ class NativeAuthPublicClientApplication(
                             } else {
                                 Logger.warnWithObject(
                                     TAG,
+                                    result.correlationId,
                                     "Sign in received unexpected result: ",
                                     result
                                 )
@@ -525,7 +536,7 @@ class NativeAuthPublicClientApplication(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = null,
-            methodName = "${TAG}.signUp"
+            methodName = "${TAG}.signUp(username: String, password: CharArray?, attributes: UserAttributes?, callback: SignUpCallback)"
         )
         pcaScope.launch {
             try {
@@ -554,7 +565,7 @@ class NativeAuthPublicClientApplication(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = null,
-            methodName = "${TAG}.signUp"
+            methodName = "${TAG}.signUp(username: String, password: CharArray?, attributes: UserAttributes?)"
         )
         var hasPassword = password?.isNotEmpty() == true
 
@@ -637,6 +648,7 @@ class NativeAuthPublicClientApplication(
                             if (hasPassword) {
                                 Logger.warnWithObject(
                                     TAG,
+                                    result.correlationId,
                                     "Sign up using password received unexpected result: ",
                                     result
                                 )
@@ -677,6 +689,7 @@ class NativeAuthPublicClientApplication(
                             } else {
                                 Logger.warnWithObject(
                                     TAG,
+                                    result.correlationId,
                                     "Sign up received unexpected result: ",
                                     result
                                 )
@@ -759,7 +772,7 @@ class NativeAuthPublicClientApplication(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = null,
-            methodName = "${TAG}.resetPassword"
+            methodName = "${TAG}.resetPassword(username: String, callback: ResetPasswordCallback)"
         )
         pcaScope.launch {
             try {

msal/src/main/java/com/microsoft/identity/nativeauth/NativeAuthPublicClientApplicationConfiguration.kt

@@ -28,9 +28,8 @@ import com.microsoft.identity.client.PublicClientApplicationConfiguration
 import com.microsoft.identity.client.configuration.AccountMode
 import com.microsoft.identity.client.exception.MsalClientException
 import com.microsoft.identity.common.java.authorities.CIAMAuthority
-import com.microsoft.identity.common.java.nativeauth.authorities.NativeAuthCIAMAuthority
-import com.microsoft.identity.common.java.logging.LogSession
 import com.microsoft.identity.common.java.logging.Logger
+import com.microsoft.identity.common.java.nativeauth.authorities.NativeAuthCIAMAuthority
 import com.microsoft.identity.common.java.nativeauth.providers.NativeAuthConstants
 import lombok.Getter
 import lombok.experimental.Accessors

msal/src/main/java/com/microsoft/identity/nativeauth/statemachine/states/AccountState.kt

@@ -90,7 +90,7 @@ class AccountState private constructor(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = null,
-            methodName = "$TAG.signOut"
+            methodName = "${TAG}.signOut(callback: SignOutCallback)"
         )
         NativeAuthPublicClientApplication.pcaScope.launch {
             try {
@@ -112,7 +112,7 @@ class AccountState private constructor(
                 LogSession.logMethodCall(
                     tag = TAG,
                     correlationId = null,
-                    methodName = "$TAG.signOut.withContext"
+                    methodName = "${TAG}.signOut()"
                 )
 
                 val account: IAccount =
@@ -220,7 +220,7 @@ class AccountState private constructor(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = null,
-            methodName = "$TAG.getAccessToken"
+            methodName = "${TAG}.getAccessToken(forceRefresh: Boolean = ${forceRefresh}, callback: GetAccessTokenCallback)"
         )
         NativeAuthPublicClientApplication.pcaScope.launch {
             try {
@@ -278,7 +278,7 @@ class AccountState private constructor(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = null,
-            methodName = "$TAG.getAccessToken"
+            methodName = "${TAG}.getAccessToken(forceRefresh: Boolean = ${forceRefresh}, scopes: List<String>, callback: GetAccessTokenCallback)"
         )
         NativeAuthPublicClientApplication.pcaScope.launch {
             try {
@@ -295,7 +295,7 @@ class AccountState private constructor(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = null,
-            methodName = "$TAG.getAccessToken(forceRefresh: Boolean)"
+            methodName = "${TAG}.getAccessTokenInternal(forceRefresh: Boolean = ${forceRefresh}, scopes: List<String>)"
         )
 
         return withContext(Dispatchers.IO) {

msal/src/main/java/com/microsoft/identity/nativeauth/statemachine/states/ResetPasswordStates.kt

@@ -95,7 +95,7 @@ class ResetPasswordCodeRequiredState internal constructor(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = correlationId,
-            methodName = "${TAG}.submitCode"
+            methodName = "${TAG}.submitCode(code: String, callback: SubmitCodeCallback)"
         )
         NativeAuthPublicClientApplication.pcaScope.launch {
             try {
@@ -357,7 +357,7 @@ class ResetPasswordPasswordRequiredState internal constructor(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = correlationId,
-            methodName = "${TAG}.submitPassword"
+            methodName = "${TAG}.submitPassword(password: CharArray, callback: SubmitPasswordCallback)"
         )
         NativeAuthPublicClientApplication.pcaScope.launch {
             try {

msal/src/main/java/com/microsoft/identity/nativeauth/statemachine/states/SignInStates.kt

@@ -102,7 +102,7 @@ class SignInCodeRequiredState internal constructor(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = correlationId,
-            methodName = "${TAG}.submitCode"
+            methodName = "${TAG}.submitCode(code: String, callback: SubmitCodeCallback)"
         )
         NativeAuthPublicClientApplication.pcaScope.launch {
             try {
@@ -223,7 +223,7 @@ class SignInCodeRequiredState internal constructor(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = correlationId,
-            methodName = "${TAG}.resendCode"
+            methodName = "${TAG}.resendCode(callback: ResendCodeCallback)"
         )
         NativeAuthPublicClientApplication.pcaScope.launch {
             try {
@@ -369,7 +369,7 @@ class SignInPasswordRequiredState(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = correlationId,
-            methodName = "${TAG}.submitPassword"
+            methodName = "${TAG}.submitPassword(password: CharArray, callback: SubmitPasswordCallback)"
         )
         NativeAuthPublicClientApplication.pcaScope.launch {
             try {
@@ -531,7 +531,7 @@ class SignInContinuationState(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = correlationId,
-            methodName = "${TAG}.signIn"
+            methodName = "${TAG}.signIn(scopes: List<String>, callback: SignInContinuationCallback)"
         )
 
         NativeAuthPublicClientApplication.pcaScope.launch {
@@ -552,6 +552,12 @@ class SignInContinuationState(
      * @return The results of the sign-in-after-sign-up action.
      */
     suspend fun signIn(scopes: List<String>? = null): SignInResult {
+        LogSession.logMethodCall(
+            tag = TAG,
+            correlationId = correlationId,
+            methodName = "${TAG}.signIn(scopes: List<String>)"
+        )
+
         return withContext(Dispatchers.IO) {
             try {
                 LogSession.logMethodCall(

msal/src/main/java/com/microsoft/identity/nativeauth/statemachine/states/SignUpStates.kt

@@ -101,7 +101,7 @@ class SignUpCodeRequiredState internal constructor(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = correlationId,
-            methodName = "${TAG}.submitCode"
+            methodName = "${TAG}.submitCode(code: String, callback: SubmitCodeCallback)"
         )
 
         NativeAuthPublicClientApplication.pcaScope.launch {
@@ -258,7 +258,7 @@ class SignUpCodeRequiredState internal constructor(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = correlationId,
-            methodName = "${TAG}.resendCode"
+            methodName = "${TAG}.resendCode(callback: SignUpWithResendCodeCallback)"
         )
         NativeAuthPublicClientApplication.pcaScope.launch {
             try {
@@ -403,7 +403,7 @@ class SignUpPasswordRequiredState internal constructor(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = correlationId,
-            methodName = "${TAG}.submitPassword"
+            methodName = "${TAG}.submitPassword(password: CharArray, callback: SignUpSubmitPasswordCallback)"
         )
         NativeAuthPublicClientApplication.pcaScope.launch {
             try {
@@ -613,7 +613,7 @@ class SignUpAttributesRequiredState internal constructor(
         LogSession.logMethodCall(
             tag = TAG,
             correlationId = correlationId,
-            methodName = "${TAG}.submitAttributes"
+            methodName = "${TAG}.submitAttributes(attributes: UserAttributes, callback: SignUpSubmitUserAttributesCallback)"
         )
         NativeAuthPublicClientApplication.pcaScope.launch {
             try {