Merge branch 'main' into feat/member-remove-confirm-dialog

raystack · Sep 27, 2024 · 7af7076 · 7af7076
2 parents 0627bbf + 03b036e
commit 7af7076
Show file tree

Hide file tree

Showing 32 changed files with 1,960 additions and 61 deletions.
diff --git a/.mockery.yaml b/.mockery.yaml
@@ -58,4 +58,12 @@ packages:
   github.com/raystack/frontier/core/organization:
     config:
       dir: "core/organization/mocks"
+      all: true
+  github.com/raystack/frontier/core/invitation:
+    config:
+      dir: "core/invitation/mocks"
+      all: true
+  github.com/raystack/frontier/core/permission:
+    config:
+      dir: "core/permission/mocks"
       all: true
diff --git a/core/invitation/invite.go b/core/invitation/invite.go
@@ -9,8 +9,9 @@ import (
 )
 
 var (
-	ErrNotFound   = errors.New("invitation not found")
-	InviteExpired = errors.New("invitation expired")
+	ErrNotFound      = errors.New("invitation not found")
+	ErrInviteExpired = errors.New("invitation expired")
+	ErrAlreadyMember = errors.New("user already exists in organization")
 )
 
 const (

diff --git a/core/invitation/mocks/group_service.go b/core/invitation/mocks/group_service.go