shimless_rma: Add permission string of IWA in 3p diag app install flow
Add the permissions defined in the IWA manifest into the install flow of Shimless RMA 3p diagnostics app. The IWA permission strings are shown in the same place as the extension permission strings. UI change: https://screenshot.googleplex.com/jh27DscyfWFYkiD BUG: b:322722738 TEST: testing/xvfb.py out/Default/unit_tests --gtest_filter="*ChromeShimlessRma*" Change-Id: I9707c7ca1bd5c3ddd20d16c67475696e339a9967 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5240154 Reviewed-by: Chung-sheng Wu <chungsheng@google.com> Commit-Queue: Ethan Cheng <yycheng@google.com> Reviewed-by: Gavin Williams <gavinwill@chromium.org> Cr-Commit-Position: refs/heads/main@{#1284886}
This commit is contained in:
Ethan Cheng
committed by
Chromium LUCI CQ
Chromium LUCI CQ
parent
09fe5e910c
commit
6e0147825a
@ -6556,10 +6556,31 @@ Here are some things you can try to get started.
|
||||
Key Shortcuts
|
||||
</message>
|
||||
|
||||
<!-- Shimless RMA Diagnostics App -->
|
||||
<message name="IDS_ASH_SHIMLESS_RMA_APP_TITLE" translateable="false" desc="The title of shimless RMA flow SWA. Shimless RMA guides repair technicians through step-by-step repair flow.">
|
||||
Shimless RMA
|
||||
</message>
|
||||
|
||||
<message name="IDS_ASH_SHIMLESS_RMA_APP_ACCESS_PERMISSION" desc="The string prompted to request user permission during install time of the app.">
|
||||
Access the following permissions:
|
||||
</message>
|
||||
|
||||
<message name="IDS_ASH_SHIMLESS_RMA_APP_ACCESS_PERMISSION_CAMERA" desc="The string prompted to request user permission for camera during install time of the app.">
|
||||
Camera
|
||||
</message>
|
||||
|
||||
<message name="IDS_ASH_SHIMLESS_RMA_APP_ACCESS_PERMISSION_MICROPHONE" desc="The string prompted to request user permission for microphone during install time of the app.">
|
||||
Microphone
|
||||
</message>
|
||||
|
||||
<message name="IDS_ASH_SHIMLESS_RMA_APP_ACCESS_PERMISSION_FULLSCREEN" desc="The string prompted to request user permission for fullscreen during install time of the app.">
|
||||
Fullscreen
|
||||
</message>
|
||||
|
||||
<message name="IDS_ASH_SHIMLESS_RMA_APP_ACCESS_PERMISSION_HID_DEVICES" desc="The string prompted to request user permission for HID devices during install time of the app.">
|
||||
HID devices
|
||||
</message>
|
||||
|
||||
<!-- Firmware Update App -->
|
||||
<message name="IDS_ASH_FIRMWARE_UPDATE_APP_TITLE" desc="The title of the firmware update system web app. Firmware update lets users update all their peripheral firmwares in one place.">
|
||||
Firmware Updates
|
||||
|
||||
@ -0,0 +1 @@
|
||||
2c43559a23c47d5a22d8097b26869ec1c5e6d39d
|
||||
@ -0,0 +1 @@
|
||||
2c43559a23c47d5a22d8097b26869ec1c5e6d39d
|
||||
@ -0,0 +1 @@
|
||||
2c43559a23c47d5a22d8097b26869ec1c5e6d39d
|
||||
@ -0,0 +1 @@
|
||||
2c43559a23c47d5a22d8097b26869ec1c5e6d39d
|
||||
@ -0,0 +1 @@
|
||||
2c43559a23c47d5a22d8097b26869ec1c5e6d39d
|
||||
@ -11,8 +11,9 @@
|
||||
#include <vector>
|
||||
|
||||
#include "ash/constants/ash_features.h"
|
||||
#include "ash/strings/grit/ash_strings.h"
|
||||
#include "ash/webui/shimless_rma/backend/shimless_rma_delegate.h"
|
||||
#include "base/containers/fixed_flat_set.h"
|
||||
#include "base/containers/fixed_flat_map.h"
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/strings/strcat.h"
|
||||
#include "base/strings/stringprintf.h"
|
||||
@ -32,7 +33,9 @@
|
||||
#include "chrome/browser/web_applications/web_app_provider.h"
|
||||
#include "chrome/common/chromeos/extensions/chromeos_system_extension_info.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "chromeos/ash/components/browser_context_helper/browser_context_helper.h"
|
||||
#include "components/strings/grit/components_strings.h"
|
||||
#include "components/web_package/signed_web_bundles/signed_web_bundle_id.h"
|
||||
#include "components/webapps/common/web_app_id.h"
|
||||
#include "content/public/browser/service_worker_context.h"
|
||||
@ -46,6 +49,7 @@
|
||||
#include "extensions/common/verifier_formats.h"
|
||||
#include "third_party/blink/public/common/storage_key/storage_key.h"
|
||||
#include "third_party/blink/public/mojom/permissions_policy/permissions_policy_feature.mojom.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
||||
namespace context {
|
||||
class BrowserContext;
|
||||
@ -61,12 +65,16 @@ constexpr base::TimeDelta kExtensionReadyPollingInterval =
|
||||
constexpr base::TimeDelta kExtensionReadyPollingTimeout = base::Seconds(3);
|
||||
|
||||
// The set of allowlisted permission policy for diagnostics IWA.
|
||||
constexpr auto kAllowlistedPermissionPolicy =
|
||||
base::MakeFixedFlatSet<blink::mojom::PermissionsPolicyFeature>(
|
||||
{blink::mojom::PermissionsPolicyFeature::kCamera,
|
||||
blink::mojom::PermissionsPolicyFeature::kFullscreen,
|
||||
blink::mojom::PermissionsPolicyFeature::kMicrophone,
|
||||
blink::mojom::PermissionsPolicyFeature::kHid});
|
||||
constexpr auto kAllowlistedPermissionPolicyStringMap =
|
||||
base::MakeFixedFlatMap<blink::mojom::PermissionsPolicyFeature, int>(
|
||||
{{blink::mojom::PermissionsPolicyFeature::kCamera,
|
||||
IDS_ASH_SHIMLESS_RMA_APP_ACCESS_PERMISSION_CAMERA},
|
||||
{blink::mojom::PermissionsPolicyFeature::kMicrophone,
|
||||
IDS_ASH_SHIMLESS_RMA_APP_ACCESS_PERMISSION_MICROPHONE},
|
||||
{blink::mojom::PermissionsPolicyFeature::kFullscreen,
|
||||
IDS_ASH_SHIMLESS_RMA_APP_ACCESS_PERMISSION_FULLSCREEN},
|
||||
{blink::mojom::PermissionsPolicyFeature::kHid,
|
||||
IDS_ASH_SHIMLESS_RMA_APP_ACCESS_PERMISSION_HID_DEVICES}});
|
||||
|
||||
extensions::ExtensionService* GetExtensionService(
|
||||
content::BrowserContext* context) {
|
||||
@ -166,18 +174,34 @@ void OnIsolatedWebAppInstalled(
|
||||
// TODO(b/294815884): Check this when installing the IWA after we can add
|
||||
// custom checker. For now, we just install the IWA. Because we won't return
|
||||
// the profile and won't launch the IWA it should be fine.
|
||||
if (!web_app->permissions_policy().empty() &&
|
||||
!ash::features::
|
||||
IsShimlessRMA3pDiagnosticsAllowPermissionPolicyEnabled()) {
|
||||
ReportError(std::move(state), k3pDiagErrorIWACannotHasPermissionPolicy);
|
||||
return;
|
||||
}
|
||||
for (const auto& permission_policy : web_app->permissions_policy()) {
|
||||
if (!kAllowlistedPermissionPolicy.contains(permission_policy.feature)) {
|
||||
if (!web_app->permissions_policy().empty()) {
|
||||
if (!ash::features::
|
||||
IsShimlessRMA3pDiagnosticsAllowPermissionPolicyEnabled()) {
|
||||
ReportError(std::move(state), k3pDiagErrorIWACannotHasPermissionPolicy);
|
||||
return;
|
||||
}
|
||||
|
||||
std::u16string permission_message;
|
||||
for (const auto& permission_policy : web_app->permissions_policy()) {
|
||||
if (!kAllowlistedPermissionPolicyStringMap.contains(
|
||||
permission_policy.feature)) {
|
||||
ReportError(std::move(state), k3pDiagErrorIWACannotHasPermissionPolicy);
|
||||
return;
|
||||
}
|
||||
base::StrAppend(
|
||||
&permission_message,
|
||||
{u"- ",
|
||||
l10n_util::GetStringUTF16(kAllowlistedPermissionPolicyStringMap.at(
|
||||
permission_policy.feature)),
|
||||
u"\n"});
|
||||
}
|
||||
state->permission_message = state->permission_message.value_or("");
|
||||
base::StrAppend(&*state->permission_message,
|
||||
{base::UTF16ToUTF8(l10n_util::GetStringUTF16(
|
||||
IDS_ASH_SHIMLESS_RMA_APP_ACCESS_PERMISSION)),
|
||||
"\n", base::UTF16ToUTF8(permission_message)});
|
||||
}
|
||||
|
||||
state->name = web_app->untranslated_name();
|
||||
|
||||
ReportSuccess(std::move(state));
|
||||
|
||||
Reference in New Issue
Block a user