From 3966ba695c383976fc0707204b37cf62f67e36d3 Mon Sep 17 00:00:00 2001
From: Tit Petric <black@scene-si.org>
Date: Wed, 3 Apr 2019 14:26:11 +0200
Subject: [PATCH] upd(system): error messages, service init cleanup

---
 system/internal/service/error.go   | 11 ++++++++++-
 system/internal/service/service.go | 24 +++++++++---------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/system/internal/service/error.go b/system/internal/service/error.go
index bae0374e6..9f45193a8 100644
--- a/system/internal/service/error.go
+++ b/system/internal/service/error.go
@@ -1,9 +1,18 @@
 package service
 
 type (
-	serviceError string
+	serviceError  string
+	readableError string
 )
 
 func (e serviceError) Error() string {
 	return "crust.messaging.service." + string(e)
 }
+
+func (e readableError) Error() string {
+	return string(e)
+}
+
+const (
+	ErrAvatarOnlyHTTPS readableError = "Avatar URL only supports HTTPS"
+)
diff --git a/system/internal/service/service.go b/system/internal/service/service.go
index 0b65c9ce9..49f515301 100644
--- a/system/internal/service/service.go
+++ b/system/internal/service/service.go
@@ -1,9 +1,5 @@
 package service
 
-import (
-	"sync"
-)
-
 type (
 	db interface {
 		Transaction(callback func() error) error
@@ -11,7 +7,6 @@ type (
 )
 
 var (
-	o                   sync.Once
 	DefaultAuth         AuthService
 	DefaultUser         UserService
 	DefaultRole         RoleService
@@ -21,14 +16,13 @@ var (
 	DefaultPermissions  PermissionsService
 )
 
-func Init() {
-	o.Do(func() {
-		DefaultRules = Rules()
-		DefaultPermissions = Permissions()
-		DefaultAuth = Auth()
-		DefaultUser = User()
-		DefaultRole = Role()
-		DefaultOrganisation = Organisation()
-		DefaultApplication = Application()
-	})
+func Init() error {
+	DefaultRules = Rules()
+	DefaultPermissions = Permissions()
+	DefaultAuth = Auth()
+	DefaultUser = User()
+	DefaultRole = Role()
+	DefaultOrganisation = Organisation()
+	DefaultApplication = Application()
+	return nil
 }