Skip to content

Commit 15acdac

Browse files
committed
Add suberror for network errors
1 parent f1eb2d8 commit 15acdac

File tree

5 files changed

+14
-19
lines changed

5 files changed

+14
-19
lines changed

changelog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr
22

33
vNext
44
----------
5+
-[MINOR] Add suberror for network errors (#2218)
56
-[MINOR] Migrate Base64 away from Msebera (#2210)
67

78
Version 5.7.0

common

Submodule common updated 52 files

msal/src/main/java/com/microsoft/identity/client/PublicClientApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1647,7 +1647,7 @@ private MsalException baseExceptionToMsalException(@NonNull final BaseException
16471647
);
16481648
}
16491649

1650-
return new MsalClientException(exception.getErrorCode(), exception.getMessage());
1650+
return MsalExceptionAdapter.msalExceptionFromBaseException(exception);
16511651
}
16521652

16531653
/**

msal/src/main/java/com/microsoft/identity/client/exception/MsalUiRequiredException.java

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,9 @@ public final class MsalUiRequiredException extends MsalException {
5858
*/
5959
public static final String NO_ACCOUNT_FOUND = ErrorStrings.NO_ACCOUNT_FOUND;
6060

61-
@Getter
62-
@Accessors(prefix = "m")
63-
@Nullable
64-
private String mOauthSubErrorCode;
61+
public String getOauthSubErrorCode(){
62+
return super.getSubErrorCode();
63+
}
6564

6665
/**
6766
* Constructor of MsalUiRequiredException.
@@ -90,15 +89,4 @@ public MsalUiRequiredException(final String errorCode, final String errorMessage
9089
public MsalUiRequiredException(final String errorCode, final String errorMessage, final Throwable throwable) {
9190
super(errorCode, errorMessage, throwable);
9291
}
93-
94-
/**
95-
* Constructor of MsalUiRequiredException.
96-
* @param errorCode String
97-
* @param oauthSubErrorCode String
98-
* @param errorMessage String
99-
*/
100-
public MsalUiRequiredException(final String errorCode, @Nullable final String oauthSubErrorCode, final String errorMessage) {
101-
super(errorCode, errorMessage);
102-
mOauthSubErrorCode = oauthSubErrorCode;
103-
}
10492
}

msal/src/main/java/com/microsoft/identity/client/internal/controllers/MsalExceptionAdapter.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
public class MsalExceptionAdapter {
4343

4444
public static MsalException msalExceptionFromBaseException(final BaseException e) {
45+
final MsalException result = msalExceptionFromBaseExceptionInternal(e);
46+
result.setSubErrorCode(e.getSubErrorCode());
47+
return result;
48+
}
49+
50+
private static MsalException msalExceptionFromBaseExceptionInternal(final BaseException e) {
4551
if (e instanceof MsalException) {
4652
return (MsalException) e;
4753
}
@@ -69,8 +75,8 @@ public static MsalException msalExceptionFromBaseException(final BaseException e
6975
final UiRequiredException uiRequiredException = ((UiRequiredException) e);
7076
return new MsalUiRequiredException(
7177
uiRequiredException.getErrorCode(),
72-
uiRequiredException.getOAuthSubErrorCode(),
73-
uiRequiredException.getMessage()
78+
uiRequiredException.getMessage(),
79+
uiRequiredException
7480
);
7581
}
7682

0 commit comments

Comments
 (0)