[Bookmark] Moved checking privileges to JS layer.

[Verification] Code compiles without errors.
TCT tests for Bookmark privileges passes.

Change-Id: I960f4e08e9ca058b42a6b23856703af14650dec7
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>

diff --git a/src/bookmark/bookmark_api.js b/src/bookmark/bookmark_api.js
index 0faf1ae..f14faad 100644 (file)
--- a/src/bookmark/bookmark_api.js
+++ b/src/bookmark/bookmark_api.js
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 var validator_ = xwalk.utils.validator;
+var privilege_ = xwalk.utils.privilege;
 var types_ = validator_.Types;
 var native_ = new xwalk.utils.NativeManager(extension);
 
@@ -23,6 +24,8 @@ var _edit = new EditManager();
 function BookmarkManager() {}
 
 BookmarkManager.prototype.get = function() {
+  xwalk.utils.checkPrivilegeAccess(privilege_.BOOKMARK_READ);
+
   var args = validator_.validateArgs(arguments, [
     {
       name: 'parentFolder',
@@ -56,6 +59,8 @@ BookmarkManager.prototype.get = function() {
 };
 
 BookmarkManager.prototype.add = function() {
+  xwalk.utils.checkPrivilegeAccess(privilege_.BOOKMARK_WRITE);
+
   var args = validator_.validateArgs(arguments, [
     {
       name: 'bookmark',
@@ -90,6 +95,8 @@ BookmarkManager.prototype.add = function() {
 };
 
 BookmarkManager.prototype.remove = function() {
+  xwalk.utils.checkPrivilegeAccess(privilege_.BOOKMARK_WRITE);
+
   var args = validator_.validateArgs(arguments, [
     {
       name: 'bookmark',

diff --git a/src/bookmark/bookmark_instance.cc b/src/bookmark/bookmark_instance.cc
index a9fd81a..2ef9c1c 100644 (file)
--- a/src/bookmark/bookmark_instance.cc
+++ b/src/bookmark/bookmark_instance.cc
@@ -19,9 +19,6 @@ namespace {
   const char kType[] = "type";
   const char kParentId[] = "parentId";
   const char kUrl[] = "url";
-
-  const std::string kPrivilegeBookmarkRead  = "http://tizen.org/privilege/bookmark.read";
-  const std::string kPrivilegeBookmarkWrite = "http://tizen.org/privilege/bookmark.write";
 }  // namespace
 
 BookmarkInstance::BookmarkInstance() {
@@ -123,7 +120,6 @@ bool BookmarkInstance::bookmark_title_exists_in_parent(
 
 void BookmarkInstance::BookmarkGet(
     const picojson::value& arg, picojson::object& o) {
-  CHECK_PRIVILEGE_ACCESS(kPrivilegeBookmarkRead, &o);
 
   Context ctx = {0};
   bp_bookmark_info_fmt info = {0};
@@ -157,7 +153,6 @@ void BookmarkInstance::BookmarkGet(
 
 void BookmarkInstance::BookmarkAdd(
     const picojson::value& arg, picojson::object& o) {
-  CHECK_PRIVILEGE_ACCESS(kPrivilegeBookmarkWrite, &o);
 
   int saved_id =-1;
   bp_bookmark_info_fmt data = {0};
@@ -205,7 +200,6 @@ void BookmarkInstance::BookmarkAdd(
 
 void BookmarkInstance::BookmarkRemove(
     const picojson::value& arg, picojson::object& o) {
-  CHECK_PRIVILEGE_ACCESS(kPrivilegeBookmarkWrite, &o);
 
   int id = common::stol(
       common::FromJson<std::string>(arg.get<picojson::object>(), kId));
@@ -222,7 +216,6 @@ void BookmarkInstance::BookmarkRemove(
 
 void BookmarkInstance::BookmarkRemoveAll(
     const picojson::value& msg, picojson::object& o) {
-  CHECK_PRIVILEGE_ACCESS(kPrivilegeBookmarkWrite, &o);
 
   if (bp_bookmark_adaptor_reset() < 0) {
     ReportError(o);