fix urls from http://localhost:8081/api/storage/public/:chatId, renam…

…e publicUrl to publishedUrl
nkonev · Jan 16, 2025 · 0d64de6 · 0d64de6
1 parent 11fef45
commit 0d64de6
Show file tree

Hide file tree

Showing 19 changed files with 160 additions and 82 deletions.
diff --git a/chat/handlers/blog.go b/chat/handlers/blog.go
@@ -86,7 +86,7 @@ func (h *BlogHandler) getPostsWoUsers(ctx context.Context, blogs []*db.Blog) ([]
 						query.Set(utils.FileParam, utils.SetImagePreviewExtension(fileParam))
 						dumbUrl.RawQuery = query.Encode()
 
-						publicPreviewUrl, err := makeUrlPublic(dumbUrl.String(), utils.UrlStorageEmbedPreview, false, post.ChatId, post.MessageId)
+						publicPreviewUrl, err := makeUrlPublic(dumbUrl.String(), utils.UrlStorageEmbedPreview, post.ChatId, post.MessageId)
 						if err != nil {
 							h.lgr.WithTracing(ctx).Warnf("Unagle to change url: %v", err)
 							break
@@ -503,7 +503,7 @@ func PatchStorageUrlToPublic(ctx context.Context, lgr *logger.Logger, text strin
 			original, originalExists := maybeImage.Attr("data-original")
 			if originalExists { // we have 2 tags - preview (small, tag attr) and original (data-original attr)
 				if utils.ContainsUrl(lgr, wlArr, original) { // original
-					newurl, err := makeUrlPublic(original, "", false, overrideChatId, overrideMessageId)
+					newurl, err := makeUrlPublic(original, "", overrideChatId, overrideMessageId)
 					if err != nil {
 						lgr.WithTracing(ctx).Warnf("Unagle to change url: %v", err)
 						return
@@ -513,7 +513,7 @@ func PatchStorageUrlToPublic(ctx context.Context, lgr *logger.Logger, text strin
 
 				src, srcExists := maybeImage.Attr("src") // preview
 				if srcExists && utils.ContainsUrl(lgr, wlArr, src) {
-					newurl, err := makeUrlPublic(src, utils.UrlStorageEmbedPreview, false, overrideChatId, overrideMessageId)
+					newurl, err := makeUrlPublic(src, utils.UrlStorageEmbedPreview, overrideChatId, overrideMessageId)
 					if err != nil {
 						lgr.WithTracing(ctx).Warnf("Unagle to change url: %v", err)
 						return
@@ -544,7 +544,8 @@ func (h *BlogHandler) getFileParam(src string) (string, error) {
 const OverrideMessageId = "overrideMessageId"
 const OverrideChatId = "overrideChatId"
 
-func makeUrlPublic(src string, additionalSegment string, addTime bool, overrideChatId, overrideMessageId int64) (string, error) {
+// see also storage/services/files.go :: makeUrlPublic
+func makeUrlPublic(src string, additionalSegment string, overrideChatId, overrideMessageId int64) (string, error) {
 	if strings.HasPrefix(src, "/api/storage/assets/") { // don't touch built-in default urls (used for video-by-link, audio)
 		return src, nil
 	}
@@ -555,14 +556,10 @@ func makeUrlPublic(src string, additionalSegment string, addTime bool, overrideC
 		return "", err
 	}
 
-	parsed.Path = utils.UrlApiPrefix + utils.UrlStoragePublicGetFile + additionalSegment
+	parsed.Path = utils.UrlStoragePublicGetFile + additionalSegment
 
 	query := parsed.Query()
 
-	if addTime {
-		addTimeToUrlValues(&query)
-	}
-
 	query.Set(OverrideMessageId, utils.Int64ToString(overrideMessageId))
 	query.Set(OverrideChatId, utils.Int64ToString(overrideChatId))
 

diff --git a/chat/utils/utils.go b/chat/utils/utils.go
@@ -225,8 +225,7 @@ func Min(a, b int) int {
 }
 
 const FileParam = "file"
-const UrlApiPrefix = "/api"
-const UrlStoragePublicGetFile = "/storage/public/download"
+const UrlStoragePublicGetFile = "/api/storage/public/download"
 const UrlStorageEmbedPreview = "/embed/preview"
 
 func SetImagePreviewExtension(key string) string {

diff --git a/event/dto/rabbitmq.go b/event/dto/rabbitmq.go
@@ -140,7 +140,7 @@ type FileInfoDto struct {
 	Id             string    `json:"id"`
 	Filename       string    `json:"filename"`
 	Url            string    `json:"url"`
-	PublicUrl      *string   `json:"publicUrl"`
+	PublishedUrl   *string   `json:"publishedUrl"`
 	PreviewUrl     *string   `json:"previewUrl"`
 	Size           int64     `json:"size"`
 	CanDelete      bool      `json:"canDelete"`

diff --git a/event/graph/generated.go b/event/graph/generated.go
diff --git a/event/graph/model/models_gen.go b/event/graph/model/models_gen.go
diff --git a/event/graph/schema.graphqls b/event/graph/schema.graphqls
@@ -152,7 +152,7 @@ type FileInfoDto {
     id: String!
     filename: String!
     url: String!
-    publicUrl: String
+    publishedUrl: String
     previewUrl: String
     size: Int64!
     canDelete:           Boolean!

diff --git a/event/graph/schema.resolvers.go b/event/graph/schema.resolvers.go
diff --git a/frontend/src/ChatView.vue b/frontend/src/ChatView.vue
@@ -461,7 +461,7 @@ export default {
                                         id
                                         filename
                                         url
-                                        publicUrl
+                                        publishedUrl
                                         previewUrl
                                         size
                                         canDelete

diff --git a/frontend/src/FileListContextMenu.vue b/frontend/src/FileListContextMenu.vue
@@ -104,7 +104,7 @@ export default {
         }
 
         if (this.menuableItem.canShare) {
-          if (!this.menuableItem.publicUrl) {
+          if (!this.menuableItem.publishedUrl) {
             ret.push({
               title: this.$vuetify.locale.t('$vuetify.share_file'),
               icon: 'mdi-export',

diff --git a/frontend/src/FileListModal.vue b/frontend/src/FileListModal.vue
@@ -64,7 +64,7 @@
                                                 {{ formattedSize(item.size) }}
                                                 <span v-if="item.owner"> {{ $vuetify.locale.t('$vuetify.files_by') }} {{item.owner?.login}}</span>
                                                 <span> {{$vuetify.locale.t('$vuetify.time_at')}} </span>{{getDate(item)}}
-                                                <a v-if="item.publicUrl" :href="item.publicUrl" target="_blank" class="colored-link">
+                                                <a v-if="item.publishedUrl" :href="item.publishedUrl" target="_blank" class="colored-link">
                                                     {{ $vuetify.locale.t('$vuetify.files_public_url') }}
                                                 </a>
                                             </v-card-subtitle>
@@ -85,11 +85,11 @@
                                             <v-btn size="medium" v-if="item.canEdit" @click="fireEdit(item)" :title="$vuetify.locale.t('$vuetify.edit')"><v-icon size="large">mdi-pencil</v-icon></v-btn>
 
                                             <template v-if="item.canShare">
-                                                <v-btn size="medium" v-if="!item.publicUrl" @click="shareFile(item)">
+                                                <v-btn size="medium" v-if="!item.publishedUrl" @click="shareFile(item)">
                                                     <v-icon color="primary" size="large" dark :title="$vuetify.locale.t('$vuetify.share_file')">mdi-export</v-icon>
                                                 </v-btn>
 
-                                                <v-btn size="medium" v-if="item.publicUrl" @click="unshareFile(item)">
+                                                <v-btn size="medium" v-if="item.publishedUrl" @click="unshareFile(item)">
                                                   <v-icon color="primary" size="large" dark :title="$vuetify.locale.t('$vuetify.unshare_file')">mdi-lock</v-icon>
                                                 </v-btn>
                                             </template>
@@ -306,7 +306,7 @@ export default {
         },
         shareFile(dto) {
             axios.put(`/api/storage/publish/file`, {id: dto.id, public: true}).then((resp)=>{
-                const link = resp.data.publicUrl;
+                const link = resp.data.publishedUrl;
                 if (link) {
                     navigator.clipboard.writeText(getUrlPrefix() + link);
                     this.setTempNotification(this.$vuetify.locale.t('$vuetify.published_file_link_copied'));

diff --git a/public/common/components/FileListModal.vue b/public/common/components/FileListModal.vue
@@ -64,9 +64,6 @@
                                                 {{ formattedSize(item.size) }}
                                                 <span v-if="item.owner"> by {{item.owner?.login}}</span>
                                                 <span> at </span>{{getDate(item)}}
-                                                <a v-if="item.publicUrl" :href="item.publicUrl" target="_blank" class="colored-link">
-                                                  Public url
-                                                </a>
                                             </v-card-subtitle>
                                             </v-container>
                                         </v-img>
@@ -174,7 +171,8 @@ export default {
             searchString: null,
             showSearchButton: true,
             markInstance: null,
-            chatId: null,
+            chatId: null, // overrideChatId
+            messageId: null, // overrideMessageId
             fileUploadingSessionType: null,
             correlationId: null,
             fileListMode: false,
@@ -283,14 +281,15 @@ export default {
           setStoredFileListMode(newValue);
         },
         hasLength,
-        isCachedRelevantToArguments({fileItemUuid, chatId}) {
-            return this.fileItemUuid == fileItemUuid && this.chatId == chatId
+        isCachedRelevantToArguments({fileItemUuid, chatId, messageId}) {
+            return this.fileItemUuid == fileItemUuid && this.chatId == chatId && this.messageId == messageId
         },
-        initializeWithArguments({fileItemUuid, messageEditing, messageIdToDetachFiles, chatId, fileUploadingSessionType, correlationId}) {
+        initializeWithArguments({fileItemUuid, messageEditing, messageIdToDetachFiles, chatId, messageId, fileUploadingSessionType, correlationId}) {
             this.messageIdToDetachFiles = messageIdToDetachFiles;
             this.isMessageEditing = messageEditing;
             this.fileItemUuid = fileItemUuid;
             this.chatId = chatId;
+            this.messageId = messageId;
 
             // just pass them to FileUploadModal
             this.fileUploadingSessionType = fileUploadingSessionType;
@@ -300,12 +299,14 @@ export default {
             // blog post: blogDto.messageId
             // public message: messageDto.messageItem.id
             // TODO curl -Ss --url 'http://localhost:1236/api/storage/public/1019?overrideChatId=1019&overrideMessageId=1' | jq
-            return axios.get(`/api/storage/${this.chatId}`, {
+            return axios.get(`/api/storage/public/${this.chatId}`, {
                 params: {
                     page: this.translatePage(),
                     size: PAGE_SIZE_SMALL,
                     fileItemUuid : this.fileItemUuid ? this.fileItemUuid : '',
-                    searchString: this.searchString
+                    searchString: this.searchString,
+                    overrideChatId: this.chatId,
+                    overrideMessageId: this.messageId,
                 },
             })
         },
@@ -379,6 +380,7 @@ export default {
         },
         clearOnReset() {
             this.chatId = null;
+            this.messageId = null;
             this.fileItemUuid = null;
             this.searchString = null;
         },

diff --git a/public/pages/blog/post/@id/BlogPost.vue b/public/pages/blog/post/@id/BlogPost.vue
@@ -142,7 +142,11 @@ export default {
         onClickTrap(e)
     },
     onFilesClicked(item) {
-      const obj = {chatId: this.pageContext.data.blogDto.chatId, fileItemUuid : item.fileItemUuid};
+      const obj = {
+        chatId: this.pageContext.data.blogDto.chatId,
+        messageId: item.id,
+        fileItemUuid : item.fileItemUuid
+      };
       bus.emit(OPEN_VIEW_FILES_DIALOG, obj);
     },
   },

diff --git a/storage/config/config-dev/config.yml b/storage/config/config-dev/config.yml
@@ -49,9 +49,9 @@ minio:
   secured: false
   internalEndpoint: 127.0.0.1:39000
   interContainerUrl: http://minio:9000
-  publicUrlPrefix: /api/s3
-  publicDownloadTtl: 24h
-  publicUploadTtl: 24h
+  externalS3UrlPrefix: /api/s3
+  presignDownloadTtl: 24h
+  presignUploadTtl: 24h
   accessKeyId: AKIAIOSFODNN7EXAMPLE
   secretAccessKey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
   location: "europe-east"

diff --git a/storage/dto/files.go b/storage/dto/files.go
@@ -8,7 +8,7 @@ type FileInfoDto struct {
 	Id             string    `json:"id"`
 	Filename       string    `json:"filename"`
 	Url            string    `json:"url"`
-	PublicUrl      *string   `json:"publicUrl"`
+	PublishedUrl   *string   `json:"publishedUrl"`
 	PreviewUrl     *string   `json:"previewUrl"`
 	Size           int64     `json:"size"`
 	CanDelete      bool      `json:"canDelete"`
@@ -20,8 +20,8 @@ type FileInfoDto struct {
 	CanPlayAsVideo bool      `json:"canPlayAsVideo"`
 	CanShowAsImage bool      `json:"canShowAsImage"`
 	CanPlayAsAudio bool      `json:"canPlayAsAudio"`
-	FileItemUuid   string `json:"fileItemUuid"`
-	CorrelationId *string `json:"correlationId"`
+	FileItemUuid   string    `json:"fileItemUuid"`
+	CorrelationId  *string   `json:"correlationId"`
 }
 
 type WrappedFileInfoDto struct {