Skip to content

Update Json Schema, put JavaScript API behind a flight, Fixes AB#3203956, Closed AB#3203956 #2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fadidurah merged 6 commits into from
May 30, 2025
Merged

Update Json Schema, put JavaScript API behind a flight, Fixes AB#3203956, Closed AB#3203956 #2653

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b91040e
put JavaScript API behind a flight
fadidurah May 29, 2025
55ebdfd
typo
fadidurah May 29, 2025
a8a0e6b
helper method
fadidurah May 29, 2025
9f6b6b0
update schema
fadidurah May 29, 2025
78d8b0a
update schema
fadidurah May 29, 2025
b8bb81c
Merge branch 'dev' into fadi/numberMatchFlight
fadidurah May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...com/microsoft/identity/common/internal/providers/oauth2/WebViewAuthorizationFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
import com.microsoft.identity.common.R;
import com.microsoft.identity.common.internal.fido.LegacyFidoActivityResultContract;
import com.microsoft.identity.common.internal.fido.LegacyFido2ApiObject;
import com.microsoft.identity.common.internal.broker.AuthUxJavaScriptInterface;
import com.microsoft.identity.common.internal.ui.webview.ISendResultCallback;
import com.microsoft.identity.common.internal.ui.webview.ProcessUtil;
import com.microsoft.identity.common.internal.ui.webview.switchbrowser.SwitchBrowserProtocolCoordinator;
Expand Down
8 changes: 6 additions & 2 deletions .../com/microsoft/identity/common/internal/ui/webview/AzureActiveDirectoryWebViewClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ public AzureActiveDirectoryWebViewClient(@NonNull final Activity activity,
* If both conditions are met, it adds the JavaScript interface to the WebView.
*/
public void initializeAuthUxJavaScriptApi(@NonNull final WebView view, final String url) {
if (ProcessUtil.isRunningOnAuthService(getActivity().getApplicationContext()) && AuthUxJavaScriptInterface.Companion.isValidUrlForInterface(url)) {
if (ProcessUtil.isRunningOnAuthService(getActivity().getApplicationContext())
&& AuthUxJavaScriptInterface.Companion.isValidUrlForInterface(url)
&& CommonFlightsManager.INSTANCE.getFlightsProvider().isFlightEnabled(CommonFlight.ENABLE_JS_API_FOR_AUTHUX)) {
Comment thread
fadidurah marked this conversation as resolved.
Outdated
Comment thread
fadidurah marked this conversation as resolved.
Outdated
// If broker request, and a valid url, expose JavaScript API
Logger.info(TAG, "Adding AuthUx JavaScript Interface");
view.addJavascriptInterface(new AuthUxJavaScriptInterface(), AuthUxJavaScriptInterface.Companion.getInterfaceName());
Expand Down Expand Up @@ -206,7 +208,9 @@ private boolean handleUrl(final WebView view, final String url) {
final String formattedURL = url.toLowerCase(Locale.US);

// Re-evaluate adding AuthUx JavaScript Interface
if (ProcessUtil.isRunningOnAuthService(getActivity().getApplicationContext()) && AuthUxJavaScriptInterface.Companion.isValidUrlForInterface(url)) {
if (ProcessUtil.isRunningOnAuthService(getActivity().getApplicationContext())
&& AuthUxJavaScriptInterface.Companion.isValidUrlForInterface(url)
&& CommonFlightsManager.INSTANCE.getFlightsProvider().isFlightEnabled(CommonFlight.ENABLE_JS_API_FOR_AUTHUX)) {
// If broker request, and a valid url, expose JavaScript API
Logger.info(methodTag, "Adding AuthUx JavaScript Interface");
view.addJavascriptInterface(new AuthUxJavaScriptInterface(), AuthUxJavaScriptInterface.Companion.getInterfaceName());
Expand Down
7 changes: 6 additions & 1 deletion common4j/src/main/com/microsoft/identity/common/java/flighting/CommonFlight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,12 @@ public enum CommonFlight implements IFlightConfig {
/** Flight to enable the new key generation without PURPOSE_WRAP_KEY. Default is true.
* This is applicable for API >= 23
*/
ENABLE_NEW_KEY_GEN_SPEC_FOR_WRAP_WITHOUT_PURPOSE_WRAP_KEY("EnableNewKeyGenSpecForWrapWithoutPurposeWrapKey", true);
ENABLE_NEW_KEY_GEN_SPEC_FOR_WRAP_WITHOUT_PURPOSE_WRAP_KEY("EnableNewKeyGenSpecForWrapWithoutPurposeWrapKey", true),

/**
* Flight to enable exposing the JavaScript API for AuthUx requests
*/
ENABLE_JS_API_FOR_AUTHUX("EnableJsApiForAuthUx", true);

private String key;
private Object defaultValue;
Expand Down
Loading