Attachment 8434 Details for Bug 43583

[patch] patch

43583.patch (text/plain), 5.33 KB, created by Florian Best on 2017-02-20 10:33 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2017-02-20 10:33 CET

Size: 5.33 KB

patch

obsolete

>diff --git a/univention-google-apps/umc/js/de.po b/univention-google-apps/umc/js/de.po
>index 7e921f6..143ab88 100644
>--- a/univention-google-apps/umc/js/de.po
>+++ b/univention-google-apps/umc/js/de.po
>@@ -163,8 +163,8 @@ msgstr "URL der Abmeldeseite"
> msgid "Single Sign-On setup"
> msgstr "Single Sign-On Konfiguration"
> 
>-msgid "Synchronized users can log into Google Apps for Work by using the link on the <a href=\"/ucs-overview#services\" target=\"_blank\">UCS overview page</a>."
>-msgstr "Synchronisierte Benutzer kÃ¶nnen sich bei Google Apps for Work anmelden, indem Sie den Link auf der <a href=\"/ucs-overview#services\" target=\"_blank\">UCS Ãbersichtsseite</a> nutzen."
>+msgid "Synchronized users can log into Google Apps for Work by using the link on the <a href=\"/univention/\" target=\"_blank\">UCS portal</a>."
>+msgstr "Synchronisierte Benutzer kÃ¶nnen sich bei Google Apps for Work anmelden, indem Sie den Link auf dem <a href=\"/univention/\" target=\"_blank\">UCS Portal</a> nutzen."
> 
> msgid "The Admin SDK API will be used to create user accounts and groups in Googles directory."
> msgstr "Die Admin SDK API wird benutzt, um Benutzerkonten und Gruppen im Google Verzeichnis zu erstellen."
>diff --git a/univention-google-apps/umc/js/googleapps.js b/univention-google-apps/umc/js/googleapps.js
>index 1418367..af62368 100644
>--- a/univention-google-apps/umc/js/googleapps.js
>+++ b/univention-google-apps/umc/js/googleapps.js
>@@ -254,7 +254,7 @@ define([
> 					widgets: [{
> 						type: Text,
> 						name: 'infos',
>-						content: _('Synchronized users can log into Google Apps for Work by using the link on the <a href="/ucs-overview#services" target="_blank">UCS overview page</a>.') + ' ' + this.img(_('google-sso-login.png'))
>+						content: _('Synchronized users can log into Google Apps for Work by using the link on the <a href="/univention/" target="_blank">UCS portal</a>.') + ' ' + this.img(_('google-sso-login.png'))
> 					}]
> 				}, {
> 					name: 'error',
>@@ -373,7 +373,7 @@ define([
> 		getTextSingleSignOnSetup: function() {
> 			return '' + _('To finalize the setup, single sign-on has to be configured for the Google Apps for Work domain.') + '' + this.formatOrderedList([
> 				_('Open the <a href="https://admin.google.com/AdminHome?fral=1#SecuritySettings:flyout=sso" target="_blank">security settings in the Admin Console</a> to configure the single sign-on settings.'),
>-				lang.replace(_('Download the {certificate_link}.'), {certificate_link: '<a href="/univention-management-console/command/googleapps/certificate.crt" target="_blank">' + _('UCS Identity Provider certificate') + '</a>'}),
>+				lang.replace(_('Download the {certificate_link}.'), {certificate_link: '<a href="/univention/command/googleapps/certificate.crt" target="_blank">' + _('UCS Identity Provider certificate') + '</a>'}),
> 				_('Activate the checkbox Setup SSO with third party identity provider in the security settings.'),
> 				_('Then upload the certificate as Verification certificate by clicking on CHOOSE FILE and UPLOAD.'),
> 				_('As last step the following values needs to be inserted into the input fields as can be seen in the screenshot below:')
>diff --git a/univention-google-apps/umc/python/googleapps/__init__.py b/univention-google-apps/umc/python/googleapps/__init__.py
>index 35efc42..4d95afb 100644
>--- a/univention-google-apps/umc/python/googleapps/__init__.py
>+++ b/univention-google-apps/umc/python/googleapps/__init__.py
>@@ -39,7 +39,7 @@
> from univention.management.console.base import Base, UMC_Error, UMC_OptionSanitizeError
> from univention.management.console.config import ucr
> 
>-from univention.management.console.modules.decorators import sanitize, simple_response, file_upload
>+from univention.management.console.modules.decorators import sanitize, simple_response, file_upload, allow_get
> from univention.management.console.modules.sanitizers import StringSanitizer, DictSanitizer, EmailSanitizer, ValidationError, MultiValidationError
> 
> from univention.googleapps.auth import GappsAuth, SCOPE, GoogleAppError, AuthenticationError, AuthenticationErrorRetry
>@@ -84,10 +84,11 @@ def query(self):
> 		return {
> 			'initialized': GappsAuth.is_initialized(),
> 			'sign-in-url': 'https://%s/simplesamlphp/saml2/idp/SSOService.php' % (sso_fqdn,),
>-			'sign-out-url': 'https://%s/simplesamlphp/saml2/idp/SingleLogoutService.php?ReturnTo=/ucs-overview' % (sso_fqdn,),
>-			'change-password-url': 'https://%s/univention-management-console/' % (fqdn,),
>+			'sign-out-url': 'https://%s/simplesamlphp/saml2/idp/SingleLogoutService.php?ReturnTo=/univention/' % (sso_fqdn,),
>+			'change-password-url': 'https://%s/univention/management/' % (fqdn,),
> 		}
> 
>+	@allow_get
> 	def certificate(self, request):
> 		with open(ucr['saml/idp/certificate/certificate'], 'rb') as fd:
> 			self.finished(request.id, fd.read(), mimetype='application/octet-stream')
>@@ -114,7 +115,7 @@ def upload(self, request):
> 		self.finished(request.id, {
> 			'client_id': data['client_id'],
> 			'scope': ','.join(SCOPE),
>-#			'serviceaccounts_link': 'https://console.developers.google.com/permissions/serviceaccounts?project=%s' % (urllib.quote(data['project_id']),)
>+			# 'serviceaccounts_link': 'https://console.developers.google.com/permissions/serviceaccounts?project=%s' % (urllib.quote(data['project_id']),)
> 		}, message=_('The credentials have been successfully uploaded.'))
> 
> 	@simple_response

Actions: View | Diff

Attachments on bug 43583: 8434