correct fallback

2023-11-03 11:12:07 -07:00
1 changed files with 7 additions and 6 deletions
--- a/src/pkg/services/m365/api/groups.go
+++ b/src/pkg/services/m365/api/groups.go
@ -150,15 +150,16 @@ func (c Groups) GetByID(
 		}

 		resp, err := service.Client().Groups().Get(ctx, opts)
-		if err != nil {
-			if graph.IsErrResourceLocked(err) {
-				err = clues.Stack(graph.ErrResourceLocked, err)
-			}

-			logger.CtxErr(ctx, err).Info("finding group by email, falling back to display name")
+		if err == nil {
+			return getGroupFromResponse(ctx, resp)
 		}

-		return getGroupFromResponse(ctx, resp)
+		if graph.IsErrResourceLocked(err) {
+			return nil, graph.Stack(ctx, clues.Stack(graph.ErrResourceLocked, err))
+		}
+
+		logger.CtxErr(ctx, err).Info("finding group by email, falling back to display name")
 	}

 	// fall back to display name