rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pool: Reddo component-like fields

Browse source
This commit is contained in:
Tom Wiesing 2022-12-22 13:49:05 +01:00
parent 99983ee6db
commit 337a5fbeba
No known key found for this signature in database
48 changed files with 291 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/wisski/ingredient/php/users/password.go
View file

@ -16,10 +16,10 @@ import (
var errGetValidator = errors.New("GetPasswordValidator: Unknown Error")
func (u *Users) GetPasswordValidator(ctx context.Context, username string) (pv PasswordValidator, err error) {
server := u.PHP.NewServer()
server := u.Dependencies.PHP.NewServer()
var hash string
err = u.PHP.ExecScript(ctx, server, &hash, usersPHP, "get_password_hash", username)
err = u.Dependencies.PHP.ExecScript(ctx, server, &hash, usersPHP, "get_password_hash", username)
if err != nil {
server.Close()
return pv, err

11
internal/wisski/ingredient/php/users/users.go
View file

@ -14,8 +14,9 @@ import (
type Users struct {
ingredient.Base
PHP *php.PHP
Dependencies struct {
PHP *php.PHP
}
}
var (
@ -27,7 +28,7 @@ var usersPHP string
// All returns all known usernames
func (u *Users) All(ctx context.Context, server *phpx.Server) (users []status.User, err error) {
err = u.PHP.ExecScript(ctx, server, &users, usersPHP, "list_users")
err = u.Dependencies.PHP.ExecScript(ctx, server, &users, usersPHP, "list_users")
return
}
@ -38,7 +39,7 @@ func (u *Users) Login(ctx context.Context, server *phpx.Server, username string)
// generate a (relative) link
var path string
err = u.PHP.ExecScript(ctx, server, &path, usersPHP, "get_login_link", username)
err = u.Dependencies.PHP.ExecScript(ctx, server, &path, usersPHP, "get_login_link", username)
// if something went wrong, return
if err != nil {
@ -64,7 +65,7 @@ var errSetPassword = errors.New("SetPassword: Unknown Error")
// SetPassword sets the password for a given user
func (u *Users) SetPassword(ctx context.Context, server *phpx.Server, username, password string) error {
var ok bool
err := u.PHP.ExecScript(ctx, server, &ok, usersPHP, "set_user_password", username, password)
err := u.Dependencies.PHP.ExecScript(ctx, server, &ok, usersPHP, "set_user_password", username, password)
if err != nil {
return err
}