@@ -45,39 +45,33 @@ def RUNTIME_ENVIRONMENT():
45
45
# Application definition
46
46
47
47
INSTALLED_APPS = [
48
+ "django.contrib.admin" ,
49
+ "django.contrib.auth" ,
50
+ "django.contrib.contenttypes" ,
48
51
"django.contrib.messages" ,
49
52
"django.contrib.sessions" ,
50
53
"django.contrib.staticfiles" ,
54
+ "django_google_sso" ,
51
55
"benefits.core" ,
52
56
"benefits.enrollment" ,
53
57
"benefits.eligibility" ,
54
58
"benefits.oauth" ,
55
59
]
56
60
57
- if ADMIN :
58
- GOOGLE_SSO_CLIENT_ID = os .environ .get ("GOOGLE_SSO_CLIENT_ID" , "secret" )
59
- GOOGLE_SSO_PROJECT_ID = os .environ .get ("GOOGLE_SSO_PROJECT_ID" , "benefits-admin" )
60
- GOOGLE_SSO_CLIENT_SECRET = os .environ .get ("GOOGLE_SSO_CLIENT_SECRET" , "secret" )
61
- GOOGLE_SSO_ALLOWABLE_DOMAINS = _filter_empty (os .environ .get ("GOOGLE_SSO_ALLOWABLE_DOMAINS" , "compiler.la" ).split ("," ))
62
- GOOGLE_SSO_STAFF_LIST = _filter_empty (os .environ .get ("GOOGLE_SSO_STAFF_LIST" , "" ).split ("," ))
63
- GOOGLE_SSO_SUPERUSER_LIST = _filter_empty (os .environ .get ("GOOGLE_SSO_SUPERUSER_LIST" , "" ).split ("," ))
64
- GOOGLE_SSO_LOGO_URL = "/static/img/icon/google_sso_logo.svg"
65
- GOOGLE_SSO_SAVE_ACCESS_TOKEN = True
66
- GOOGLE_SSO_PRE_LOGIN_CALLBACK = "benefits.core.admin.pre_login_user"
67
- GOOGLE_SSO_SCOPES = [
68
- "openid" ,
69
- "https://www.googleapis.com/auth/userinfo.email" ,
70
- "https://www.googleapis.com/auth/userinfo.profile" ,
71
- ]
72
-
73
- INSTALLED_APPS .extend (
74
- [
75
- "django.contrib.admin" ,
76
- "django.contrib.auth" ,
77
- "django.contrib.contenttypes" ,
78
- "django_google_sso" , # Add django_google_sso
79
- ]
80
- )
61
+ GOOGLE_SSO_CLIENT_ID = os .environ .get ("GOOGLE_SSO_CLIENT_ID" , "secret" )
62
+ GOOGLE_SSO_PROJECT_ID = os .environ .get ("GOOGLE_SSO_PROJECT_ID" , "benefits-admin" )
63
+ GOOGLE_SSO_CLIENT_SECRET = os .environ .get ("GOOGLE_SSO_CLIENT_SECRET" , "secret" )
64
+ GOOGLE_SSO_ALLOWABLE_DOMAINS = _filter_empty (os .environ .get ("GOOGLE_SSO_ALLOWABLE_DOMAINS" , "compiler.la" ).split ("," ))
65
+ GOOGLE_SSO_STAFF_LIST = _filter_empty (os .environ .get ("GOOGLE_SSO_STAFF_LIST" , "" ).split ("," ))
66
+ GOOGLE_SSO_SUPERUSER_LIST = _filter_empty (os .environ .get ("GOOGLE_SSO_SUPERUSER_LIST" , "" ).split ("," ))
67
+ GOOGLE_SSO_LOGO_URL = "/static/img/icon/google_sso_logo.svg"
68
+ GOOGLE_SSO_SAVE_ACCESS_TOKEN = True
69
+ GOOGLE_SSO_PRE_LOGIN_CALLBACK = "benefits.core.admin.pre_login_user"
70
+ GOOGLE_SSO_SCOPES = [
71
+ "openid" ,
72
+ "https://www.googleapis.com/auth/userinfo.email" ,
73
+ "https://www.googleapis.com/auth/userinfo.profile" ,
74
+ ]
81
75
82
76
MIDDLEWARE = [
83
77
"django.middleware.security.SecurityMiddleware" ,
@@ -91,16 +85,10 @@ def RUNTIME_ENVIRONMENT():
91
85
"django.middleware.clickjacking.XFrameOptionsMiddleware" ,
92
86
"csp.middleware.CSPMiddleware" ,
93
87
"benefits.core.middleware.ChangedLanguageEvent" ,
88
+ "django.contrib.auth.middleware.AuthenticationMiddleware" ,
89
+ "django.contrib.messages.middleware.MessageMiddleware" ,
94
90
]
95
91
96
- if ADMIN :
97
- MIDDLEWARE .extend (
98
- [
99
- "django.contrib.auth.middleware.AuthenticationMiddleware" ,
100
- "django.contrib.messages.middleware.MessageMiddleware" ,
101
- ]
102
- )
103
-
104
92
if DEBUG :
105
93
MIDDLEWARE .append ("benefits.core.middleware.DebugSession" )
106
94
@@ -162,13 +150,12 @@ def RUNTIME_ENVIRONMENT():
162
150
]
163
151
)
164
152
165
- if ADMIN :
166
- template_ctx_processors .extend (
167
- [
168
- "django.contrib.auth.context_processors.auth" ,
169
- "django.contrib.messages.context_processors.messages" ,
170
- ]
171
- )
153
+ template_ctx_processors .extend (
154
+ [
155
+ "django.contrib.auth.context_processors.auth" ,
156
+ "django.contrib.messages.context_processors.messages" ,
157
+ ]
158
+ )
172
159
173
160
TEMPLATES = [
174
161
{
@@ -193,25 +180,21 @@ def RUNTIME_ENVIRONMENT():
193
180
194
181
# Password validation
195
182
196
- AUTH_PASSWORD_VALIDATORS = []
183
+ AUTH_PASSWORD_VALIDATORS = [
184
+ {
185
+ "NAME" : "django.contrib.auth.password_validation.UserAttributeSimilarityValidator" ,
186
+ },
187
+ {
188
+ "NAME" : "django.contrib.auth.password_validation.MinimumLengthValidator" ,
189
+ },
190
+ {
191
+ "NAME" : "django.contrib.auth.password_validation.CommonPasswordValidator" ,
192
+ },
193
+ {
194
+ "NAME" : "django.contrib.auth.password_validation.NumericPasswordValidator" ,
195
+ },
196
+ ]
197
197
198
- if ADMIN :
199
- AUTH_PASSWORD_VALIDATORS .extend (
200
- [
201
- {
202
- "NAME" : "django.contrib.auth.password_validation.UserAttributeSimilarityValidator" ,
203
- },
204
- {
205
- "NAME" : "django.contrib.auth.password_validation.MinimumLengthValidator" ,
206
- },
207
- {
208
- "NAME" : "django.contrib.auth.password_validation.CommonPasswordValidator" ,
209
- },
210
- {
211
- "NAME" : "django.contrib.auth.password_validation.NumericPasswordValidator" ,
212
- },
213
- ]
214
- )
215
198
216
199
# Internationalization
217
200
0 commit comments