diff --git a/interfaces/innerkits/accesstoken/include/access_token.h b/interfaces/innerkits/accesstoken/include/access_token.h index 578b02637574eeb4c387d0b2ccf4f40c1088a74f..a526fc4e87e77d3d9d54e5ebae1bbca319c1960c 100644 --- a/interfaces/innerkits/accesstoken/include/access_token.h +++ b/interfaces/innerkits/accesstoken/include/access_token.h @@ -126,6 +126,7 @@ typedef enum TypeATokenAvailableTypeEnum { MDM, SYSTEM_AND_MDM, SERVICE, + ENTERPRISE_NORMAL, AVAILABLE_TYPE_BUTT, } ATokenAvailableTypeEnum; diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp index 4dd1ed410b68b2f05bbb08ec51d3e31e1f4fa9b9..b33ff436c7f918a1b1a168bd2d4581a567c097e8 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp @@ -50,6 +50,7 @@ static const std::string AVAILABLE_TYPE_SYSTEM_HAP = "SYSTEM"; static const std::string AVAILABLE_TYPE_MDM = "MDM"; static const std::string AVAILABLE_TYPE_SYSTEM_AND_MDM = "SYSTEM_AND_MDM"; static const std::string AVAILABLE_TYPE_SERVICE = "SERVICE"; +static const std::string AVAILABLE_TYPE_ENTERPRISE_NORMAL = "ENTERPRISE_NORMAL"; static const std::string AVAILABLE_LEVEL_NORMAL = "normal"; static const std::string AVAILABLE_LEVEL_SYSTEM_BASIC = "system_basic"; static const std::string AVAILABLE_LEVEL_SYSTEM_CORE = "system_core"; @@ -102,6 +103,10 @@ static bool GetPermissionAvailableType(const std::string &availableType, AccessT typeNum = AccessToken::ATokenAvailableTypeEnum::SERVICE; return true; } + if (availableType == AVAILABLE_TYPE_ENTERPRISE_NORMAL) { + typeNum = AccessToken::ATokenAvailableTypeEnum::ENTERPRISE_NORMAL; + return true; + } typeNum = AccessToken::ATokenAvailableTypeEnum::INVALID; ACCESSTOKEN_LOG_ERROR(LABEL, "AvailableType: %{public}s is invalid.", availableType.c_str()); return false; diff --git a/services/accesstokenmanager/permission_definitions.json b/services/accesstokenmanager/permission_definitions.json index cc6a967d8de1046b7828d68714619f3eb817349f..42af7f0f1f453db9935d13ceb02e65e5a840a158 100644 --- a/services/accesstokenmanager/permission_definitions.json +++ b/services/accesstokenmanager/permission_definitions.json @@ -434,7 +434,7 @@ "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS", "grantMode": "system_grant", "availableLevel": "system_basic", - "availableType": "SYSTEM", + "availableType": "ENTERPRISE_NORMAL", "since": 7, "deprecated": "", "provisionEnable": true, @@ -2054,7 +2054,7 @@ "name": "ohos.permission.GET_DOMAIN_ACCOUNTS", "grantMode": "system_grant", "availableLevel": "system_basic", - "availableType": "SYSTEM", + "availableType": "ENTERPRISE_NORMAL", "since": 10, "deprecated": "", "provisionEnable": true,