fix broen link

Author: Nevyana Angelova

forge/src/index.ts

@@ -139,7 +139,7 @@ export const drain = async (req: WebTriggerRequest): Promise<WebTriggerResponse>
 // refused. To re-register, an operator must clear the flag via the Forge CLI:
 //   forge install --upgrade   then re-POST to register
 export const register = async (req: WebTriggerRequest): Promise<WebTriggerResponse> => {
-    let payload: { secret?: string; force?: boolean };
+    let payload: { secret?: string };
     try {
         payload = JSON.parse(req.body ?? '{}');
     } catch {
@@ -150,8 +150,8 @@ export const register = async (req: WebTriggerRequest): Promise<WebTriggerRespon
         return jsonResponse(400, { error: 'secret must be at least 32 characters' });
     }
 
-    if ((await storage.get(REGISTERED_KEY)) && !payload.force) {
-        return jsonResponse(409, { error: 'already registered; re-POST with {"force": true} to overwrite' });
+    if (await storage.get(REGISTERED_KEY)) {
+        return jsonResponse(409, { error: 'already registered; clear mm.registered from Forge storage to reset' });
     }
 
     await storage.setSecret(SECRET_KEY, payload.secret);

server/confluence_server.go

@@ -420,17 +420,15 @@ func (p *Plugin) dispatchServerMentionDMs(event *serializer.ConfluenceServerWebh
 		}
 		kind = service.ContentKindComment
 		pageTitle = eventData.Comment.Container.Title
-		pageURL = fmt.Sprintf("%s/spaces/%s/pages/%s",
-			pageBaseURL, eventData.Comment.Space.Key, eventData.Comment.Container.ID)
+		pageURL = joinURL(pageBaseURL, eventData.Comment.Container.Links.Self)
 		accountIDs, err = client.MentionAccountIDsInComment(eventData.Comment.ID, "")
 	case serializer.PageCreatedEvent, serializer.PageUpdatedEvent:
 		if eventData.Page == nil {
 			return
 		}
 		kind = service.ContentKindPage
 		pageTitle = eventData.Page.Title
-		pageURL = fmt.Sprintf("%s/spaces/%s/pages/%s",
-			pageBaseURL, eventData.Page.Space.Key, eventData.Page.ID)
+		pageURL = joinURL(pageBaseURL, eventData.Page.Links.Self)
 		accountIDs, err = client.MentionAccountIDsInPage(eventData.Page.ID)
 	default:
 		return
@@ -472,17 +470,15 @@ func (p *Plugin) dispatchServerMentionDMsWithAPIToken(event *serializer.Confluen
 		contentID = eventData.Comment.ID
 		kind = service.ContentKindComment
 		pageTitle = eventData.Comment.Container.Title
-		pageURL = fmt.Sprintf("%s/spaces/%s/pages/%s",
-			pluginConfig.ConfluenceURL, eventData.Comment.Space.Key, eventData.Comment.Container.ID)
+		pageURL = joinURL(pluginConfig.ConfluenceURL, eventData.Comment.Container.Links.Self)
 	case serializer.PageCreatedEvent, serializer.PageUpdatedEvent:
 		if eventData.Page == nil {
 			return
 		}
 		contentID = eventData.Page.ID
 		kind = service.ContentKindPage
 		pageTitle = eventData.Page.Title
-		pageURL = fmt.Sprintf("%s/spaces/%s/pages/%s",
-			pluginConfig.ConfluenceURL, eventData.Page.Space.Key, eventData.Page.ID)
+		pageURL = joinURL(pluginConfig.ConfluenceURL, eventData.Page.Links.Self)
 	default:
 		return
 	}

server/forge_poller.go

@@ -220,7 +220,7 @@ func (fp *ForgePoller) dispatchMentionDMs(evt *serializer.ForgeEvent, internalEv
 		log.Warn("mention DM: failed to parse ADF body", "content_id", evt.Content.ID.String(), "error", err.Error())
 		return
 	}
-	log.Debug("mention DM: parsed mentions", "event", internalEvent, "content_id", evt.Content.ID.String(), "mention_count", len(accountIDs), "account_ids", accountIDs)
+	log.Debug("mention DM: parsed mentions", "event", internalEvent, "content_id", evt.Content.ID.String(), "mention_count", len(accountIDs))
 	if len(accountIDs) == 0 {
 		return
 	}
@@ -231,7 +231,7 @@ func (fp *ForgePoller) dispatchMentionDMs(evt *serializer.ForgeEvent, internalEv
 	}
 	pageTitle, pageURL := evt.MentionPageContext()
 	instanceID := config.GetConfig().GetConfluenceBaseURL()
-	log.Debug("mention DM: dispatching", "instance_id", instanceID, "actor_account_id", evt.ActorAccountID(), "kind", kind, "page_url", pageURL)
+	log.Debug("mention DM: dispatching", "instance_id", instanceID, "kind", kind, "page_url", pageURL, "recipients", len(accountIDs))
 	service.SendMentionDMs(service.MentionDispatchParams{
 		InstanceID:     instanceID,
 		AccountIDs:     accountIDs,

server/serializer/confluence_forge.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"strings"
 
 	"github.com/mattermost/mattermost/server/public/model"
 
@@ -131,7 +132,11 @@ func (e *ForgeEvent) pageURL(pageID string) string {
 	if e.BaseURL == "" || spaceKey == "" || pageID == "" {
 		return ""
 	}
-	return fmt.Sprintf("%s/spaces/%s/pages/%s", e.BaseURL, spaceKey, pageID)
+	base := strings.TrimRight(e.BaseURL, "/")
+	if !strings.HasSuffix(base, "/wiki") {
+		base += "/wiki"
+	}
+	return fmt.Sprintf("%s/spaces/%s/pages/%s", base, spaceKey, pageID)
 }
 
 func (e *ForgeEvent) GetNotificationPost(eventType string) *model.Post {

server/store/store.go

@@ -219,6 +219,12 @@ func DeleteConnectionFromKVStore(instanceID, mattermostUserID string, c *types.C
 		return appErr
 	}
 
+	if mattermostUserID == AdminMattermostUserID {
+		config.Mattermost.LogDebug("Deleted: admin sentinel, reverse mapping preserved",
+			"key", keyWithInstanceID(instanceID, mattermostUserID))
+		return nil
+	}
+
 	if appErr := config.Mattermost.KVDelete(keyWithInstanceID(instanceID, c.ConfluenceAccountID())); appErr != nil {
 		return appErr
 	}