Minor org setup tweaks

Author: frikky

db-connector.go

@@ -4023,7 +4023,11 @@ func GetOrgByCreatorId(ctx context.Context, id string) (*Org, error) {
 // Handles org grabbing and user / org migrations
 func GetOrg(ctx context.Context, id string) (*Org, error) {
 	if id == "public" {
-		return &Org{}, errors.New("'public' org is used for Singul action without being logged in. Not relevant.")
+		//return &Org{}, errors.New("'public' org is used for Singul action without being logged in. Not relevant.")
+		return &Org{
+			Id:	 "public",
+			Name: "Public",
+		}, nil
 	}
 
 	nameKey := "Organizations"

shared.go

@@ -116,8 +116,10 @@ func HandleCors(resp http.ResponseWriter, request *http.Request) bool {
 			"https://br.shuffler.io",
 			"https://in.shuffler.io",
 
+			"https://*.singul.io",
 			"https://singul.io",
 			"http://localhost:3002",
+			"http://localhost:3000",
 		}
 
 		if len(origin) > 0 {

stats.go

@@ -659,34 +659,42 @@ func HandleGetStatistics(resp http.ResponseWriter, request *http.Request) {
 		orgId = user.ActiveOrg.Id
 	}
 
+	org := &Org{}
 	ctx := GetContext(request)
-	org, err := GetOrg(ctx, orgId)
-	if err != nil {
-		resp.WriteHeader(403)
-		resp.Write([]byte(`{"success": false, "reason": "Failed getting org stats"}`))
-		return
-	}
+	if orgId == "public" { 
+		if user.SupportAccess {
+			log.Printf("[AUDIT] User %s (%s) is getting org stats for PUBLIC org %s with support access", user.Username, user.Id, orgId)
+		}
 
-	userFound := false
-	for _, inneruser := range org.Users {
-		if inneruser.Id == user.Id {
-			userFound = true
+	} else {
+		org, err = GetOrg(ctx, orgId)
+		if err != nil {
+			resp.WriteHeader(403)
+			resp.Write([]byte(`{"success": false, "reason": "Failed getting org stats"}`))
+			return
+		}
 
-			break
+		userFound := false
+		for _, inneruser := range org.Users {
+			if inneruser.Id == user.Id {
+				userFound = true
+
+				break
+			}
 		}
-	}
 
-	if user.SupportAccess {
-		log.Printf("[AUDIT] User %s (%s) is getting org stats for %s (%s) with support access", user.Username, user.Id, org.Name, orgId)
-		userFound = true
-	}
+		if user.SupportAccess {
+			log.Printf("[AUDIT] User %s (%s) is getting org stats for %s (%s) with support access", user.Username, user.Id, org.Name, orgId)
+			userFound = true
+		}
 
-	if !userFound {
-		log.Printf("[WARNING] User %s isn't a part of org %s (get)", user.Id, org.Id)
-		resp.WriteHeader(403)
-		resp.Write([]byte(`{"success": false, "reason": "User doesn't have access to org"}`))
-		return
+		if !userFound {
+			log.Printf("[WARNING] User %s isn't a part of org %s (get)", user.Id, org.Id)
+			resp.WriteHeader(403)
+			resp.Write([]byte(`{"success": false, "reason": "User doesn't have access to org"}`))
+			return
 
+		}
 	}
 
 	// FIXME: Removed the current stats grabber as it made no sense