@@ -56,29 +56,30 @@ stringData:
5656      secret: {{ .Values.experimentalFeatures.msc3861.admin_token }} 
5757      endpoint: {{ printf "https://%s/" .Values.synapse.serverName }} 
5858    {{- if or .Values.matrixAuthentication.config.upstream_oauth2.google .Values.matrixAuthentication.config.upstream_oauth2.providers }} 
59-     providers: 
60-     {{- range $g := .Values.matrixAuthentication.config.upstream_oauth2.google }} 
61-       - id: {{ $g.id }} 
62-         client_id: {{ $g.client_id | quote }} 
63-         client_secret: {{ $g.client_secret | quote }} 
64-         human_name: Google 
65-         brand_name: "google" 
66-         issuer: "https://accounts.google.com" 
67-         scope: "openid profile email" 
68-         token_endpoint_auth_method: client_secret_post 
69-         claims_imports: 
70-           localpart: 
71-             action: require 
72-             template: "{{`{{ (user.email | split('@'))[0] }}`}}" 
73-           displayname: 
74-             action: suggest 
75-             template: "{{`{{ (user.email | split('@'))[0] }}`}}" 
76-           email: 
77-             action: require 
78-             template: "{{`{{ user.email }}`}}" 
79-     {{- end }} 
59+     upstream_oauth2: 
60+       providers: 
61+       {{- range $g := .Values.matrixAuthentication.config.upstream_oauth2.google }} 
62+         - id: {{ $g.id }} 
63+           client_id: {{ $g.client_id | quote }} 
64+           client_secret: {{ $g.client_secret | quote }} 
65+           human_name: Google 
66+           brand_name: "google" 
67+           issuer: "https://accounts.google.com" 
68+           scope: "openid profile email" 
69+           token_endpoint_auth_method: client_secret_post 
70+           claims_imports: 
71+             localpart: 
72+               action: require 
73+               template: "{{`{{ (user.email | split('@'))[0] }}`}}" 
74+             displayname: 
75+               action: suggest 
76+               template: "{{`{{ (user.email | split('@'))[0] }}`}}" 
77+             email: 
78+               action: require 
79+               template: "{{`{{ user.email }}`}}" 
80+       {{- end }} 
8081    {{- if .Values.matrixAuthentication.config.upstream_oauth2.providers }} 
81-     {{ toYaml .Values.matrixAuthentication.config.upstream_oauth2.providers | nindent 6  }} 
82+     {{ toYaml .Values.matrixAuthentication.config.upstream_oauth2.providers | nindent 8  }} 
8283    {{- end }} 
8384    {{- end }} 
8485    {{ .Values.matrixAuthentication.configYaml | nindent 4 }} 
0 commit comments