Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
5bf0b179
Commit
5bf0b179
authored
Jun 19, 2015
by
Braden MacDonald
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump python-social-auth and python-same to upstream's latest master - PR 8599
parent
00226bf3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
common/djangoapps/third_party_auth/models.py
+2
-2
requirements/edx/base.txt
+2
-1
requirements/edx/github.txt
+0
-3
No files found.
common/djangoapps/third_party_auth/models.py
View file @
5bf0b179
...
@@ -300,7 +300,7 @@ class SAMLConfiguration(ConfigurationModel):
...
@@ -300,7 +300,7 @@ class SAMLConfiguration(ConfigurationModel):
default
=
'{
\n
"SECURITY_CONFIG": {"metadataCacheDuration": 604800, "signMetadata": false}
\n
}'
,
default
=
'{
\n
"SECURITY_CONFIG": {"metadataCacheDuration": 604800, "signMetadata": false}
\n
}'
,
help_text
=
(
help_text
=
(
"JSON object defining advanced settings that are passed on to python-saml. "
"JSON object defining advanced settings that are passed on to python-saml. "
"Valid keys that can be set here include: SECURITY_CONFIG
, SP_NAMEID_FORMATS,
SP_EXTRA"
"Valid keys that can be set here include: SECURITY_CONFIG
and
SP_EXTRA"
),
),
)
)
...
@@ -344,7 +344,7 @@ class SAMLConfiguration(ConfigurationModel):
...
@@ -344,7 +344,7 @@ class SAMLConfiguration(ConfigurationModel):
if
name
==
"SUPPORT_CONTACT"
:
if
name
==
"SUPPORT_CONTACT"
:
return
{
"givenName"
:
"SAML Support"
,
"emailAddress"
:
settings
.
TECH_SUPPORT_EMAIL
}
return
{
"givenName"
:
"SAML Support"
,
"emailAddress"
:
settings
.
TECH_SUPPORT_EMAIL
}
other_config
=
json
.
loads
(
self
.
other_config_str
)
other_config
=
json
.
loads
(
self
.
other_config_str
)
return
other_config
[
name
]
# SECURITY_CONFIG, SP_
NAMEID_FORMATS, SP_EXTRA
return
other_config
[
name
]
# SECURITY_CONFIG, SP_
EXTRA, or similar extra settings
class
SAMLProviderData
(
models
.
Model
):
class
SAMLProviderData
(
models
.
Model
):
...
...
requirements/edx/base.txt
View file @
5bf0b179
...
@@ -69,7 +69,8 @@ pyparsing==2.0.1
...
@@ -69,7 +69,8 @@ pyparsing==2.0.1
python-memcached==1.48
python-memcached==1.48
python-openid==2.2.5
python-openid==2.2.5
python-dateutil==2.1
python-dateutil==2.1
# python-social-auth==0.2.7 was here but is temporarily moved to github.txt
python-social-auth==0.2.11
python-saml==2.1.3
pytz==2015.2
pytz==2015.2
pysrt==0.4.7
pysrt==0.4.7
PyYAML==3.10
PyYAML==3.10
...
...
requirements/edx/github.txt
View file @
5bf0b179
...
@@ -30,9 +30,6 @@ git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b
...
@@ -30,9 +30,6 @@ git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b
git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c4aee6e76b9abe61cc808
git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c4aee6e76b9abe61cc808
# custom opaque-key implementations for ccx
# custom opaque-key implementations for ccx
-e git+https://github.com/jazkarta/ccx-keys.git@e6b03704b1bb97c1d2f31301ecb4e3a687c536ea#egg=ccx-keys
-e git+https://github.com/jazkarta/ccx-keys.git@e6b03704b1bb97c1d2f31301ecb4e3a687c536ea#egg=ccx-keys
# For SAML Support (To be moved to PyPi installation in base.txt once our changes are merged):
-e git+https://github.com/open-craft/python-saml.git@9602b8133056d8c3caa7c3038761147df3d4b257#egg=python-saml
-e git+https://github.com/open-craft/python-social-auth.git@02ab628b8961b969021de87aeb23551da4e751b7#egg=python-social-auth
# Our libraries:
# Our libraries:
-e git+https://github.com/edx/XBlock.git@74fdc5a361f48e5596acf3846ca3790a33a05253#egg=XBlock
-e git+https://github.com/edx/XBlock.git@74fdc5a361f48e5596acf3846ca3790a33a05253#egg=XBlock
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment