Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-20 13:49:42 +02:00
Code Releases Activity

latest build assets

Browse source
This commit is contained in:
Harvey Kandola 2017-08-04 13:17:09 +01:00
parent 476403bf46
commit 4046accc23
5 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -19,7 +19,7 @@ v1.51.0
## Tech stack ## Tech stack
- EmberJS (v2.14.0) - EmberJS (v2.14.0)
- Go (v1.8) - Go (v1.8.3)
- MySQL (v5.7.10+) or Percona (v5.7.16-10+) - MySQL (v5.7.10+) or Percona (v5.7.16-10+)
## Documentation ## Documentation

44
domain/mail/mailer.go
View file

@ -29,13 +29,13 @@ type Mailer struct {
Runtime *env.Runtime Runtime *env.Runtime
Store *domain.Store Store *domain.Store
Context domain.RequestContext Context domain.RequestContext
credentials credentials Credentials Credentials
} }
// InviteNewUser invites someone new providing credentials, explaining the product and stating who is inviting them. // InviteNewUser invites someone new providing credentials, explaining the product and stating who is inviting them.
func (m *Mailer) InviteNewUser(recipient, inviter, url, username, password string) { func (m *Mailer) InviteNewUser(recipient, inviter, url, username, password string) {
method := "InviteNewUser" method := "InviteNewUser"
m.loadCredentials() m.LoadCredentials()
file, err := web.ReadFile("mail/invite-new-user.html") file, err := web.ReadFile("mail/invite-new-user.html")
if err != nil { if err != nil {
@ -53,7 +53,7 @@ func (m *Mailer) InviteNewUser(recipient, inviter, url, username, password strin
subject := fmt.Sprintf("%s has invited you to Documize", inviter) subject := fmt.Sprintf("%s has invited you to Documize", inviter)
e := NewEmail() e := NewEmail()
e.From = m.credentials.SMTPsender e.From = m.Credentials.SMTPsender
e.To = []string{recipient} e.To = []string{recipient}
e.Subject = subject e.Subject = subject
@ -85,7 +85,7 @@ func (m *Mailer) InviteNewUser(recipient, inviter, url, username, password strin
// InviteExistingUser invites a known user to an organization. // InviteExistingUser invites a known user to an organization.
func (m *Mailer) InviteExistingUser(recipient, inviter, url string) { func (m *Mailer) InviteExistingUser(recipient, inviter, url string) {
method := "InviteExistingUser" method := "InviteExistingUser"
m.loadCredentials() m.LoadCredentials()
file, err := web.ReadFile("mail/invite-existing-user.html") file, err := web.ReadFile("mail/invite-existing-user.html")
if err != nil { if err != nil {
@ -103,7 +103,7 @@ func (m *Mailer) InviteExistingUser(recipient, inviter, url string) {
subject := fmt.Sprintf("%s has invited you to their Documize account", inviter) subject := fmt.Sprintf("%s has invited you to their Documize account", inviter)
e := NewEmail() e := NewEmail()
e.From = m.credentials.SMTPsender e.From = m.Credentials.SMTPsender
e.To = []string{recipient} e.To = []string{recipient}
e.Subject = subject e.Subject = subject
@ -131,7 +131,7 @@ func (m *Mailer) InviteExistingUser(recipient, inviter, url string) {
// PasswordReset sends a reset email with an embedded token. // PasswordReset sends a reset email with an embedded token.
func (m *Mailer) PasswordReset(recipient, url string) { func (m *Mailer) PasswordReset(recipient, url string) {
method := "PasswordReset" method := "PasswordReset"
m.loadCredentials() m.LoadCredentials()
file, err := web.ReadFile("mail/password-reset.html") file, err := web.ReadFile("mail/password-reset.html")
if err != nil { if err != nil {
@ -144,7 +144,7 @@ func (m *Mailer) PasswordReset(recipient, url string) {
subject := "Documize password reset request" subject := "Documize password reset request"
e := NewEmail() e := NewEmail()
e.From = m.credentials.SMTPsender //e.g. "Documize <hello@documize.com>" e.From = m.Credentials.SMTPsender //e.g. "Documize <hello@documize.com>"
e.To = []string{recipient} e.To = []string{recipient}
e.Subject = subject e.Subject = subject
@ -170,7 +170,7 @@ func (m *Mailer) PasswordReset(recipient, url string) {
// ShareFolderExistingUser provides an existing user with a link to a newly shared folder. // ShareFolderExistingUser provides an existing user with a link to a newly shared folder.
func (m *Mailer) ShareFolderExistingUser(recipient, inviter, url, folder, intro string) { func (m *Mailer) ShareFolderExistingUser(recipient, inviter, url, folder, intro string) {
method := "ShareFolderExistingUser" method := "ShareFolderExistingUser"
m.loadCredentials() m.LoadCredentials()
file, err := web.ReadFile("mail/share-folder-existing-user.html") file, err := web.ReadFile("mail/share-folder-existing-user.html")
if err != nil { if err != nil {
@ -188,7 +188,7 @@ func (m *Mailer) ShareFolderExistingUser(recipient, inviter, url, folder, intro
subject := fmt.Sprintf("%s has shared %s with you", inviter, folder) subject := fmt.Sprintf("%s has shared %s with you", inviter, folder)
e := NewEmail() e := NewEmail()
e.From = m.credentials.SMTPsender e.From = m.Credentials.SMTPsender
e.To = []string{recipient} e.To = []string{recipient}
e.Subject = subject e.Subject = subject
@ -217,10 +217,10 @@ func (m *Mailer) ShareFolderExistingUser(recipient, inviter, url, folder, intro
} }
} }
// ShareFolderNewUser invites new user providing credentials, explaining the product and stating who is inviting them. // ShareFolderNewUser invites new user providing Credentials, explaining the product and stating who is inviting them.
func (m *Mailer) ShareFolderNewUser(recipient, inviter, url, folder, invitationMessage string) { func (m *Mailer) ShareFolderNewUser(recipient, inviter, url, folder, invitationMessage string) {
method := "ShareFolderNewUser" method := "ShareFolderNewUser"
m.loadCredentials() m.LoadCredentials()
file, err := web.ReadFile("mail/share-folder-new-user.html") file, err := web.ReadFile("mail/share-folder-new-user.html")
if err != nil { if err != nil {
@ -238,7 +238,7 @@ func (m *Mailer) ShareFolderNewUser(recipient, inviter, url, folder, invitationM
subject := fmt.Sprintf("%s has shared %s with you on Documize", inviter, folder) subject := fmt.Sprintf("%s has shared %s with you on Documize", inviter, folder)
e := NewEmail() e := NewEmail()
e.From = m.credentials.SMTPsender e.From = m.Credentials.SMTPsender
e.To = []string{recipient} e.To = []string{recipient}
e.Subject = subject e.Subject = subject
@ -267,7 +267,8 @@ func (m *Mailer) ShareFolderNewUser(recipient, inviter, url, folder, invitationM
} }
} }
type credentials struct { // Credentials holds SMTP endpoint and authentication methods
type Credentials struct {
SMTPuserid string SMTPuserid string
SMTPpassword string SMTPpassword string
SMTPhost string SMTPhost string
@ -277,20 +278,21 @@ type credentials struct {
// GetAuth to return SMTP authentication details // GetAuth to return SMTP authentication details
func (m *Mailer) GetAuth() smtp.Auth { func (m *Mailer) GetAuth() smtp.Auth {
a := smtp.PlainAuth("", m.credentials.SMTPuserid, m.credentials.SMTPpassword, m.credentials.SMTPhost) a := smtp.PlainAuth("", m.Credentials.SMTPuserid, m.Credentials.SMTPpassword, m.Credentials.SMTPhost)
return a return a
} }
// GetHost to return SMTP host details // GetHost to return SMTP host details
func (m *Mailer) GetHost() string { func (m *Mailer) GetHost() string {
h := m.credentials.SMTPhost + ":" + m.credentials.SMTPport h := m.Credentials.SMTPhost + ":" + m.Credentials.SMTPport
return h return h
} }
func (m *Mailer) loadCredentials() { // LoadCredentials loads up SMTP details from database
m.credentials.SMTPuserid = m.Store.Setting.Get("SMTP", "userid") func (m *Mailer) LoadCredentials() {
m.credentials.SMTPpassword = m.Store.Setting.Get("SMTP", "password") m.Credentials.SMTPuserid = m.Store.Setting.Get("SMTP", "userid")
m.credentials.SMTPhost = m.Store.Setting.Get("SMTP", "host") m.Credentials.SMTPpassword = m.Store.Setting.Get("SMTP", "password")
m.credentials.SMTPport = m.Store.Setting.Get("SMTP", "port") m.Credentials.SMTPhost = m.Store.Setting.Get("SMTP", "host")
m.credentials.SMTPsender = m.Store.Setting.Get("SMTP", "sender") m.Credentials.SMTPport = m.Store.Setting.Get("SMTP", "port")
m.Credentials.SMTPsender = m.Store.Setting.Get("SMTP", "sender")
} }

2
domain/storer.go
View file

@ -80,7 +80,7 @@ type UserStorer interface {
UpdateUserPassword(ctx RequestContext, userID, salt, password string) (err error) UpdateUserPassword(ctx RequestContext, userID, salt, password string) (err error)
DeactiveUser(ctx RequestContext, userID string) (err error) DeactiveUser(ctx RequestContext, userID string) (err error)
ForgotUserPassword(ctx RequestContext, email, token string) (err error) ForgotUserPassword(ctx RequestContext, email, token string) (err error)
CountActiveUsers(ctx RequestContext) (c int) CountActiveUsers() (c int)
} }
// AccountStorer defines required methods for account management // AccountStorer defines required methods for account management

2
domain/user/mysql/store.go
View file

@ -283,7 +283,7 @@ func (s Scope) ForgotUserPassword(ctx domain.RequestContext, email, token string
} }
// CountActiveUsers returns the number of active users in the system. // CountActiveUsers returns the number of active users in the system.
func (s Scope) CountActiveUsers(ctx domain.RequestContext) (c int) { func (s Scope) CountActiveUsers() (c int) {
row := s.Runtime.Db.QueryRow("SELECT count(*) FROM user u WHERE u.refid IN (SELECT userid FROM account WHERE active=1)") row := s.Runtime.Db.QueryRow("SELECT count(*) FROM user u WHERE u.refid IN (SELECT userid FROM account WHERE active=1)")
err := row.Scan(&c) err := row.Scan(&c)

2
meta.json
View file

@ -3,7 +3,7 @@
{ {
"version": "1.51.0", "version": "1.51.0",
"major": 1, "major": 1,
"minor": 50, "minor": 51,
"patch": 0 "patch": 0
}, },
"enterprise": "enterprise":