From a8de3b08ba3059f05c846c01dd6a1b0057c8ab36 Mon Sep 17 00:00:00 2001
From: Peter Sanchez <peter@netlandish.com>
Date: Thu, 6 Jun 2024 18:36:52 -0600
Subject: [PATCH] Fixing missing path in member confirm url

---
 api/graph/schema.resolvers.go | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/api/graph/schema.resolvers.go b/api/graph/schema.resolvers.go
index 9830fe9..6c38535 100644
--- a/api/graph/schema.resolvers.go
+++ b/api/graph/schema.resolvers.go
@@ -11,6 +11,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"html/template"
 	"image"
 	"image/jpeg"
 	"image/png"
@@ -873,6 +874,7 @@ func (r *mutationResolver) AddMember(ctx context.Context, input *model.MemberInp
 	if isNewUser {
 		q.Set("redirect", "true")
 	}
+	confURL.Path = "/member/confirm"
 	confURL.RawQuery = q.Encode()
 
 	data := gobwebs.Map{
@@ -880,7 +882,7 @@ func (r *mutationResolver) AddMember(ctx context.Context, input *model.MemberInp
 		"currentUser": currentUser.Name,
 		"user":        user.Name,
 		"org":         org.Name,
-		"confURL":     confURL.String(),
+		"confURL":     template.URL(confURL.String()),
 	}
 	helper := email.NewHelper(srv.Email, tmap, tmpl)
 	err = helper.Send(
@@ -4351,16 +4353,21 @@ func (r *queryResolver) GetOrganizations(ctx context.Context, input *model.GetOr
 	}
 	user := tokenUser.User.(*models.User)
 	opts := &database.FilterOptions{
-		Filter: sq.Or{
-			sq.Eq{"o.owner_id": user.ID},
-			sq.And{
-				sq.Eq{"ou.user_id": user.ID},
-				sq.GtOrEq{"ou.permission": models.OrgUserPermissionAdminWrite},
-				sq.Eq{"ou.is_active": true},
-			},
-		},
+		Filter:  sq.Eq{"o.owner_id": user.ID},
 		OrderBy: "o.created_on ASC",
 	}
+	// XXX Uncomment when we decide on a path for org members with admin write permissions
+	//opts := &database.FilterOptions{
+	//    Filter: sq.Or{
+	//        sq.Eq{"o.owner_id": user.ID},
+	//        sq.And{
+	//            sq.Eq{"ou.user_id": user.ID},
+	//            sq.GtOrEq{"ou.permission": models.OrgUserPermissionAdminWrite},
+	//            sq.Eq{"ou.is_active": true},
+	//        },
+	//    },
+	//    OrderBy: "o.created_on ASC",
+	//}
 	if input.Search != nil && *input.Search != "" {
 		s := links.ParseSearch(*input.Search)
 		opts.Filter = sq.And{
-- 
2.45.2