From 1ff6a953bb684f93e6a5aa7d0b4492d101992691 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 29 Mar 2022 09:05:40 +0200
Subject: [PATCH] Corrected the base URL to use when retrieving and setting
 public access details. (#12178)

* Corrected the base URL to use when retrieving and setting public access details.

* Fixed original issue from a merge conflict.. Now using the correct v9+ resource

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
---
 .../src/common/resources/content.resource.js         |  4 ++--
 .../src/views/content/content.protect.controller.js  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
index b6f45ead0e..7e6c6658e5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
@@ -1259,7 +1259,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
         getPublicAccess: function (contentId) {
             return umbRequestHelper.resourcePromise(
                 $http.get(
-                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "GetPublicAccess", {
+                    umbRequestHelper.getApiUrl("publicAccessApiBaseUrl", "GetPublicAccess", {
                         contentId: contentId
                     })
                 ),
@@ -1308,7 +1308,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
             }
             return umbRequestHelper.resourcePromise(
                 $http.post(
-                    umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostPublicAccess", publicAccess)
+                    umbRequestHelper.getApiUrl("publicAccessApiBaseUrl", "PostPublicAccess", publicAccess)
                 ),
                 "Failed to update public access for content item with id " + contentId
             );
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.protect.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.protect.controller.js
index 92efb24e63..6561ed3499 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.protect.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.protect.controller.js
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function ContentProtectController($scope, $q, contentResource, memberResource, memberGroupResource, navigationService, localizationService, editorService) {
+    function ContentProtectController($scope, $q,  publicAccessResource, memberResource, memberGroupResource, navigationService, localizationService, editorService) {
 
         var vm = this;
         var id = $scope.currentNode.id;
@@ -30,7 +30,7 @@
             vm.loading = true;
 
             // get the current public access protection
-            contentResource.getPublicAccess(id).then(function (publicAccess) {
+            publicAccessResource.getPublicAccess(id).then(function (publicAccess) {
                 vm.loading = false;
 
                 // init the current settings for public access (if any)
@@ -94,7 +94,7 @@
             vm.buttonState = "busy";
             var groups = _.map(vm.groups, function (group) { return encodeURIComponent(group.name); });
             var usernames = _.map(vm.members, function (member) { return member.username; });
-            contentResource.updatePublicAccess(id, groups, usernames, vm.loginPage.id, vm.errorPage.id).then(
+            publicAccessResource.updatePublicAccess(id, groups, usernames, vm.loginPage.id, vm.errorPage.id).then(
                 function () {
                     localizationService.localize("publicAccess_paIsProtected", [$scope.currentNode.name]).then(function (value) {
                         vm.success = {
@@ -181,11 +181,11 @@
                                             vm.members.push(newMember);
                                         }
                                     })
-                                );                                
+                                );
                             });
                         editorService.close();
                         navigationService.allowHideDialog(true);
-                        // wait for all the member lookups to complete 
+                        // wait for all the member lookups to complete
                         vm.loading = true;
                         $q.all(promises).then(function() {
                             vm.loading = false;
@@ -239,7 +239,7 @@
 
         function removeProtectionConfirm() {
             vm.buttonState = "busy";
-            contentResource.removePublicAccess(id).then(
+            publicAccessResource.removePublicAccess(id).then(
                 function () {
                     localizationService.localize("publicAccess_paIsRemoved", [$scope.currentNode.name]).then(function(value) {
                         vm.success = {