From 631dd58c1fb06bc6f458faf90d2e3846b220c1fa Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 9 Sep 2022 18:28:01 +0200
Subject: [PATCH] fixed share link guest user error message

---
 cookbook/views/api.py                    | 13 ++--
 vue/src/components/RecipeContextMenu.vue | 99 +++++++++++++++---------
 2 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index a4c210ffc..feaa342c7 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -54,7 +54,7 @@ from cookbook.helper.ingredient_parser import IngredientParser
 from cookbook.helper.permission_helper import (CustomIsAdmin, CustomIsOwner,
                                                CustomIsOwnerReadOnly, CustomIsShared,
                                                CustomIsSpaceOwner, CustomIsUser, group_required,
-                                               is_space_owner, switch_user_active_space, above_space_limit, CustomRecipePermission, CustomUserPermission, CustomTokenHasReadWriteScope, CustomTokenHasScope)
+                                               is_space_owner, switch_user_active_space, above_space_limit, CustomRecipePermission, CustomUserPermission, CustomTokenHasReadWriteScope, CustomTokenHasScope, has_group_permission)
 from cookbook.helper.recipe_search import RecipeFacet, RecipeSearch
 from cookbook.helper.recipe_url_import import get_from_youtube_scraper, get_images_from_soup
 from cookbook.helper.scrapers.scrapers import text_scraper
@@ -528,10 +528,10 @@ class FoodViewSet(viewsets.ModelViewSet, TreeMixin):
         shopping_status = ShoppingListEntry.objects.filter(space=self.request.space, food=OuterRef('id'),
                                                            checked=False).values('id')
         # onhand_status = self.queryset.annotate(onhand_status=Exists(onhand_users_set__in=[shared_users]))
-        return self.queryset\
-                .annotate(shopping_status=Exists(shopping_status))\
-                .prefetch_related('onhand_users', 'inherit_fields', 'child_inherit_fields', 'substitute')\
-                .select_related('recipe', 'supermarket_category')
+        return self.queryset \
+            .annotate(shopping_status=Exists(shopping_status)) \
+            .prefetch_related('onhand_users', 'inherit_fields', 'child_inherit_fields', 'substitute') \
+            .select_related('recipe', 'supermarket_category')
 
     @decorators.action(detail=True, methods=['PUT'], serializer_class=FoodShoppingUpdateSerializer, )
     # TODO DRF only allows one action in a decorator action without overriding get_operation_id_base() this should be PUT and DELETE probably
@@ -1380,9 +1380,8 @@ def sync_all(request):
         return redirect('list_recipe_import')
 
 
-@group_required('user')
 def share_link(request, pk):
-    if request.space.allow_sharing:
+    if request.space.allow_sharing and has_group_permission(request.user, 'user'):
         recipe = get_object_or_404(Recipe, pk=pk, space=request.space)
         link = ShareLink.objects.create(recipe=recipe, created_by=request.user, space=request.space)
         return JsonResponse({'pk': pk, 'share': link.uuid,
diff --git a/vue/src/components/RecipeContextMenu.vue b/vue/src/components/RecipeContextMenu.vue
index 67a631454..852ef3574 100644
--- a/vue/src/components/RecipeContextMenu.vue
+++ b/vue/src/components/RecipeContextMenu.vue
@@ -1,25 +1,34 @@
 <template>
     <div>
         <div class="dropdown d-print-none">
-            <a class="btn shadow-none" href="javascript:void(0);" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <a class="btn shadow-none" href="javascript:void(0);" role="button" id="dropdownMenuLink"
+               data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <i class="fas fa-ellipsis-v fa-lg"></i>
             </a>
 
             <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuLink">
-                <a class="dropdown-item" :href="resolveDjangoUrl('edit_recipe', recipe.id)"><i class="fas fa-pencil-alt fa-fw"></i> {{ $t("Edit") }}</a>
+                <a class="dropdown-item" :href="resolveDjangoUrl('edit_recipe', recipe.id)"><i
+                    class="fas fa-pencil-alt fa-fw"></i> {{ $t("Edit") }}</a>
 
-                <a class="dropdown-item" :href="resolveDjangoUrl('edit_convert_recipe', recipe.id)" v-if="!recipe.internal"><i class="fas fa-exchange-alt fa-fw"></i> {{ $t("convert_internal") }}</a>
+                <a class="dropdown-item" :href="resolveDjangoUrl('edit_convert_recipe', recipe.id)"
+                   v-if="!recipe.internal"><i class="fas fa-exchange-alt fa-fw"></i> {{ $t("convert_internal") }}</a>
 
                 <a href="javascript:void(0);">
-                    <button class="dropdown-item" @click="$bvModal.show(`id_modal_add_book_${modal_id}`)"><i class="fas fa-bookmark fa-fw"></i> {{ $t("Manage_Books") }}</button>
+                    <button class="dropdown-item" @click="$bvModal.show(`id_modal_add_book_${modal_id}`)"><i
+                        class="fas fa-bookmark fa-fw"></i> {{ $t("Manage_Books") }}
+                    </button>
                 </a>
 
-                <a class="dropdown-item" v-if="recipe.internal" @click="addToShopping" href="#"> <i class="fas fa-shopping-cart fa-fw"></i> {{ $t("Add_to_Shopping") }} </a>
+                <a class="dropdown-item" v-if="recipe.internal" @click="addToShopping" href="#"> <i
+                    class="fas fa-shopping-cart fa-fw"></i> {{ $t("Add_to_Shopping") }} </a>
 
-                <a class="dropdown-item" @click="createMealPlan" href="javascript:void(0);"><i class="fas fa-calendar fa-fw"></i> {{ $t("Add_to_Plan") }} </a>
+                <a class="dropdown-item" @click="createMealPlan" href="javascript:void(0);"><i
+                    class="fas fa-calendar fa-fw"></i> {{ $t("Add_to_Plan") }} </a>
 
                 <a href="javascript:void(0);">
-                    <button class="dropdown-item" @click="$bvModal.show(`id_modal_cook_log_${modal_id}`)"><i class="fas fa-clipboard-list fa-fw"></i> {{ $t("Log_Cooking") }}</button>
+                    <button class="dropdown-item" @click="$bvModal.show(`id_modal_cook_log_${modal_id}`)"><i
+                        class="fas fa-clipboard-list fa-fw"></i> {{ $t("Log_Cooking") }}
+                    </button>
                 </a>
 
                 <a href="javascript:void(0);">
@@ -29,10 +38,13 @@
                     </button>
                 </a>
                 <a href="javascript:void(0);">
-                    <button class="dropdown-item" @click="copyToNew"><i class="fas fa-copy fa-fw"></i> {{ $t("copy_to_new") }}</button>
+                    <button class="dropdown-item" @click="copyToNew"><i class="fas fa-copy fa-fw"></i>
+                        {{ $t("copy_to_new") }}
+                    </button>
                 </a>
 
-                <a class="dropdown-item" :href="resolveDjangoUrl('view_export') + '?r=' + recipe.id" target="_blank" rel="noopener noreferrer"><i class="fas fa-file-export fa-fw"></i> {{ $t("Export") }}</a>
+                <a class="dropdown-item" :href="resolveDjangoUrl('view_export') + '?r=' + recipe.id" target="_blank"
+                   rel="noopener noreferrer"><i class="fas fa-file-export fa-fw"></i> {{ $t("Export") }}</a>
 
                 <a href="javascript:void(0);">
                     <button class="dropdown-item" @click="pinRecipe()">
@@ -42,23 +54,33 @@
                 </a>
 
                 <a href="javascript:void(0);">
-                    <button class="dropdown-item" @click="createShareLink()" v-if="recipe.internal"><i class="fas fa-share-alt fa-fw"></i> {{ $t("Share") }}</button>
+                    <button class="dropdown-item" @click="createShareLink()" v-if="recipe.internal"><i
+                        class="fas fa-share-alt fa-fw"></i> {{ $t("Share") }}
+                    </button>
                 </a>
             </div>
         </div>
 
         <cook-log :recipe="recipe" :modal_id="modal_id"></cook-log>
-        <add-recipe-to-book :recipe="recipe" :modal_id="modal_id" :entryEditing_inital_servings="servings_value"></add-recipe-to-book>
-        <shopping-modal :recipe="recipe" :servings="servings_value" :modal_id="modal_id" :mealplan="undefined" />
+        <add-recipe-to-book :recipe="recipe" :modal_id="modal_id"
+                            :entryEditing_inital_servings="servings_value"></add-recipe-to-book>
+        <shopping-modal :recipe="recipe" :servings="servings_value" :modal_id="modal_id" :mealplan="undefined"/>
 
         <b-modal :id="`modal-share-link_${modal_id}`" v-bind:title="$t('Share')" hide-footer>
             <div class="row">
                 <div class="col col-md-12">
                     <label v-if="recipe_share_link !== undefined">{{ $t("Public share link") }}</label>
-                    <input ref="share_link_ref" class="form-control" v-model="recipe_share_link" />
-                    <b-button class="mt-2 mb-3 d-none d-md-inline" variant="secondary" @click="$bvModal.hide(`modal-share-link_${modal_id}`)">{{ $t("Close") }} </b-button>
-                    <b-button class="mt-2 mb-3 ml-md-2" variant="primary" @click="copyShareLink()">{{ $t("Copy") }} </b-button>
-                    <b-button class="mt-2 mb-3 ml-2 float-right" variant="success" @click="shareIntend()">{{ $t("Share") }} <i class="fa fa-share-alt"></i></b-button>
+                    <input ref="share_link_ref" class="form-control" v-model="recipe_share_link"/>
+                    <b-button class="mt-2 mb-3 d-none d-md-inline" variant="secondary"
+                              @click="$bvModal.hide(`modal-share-link_${modal_id}`)">{{ $t("Close") }}
+                    </b-button>
+                    <b-button class="mt-2 mb-3 ml-md-2" variant="primary" @click="copyShareLink()">{{
+                            $t("Copy")
+                        }}
+                    </b-button>
+                    <b-button class="mt-2 mb-3 ml-2 float-right" variant="success" @click="shareIntend()">{{
+                            $t("Share")
+                        }} <i class="fa fa-share-alt"></i></b-button>
                 </div>
             </div>
         </b-modal>
@@ -75,7 +97,7 @@
 </template>
 
 <script>
-import { makeToast, resolveDjangoUrl, ResolveUrlMixin, StandardToasts } from "@/utils/utils"
+import {makeToast, resolveDjangoUrl, ResolveUrlMixin, StandardToasts} from "@/utils/utils"
 import CookLog from "@/components/CookLog"
 import axios from "axios"
 import AddRecipeToBook from "@/components/Modals/AddRecipeToBook"
@@ -83,7 +105,7 @@ import MealPlanEditModal from "@/components/MealPlanEditModal"
 import ShoppingModal from "@/components/Modals/ShoppingModal"
 import moment from "moment"
 import Vue from "vue"
-import { ApiApiFactory } from "@/utils/openapi/api"
+import {ApiApiFactory} from "@/utils/openapi/api"
 
 Vue.prototype.moment = moment
 
@@ -131,7 +153,8 @@ export default {
     },
     watch: {
         recipe: {
-            handler() {},
+            handler() {
+            },
             deep: true,
         },
         servings: function (newVal) {
@@ -141,7 +164,7 @@ export default {
     methods: {
         pinRecipe: function () {
             let pinnedRecipes = JSON.parse(localStorage.getItem("pinned_recipes")) || []
-            pinnedRecipes.push({ id: this.recipe.id, name: this.recipe.name })
+            pinnedRecipes.push({id: this.recipe.id, name: this.recipe.name})
             localStorage.setItem("pinned_recipes", JSON.stringify(pinnedRecipes))
         },
         saveMealPlan: function (entry) {
@@ -159,10 +182,10 @@ export default {
                         this.servings_value = result.data.servings
                         this.addToShopping()
                     }
-                    StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
+                    StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_CREATE)
                 })
                 .catch((err) => {
-                    StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE, err)
+                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_CREATE, err)
                 })
         },
         createMealPlan(data) {
@@ -174,17 +197,17 @@ export default {
             })
         },
         createShareLink: function () {
-            axios
-                .get(resolveDjangoUrl("api_share_link", this.recipe.id))
-                .then((result) => {
-                    this.$bvModal.show(`modal-share-link_${this.modal_id}`)
-                    this.recipe_share_link = result.data.link
-                })
-                .catch((err) => {
-                    if (err.response.status === 403) {
-                        makeToast(this.$t("Share"), this.$t("Sharing is not enabled for this space."), "danger")
-                    }
-                })
+            console.log('create')
+            axios.get(resolveDjangoUrl("api_share_link", this.recipe.id)).then((result) => {
+                console.log('success')
+                this.$bvModal.show(`modal-share-link_${this.modal_id}`)
+                this.recipe_share_link = result.data.link
+            }).catch((err) => {
+                console.log('fail')
+                if (err.response.status === 403) {
+                    makeToast(this.$t("Share"), this.$t("Sharing is not enabled for this space or your user account."), "danger")
+                }
+            })
         },
         copyShareLink: function () {
             let share_input = this.$refs.share_link_ref
@@ -207,29 +230,29 @@ export default {
 
             let apiClient = new ApiApiFactory()
             apiClient.retrieveRecipe(this.recipe.id).then((results) => {
-                let recipe = { ...results.data, ...{ id: undefined, name: recipe_name } }
+                let recipe = {...results.data, ...{id: undefined, name: recipe_name}}
                 recipe.steps = recipe.steps.map((step) => {
                     return {
                         ...step,
                         ...{
                             id: undefined,
                             ingredients: step.ingredients.map((ingredient) => {
-                                return { ...ingredient, ...{ id: undefined } }
+                                return {...ingredient, ...{id: undefined}}
                             }),
                         },
                     }
                 })
-                if (recipe.nutrition !== null){
+                if (recipe.nutrition !== null) {
                     delete recipe.nutrition.id
                 }
                 apiClient
                     .createRecipe(recipe)
                     .then((new_recipe) => {
-                        StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
+                        StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_CREATE)
                         window.open(this.resolveDjangoUrl("view_recipe", new_recipe.data.id))
                     })
                     .catch((err) => {
-                        StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE, err)
+                        StandardToasts.makeStandardToast(this, StandardToasts.FAIL_CREATE, err)
                     })
             })
         },