From e582b609b5712f5069c0761adfdbd06bbcc84ef5 Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Thu, 28 Apr 2022 17:20:10 +0200
Subject: [PATCH] fix startup with `ocis init`

---
 extensions/auth-basic/pkg/config/config.go          |  2 +-
 extensions/group/pkg/config/config.go               |  2 +-
 extensions/idp/pkg/config/defaults/defaultconfig.go |  2 +-
 extensions/user/pkg/config/config.go                |  2 +-
 ocis/pkg/init/init.go                               | 12 ++++++------
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/extensions/auth-basic/pkg/config/config.go b/extensions/auth-basic/pkg/config/config.go
index 3357d76b51..2632ac9b16 100644
--- a/extensions/auth-basic/pkg/config/config.go
+++ b/extensions/auth-basic/pkg/config/config.go
@@ -64,7 +64,7 @@ type LDAPProvider struct {
 	CACert           string   `env:"LDAP_CACERT;AUTH_BASIC_LDAP_CACERT"`
 	Insecure         bool     `env:"LDAP_INSECURE;AUTH_BASIC_LDAP_INSECURE"`
 	BindDN           string   `env:"LDAP_BIND_DN;AUTH_BASIC_LDAP_BIND_DN"`
-	BindPassword     string   `env:"LDAP_BIND_PASSWORD;AUTH_BASIC_LDAP_BIND_PASSWORD"`
+	BindPassword     string   `yaml:"bind_password" env:"LDAP_BIND_PASSWORD;AUTH_BASIC_LDAP_BIND_PASSWORD"`
 	UserBaseDN       string   `env:"LDAP_USER_BASE_DN;AUTH_BASIC_LDAP_USER_BASE_DN"`
 	GroupBaseDN      string   `env:"LDAP_GROUP_BASE_DN;AUTH_BASIC_LDAP_GROUP_BASE_DN"`
 	UserScope        string   `env:"LDAP_USER_SCOPE;AUTH_BASIC_LDAP_USER_SCOPE"`
diff --git a/extensions/group/pkg/config/config.go b/extensions/group/pkg/config/config.go
index 9588f87672..415db0255e 100644
--- a/extensions/group/pkg/config/config.go
+++ b/extensions/group/pkg/config/config.go
@@ -65,7 +65,7 @@ type LDAPDriver struct {
 	CACert           string   `env:"LDAP_CACERT;GROUPS_LDAP_CACERT"`
 	Insecure         bool     `env:"LDAP_INSECURE;GROUPS_LDAP_INSECURE"`
 	BindDN           string   `env:"LDAP_BIND_DN;GROUPS_LDAP_BIND_DN"`
-	BindPassword     string   `env:"LDAP_BIND_PASSWORD;GROUPS_LDAP_BIND_PASSWORD"`
+	BindPassword     string   `yaml:"bind_password" env:"LDAP_BIND_PASSWORD;GROUPS_LDAP_BIND_PASSWORD"`
 	UserBaseDN       string   `env:"LDAP_USER_BASE_DN;GROUPS_LDAP_USER_BASE_DN"`
 	GroupBaseDN      string   `env:"LDAP_GROUP_BASE_DN;GROUPS_LDAP_GROUP_BASE_DN"`
 	UserScope        string   `env:"LDAP_USER_SCOPE;GROUPS_LDAP_USER_SCOPE"`
diff --git a/extensions/idp/pkg/config/defaults/defaultconfig.go b/extensions/idp/pkg/config/defaults/defaultconfig.go
index 23c9def14c..8bd508ab1c 100644
--- a/extensions/idp/pkg/config/defaults/defaultconfig.go
+++ b/extensions/idp/pkg/config/defaults/defaultconfig.go
@@ -69,7 +69,7 @@ func DefaultConfig() *config.Config {
 			URI:               "ldaps://localhost:9235",
 			TLSCACert:         path.Join(defaults.BaseDataPath(), "idm", "ldap.crt"),
 			BindDN:            "uid=idp,ou=sysusers,o=libregraph-idm",
-			BindPassword:      "idp",
+			BindPassword:      "",
 			BaseDN:            "ou=users,o=libregraph-idm",
 			Scope:             "sub",
 			LoginAttribute:    "uid",
diff --git a/extensions/user/pkg/config/config.go b/extensions/user/pkg/config/config.go
index d09b7bb4dc..41cc0ab6e6 100644
--- a/extensions/user/pkg/config/config.go
+++ b/extensions/user/pkg/config/config.go
@@ -65,7 +65,7 @@ type LDAPDriver struct {
 	CACert           string   `env:"LDAP_CACERT;USERS_LDAP_CACERT"`
 	Insecure         bool     `env:"LDAP_INSECURE;USERS_LDAP_INSECURE"`
 	BindDN           string   `env:"LDAP_BIND_DN;USERS_LDAP_BIND_DN"`
-	BindPassword     string   `env:"LDAP_BIND_PASSWORD;USERS_LDAP_BIND_PASSWORD"`
+	BindPassword     string   `yaml:"bind_password" env:"LDAP_BIND_PASSWORD;USERS_LDAP_BIND_PASSWORD"`
 	UserBaseDN       string   `env:"LDAP_USER_BASE_DN;USERS_LDAP_USER_BASE_DN"`
 	GroupBaseDN      string   `env:"LDAP_GROUP_BASE_DN;USERS_LDAP_GROUP_BASE_DN"`
 	UserScope        string   `env:"LDAP_USER_SCOPE;USERS_LDAP_USER_SCOPE"`
diff --git a/ocis/pkg/init/init.go b/ocis/pkg/init/init.go
index 22a7940061..7aae4e6bd9 100644
--- a/ocis/pkg/init/init.go
+++ b/ocis/pkg/init/init.go
@@ -33,7 +33,7 @@ type DataProviderInsecureSettings struct {
 }
 
 type LdapSettings struct {
-	Bindpassword string
+	Bind_password string
 }
 type LdapBasedExtension struct {
 	Ldap LdapSettings
@@ -193,34 +193,34 @@ func CreateConfig(insecure, forceOverwrite bool, configPath string) error {
 		},
 		Idp: LdapBasedExtension{
 			Ldap: LdapSettings{
-				Bindpassword: idpServicePassword,
+				Bind_password: idpServicePassword,
 			},
 		},
 		Auth_basic: AuthbasicExtension{
 			Auth_providers: LdapBasedExtension{
 				Ldap: LdapSettings{
-					Bindpassword: revaServicePassword,
+					Bind_password: revaServicePassword,
 				},
 			},
 		},
 		Group: UserAndGroupExtension{
 			Drivers: LdapBasedExtension{
 				Ldap: LdapSettings{
-					Bindpassword: revaServicePassword,
+					Bind_password: revaServicePassword,
 				},
 			},
 		},
 		User: UserAndGroupExtension{
 			Drivers: LdapBasedExtension{
 				Ldap: LdapSettings{
-					Bindpassword: revaServicePassword,
+					Bind_password: revaServicePassword,
 				},
 			},
 		},
 		Graph: GraphExtension{
 			Identity: LdapBasedExtension{
 				Ldap: LdapSettings{
-					Bindpassword: idmServicePassword,
+					Bind_password: idmServicePassword,
 				},
 			},
 		},