Send invite message as bot message, not ephemeral (#607) (#610)

* send invite message as bot message, not ephemeral

* update connect message

* check error

* cleanup

* edit post message to not set id

(cherry picked from commit 9c70367)

server/api.go

@@ -571,7 +571,17 @@ func (a *API) oauthRedirectHandler(w http.ResponseWriter, r *http.Request) {
 		UserId:    a.p.GetBotUserID(),
 		CreateAt:  model.GetMillis(),
 	}
-	_ = a.p.GetAPI().UpdateEphemeralPost(mmUser.Id, post)
+
+	_, appErr = a.p.GetAPI().GetPost(stateArr[2])
+	if appErr == nil {
+		_, appErr = a.p.GetAPI().UpdatePost(post)
+		if appErr != nil {
+			a.p.API.LogWarn("Unable to update post", "post", post.Id, "error", err.Error())
+		}
+	} else {
+		_ = a.p.GetAPI().UpdateEphemeralPost(mmUser.Id, post)
+	}
+
 	connectURL := a.p.GetURL() + "/primary-platform"
 	http.Redirect(w, r, connectURL, http.StatusSeeOther)
 }

server/connect.go

@@ -93,16 +93,30 @@ func (p *Plugin) SendInviteMessage(user *model.User, pendingSince time.Time, cur
 		invitedUser.InvitePendingSince = currentTime
 	}
 
-	if err := p.store.StoreInvitedUser(invitedUser); err != nil {
-		return errors.Wrapf(err, "error storing user in invite list")
-	}
-
 	channel, err := p.apiClient.Channel.GetDirect(user.Id, p.userID)
 	if err != nil {
 		return errors.Wrapf(err, "failed to get bot DM channel with user_id %s", user.Id)
 	}
+
 	message := fmt.Sprintf("@%s, you're invited to use the MS Teams connected experience. ", user.Username)
-	p.SendConnectMessage(channel.Id, user.Id, message)
+	invitePost := &model.Post{
+		Message:   message,
+		UserId:    p.userID,
+		ChannelId: channel.Id,
+	}
+	if err := p.apiClient.Post.CreatePost(invitePost); err != nil {
+		return errors.Wrapf(err, "error sending bot message")
+	}
+
+	connectURL := fmt.Sprintf(p.GetURL()+"/connect?post_id=%s&channel_id=%s", invitePost.Id, channel.Id)
+	invitePost.Message = fmt.Sprintf("%s [Click here to connect your account](%s)", invitePost.Message, connectURL)
+	if err := p.apiClient.Post.UpdatePost(invitePost); err != nil {
+		return errors.Wrapf(err, "error sending bot message")
+	}
+
+	if err := p.store.StoreInvitedUser(invitedUser); err != nil {
+		return errors.Wrapf(err, "error storing user in invite list")
+	}
 
 	return nil
 }