diff --git a/sso/services/wiki/__init__.py b/sso/services/wiki/__init__.py index 2a7a25b..77725b8 100644 --- a/sso/services/wiki/__init__.py +++ b/sso/services/wiki/__init__.py @@ -82,10 +82,11 @@ class MediawikiService(BaseService): pwhash = self._gen_mw_hash(password) self._dbcursor.execute(self.SQL_ENABLE_USER, [pwhash, uid]) self._db.connection.commit() - pass + return True def reset_password(self, uid, password): """ Reset the user's password """ - self.enable_user(uid, password) + return self.enable_user(uid, password) + ServiceClass = 'MediawikiService' diff --git a/templates/sso/profile.html b/templates/sso/profile.html index 6a4e2a3..1cf5518 100644 --- a/templates/sso/profile.html +++ b/templates/sso/profile.html @@ -12,9 +12,9 @@
{% if eveaccounts %} -This is a list of all your current service accounts, to create a login for -a new service click the Add Service link
+This is a list of all your current external service accounts, to +create a login for a service click the Add Service link
{% if srvaccounts %}| Service: | {{ account.service.name }} |
| Service URL: | {{ account.service.url }} |
| Username: | {{ account.service_uid }} |
| Password: | {{ account.password }} |
To add a service to your account, selec the service from the list below diff --git a/templates/sso/serviceaccount/noneavailable.html b/templates/sso/serviceaccount/noneavailable.html index 544ac44..339d515 100644 --- a/templates/sso/serviceaccount/noneavailable.html +++ b/templates/sso/serviceaccount/noneavailable.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Service Account{% endblock %} +{% block title %}External Service Account{% endblock %} {% block content %}
You have no services available to add to your account
diff --git a/templates/sso/serviceaccount/reset.html b/templates/sso/serviceaccount/reset.html index 9920855..9aae69d 100644 --- a/templates/sso/serviceaccount/reset.html +++ b/templates/sso/serviceaccount/reset.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Service Account Password Reset{% endblock %} +{% block title %}External Service Account Password Reset{% endblock %} {% block content %} diff --git a/templates/sso/serviceaccount/resetcomplete.html b/templates/sso/serviceaccount/resetcomplete.html index 21e1f25..f20f019 100644 --- a/templates/sso/serviceaccount/resetcomplete.html +++ b/templates/sso/serviceaccount/resetcomplete.html @@ -1,12 +1,11 @@ {% extends "base.html" %} -{% block title %}Service Account{% endblock %} +{% block title %}External Service Account{% endblock %} {% block content %} {% if error %}Your account on {{ acc.service }} has been reset. Your login details are as follows: