Attachment #8434 for bug #43583

View | Details | Raw Unified | Return to bug 43583
Collapse All | Expand All

Lines 163-170 msgstr "URL der Abmeldeseite" Link Here

(-)a/univention-google-apps/umc/js/de.po (-2 / +2 lines)
163	msgid "Single Sign-On setup"	163	msgid "Single Sign-On setup"
164	msgstr "Single Sign-On Konfiguration"	164	msgstr "Single Sign-On Konfiguration"
165		165
166	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>."	166	msgid "Synchronized users can log into Google Apps for Work by using the link on the <a href=\"/univention/\" target=\"_blank\">UCS portal</a>."
167	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."	167	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."
168		168
169	msgid "The <i>Admin SDK API</i> will be used to create user accounts and groups in Googles directory."	169	msgid "The <i>Admin SDK API</i> will be used to create user accounts and groups in Googles directory."
170	msgstr "Die <i>Admin SDK API</i> wird benutzt, um Benutzerkonten und Gruppen im Google Verzeichnis zu erstellen."	170	msgstr "Die <i>Admin SDK API</i> wird benutzt, um Benutzerkonten und Gruppen im Google Verzeichnis zu erstellen."

Lines 254-260 define([ Link Here

(-)a/univention-google-apps/umc/js/googleapps.js (-2 / +2 lines)
254	widgets: [{	254	widgets: [{
255	type: Text,	255	type: Text,
256	name: 'infos',	256	name: 'infos',
257	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>.') + '<br>' + this.img(_('google-sso-login.png'))	257	content: _('Synchronized users can log into Google Apps for Work by using the link on the <a href="/univention/" target="_blank">UCS portal</a>.') + '<br>' + this.img(_('google-sso-login.png'))
258	}]	258	}]
259	}, {	259	}, {
260	name: 'error',	260	name: 'error',
Lines 373-379 define([ Link Here
373	getTextSingleSignOnSetup: function() {	373	getTextSingleSignOnSetup: function() {
374	return '<p>' + _('To finalize the setup, single sign-on has to be configured for the Google Apps for Work domain.') + '</p>' + this.formatOrderedList([	374	return '<p>' + _('To finalize the setup, single sign-on has to be configured for the Google Apps for Work domain.') + '</p>' + this.formatOrderedList([
375	_('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.'),	375	_('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.'),
376	lang.replace(_('Download the {certificate_link}.'), {certificate_link: '<a href="/univention-management-console/command/googleapps/certificate.crt" target="_blank">' + _('UCS Identity Provider certificate') + '</a>'}),	376	lang.replace(_('Download the {certificate_link}.'), {certificate_link: '<a href="/univention/command/googleapps/certificate.crt" target="_blank">' + _('UCS Identity Provider certificate') + '</a>'}),
377	_('Activate the checkbox <i>Setup SSO with third party identity provider</i> in the security settings.'),	377	_('Activate the checkbox <i>Setup SSO with third party identity provider</i> in the security settings.'),
378	_('Then upload the certificate as <i>Verification certificate</i> by clicking on <i>CHOOSE FILE</i> and <i>UPLOAD</i>.'),	378	_('Then upload the certificate as <i>Verification certificate</i> by clicking on <i>CHOOSE FILE</i> and <i>UPLOAD</i>.'),
379	_('As last step the following values needs to be inserted into the input fields as can be seen in the screenshot below:')	379	_('As last step the following values needs to be inserted into the input fields as can be seen in the screenshot below:')




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, allow_get
from univention.management.console.modules.sanitizers import StringSanitizer, DictSanitizer, EmailSanitizer, ValidationError, MultiValidationError

from univention.googleapps.auth import GappsAuth, SCOPE, GoogleAppError, AuthenticationError, AuthenticationErrorRetry

		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=/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')

		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']),)
		}, message=_('The credentials have been successfully uploaded.'))

	@simple_response

Return to bug 43583

Lines 39-45 Link Here

(-)a/univention-google-apps/umc/python/googleapps/__init__.py (-4 / +5 lines)
39	from univention.management.console.base import Base, UMC_Error, UMC_OptionSanitizeError	39	from univention.management.console.base import Base, UMC_Error, UMC_OptionSanitizeError
40	from univention.management.console.config import ucr	40	from univention.management.console.config import ucr
41		41
42	from univention.management.console.modules.decorators import sanitize, simple_response, file_upload	42	from univention.management.console.modules.decorators import sanitize, simple_response, file_upload, allow_get
43	from univention.management.console.modules.sanitizers import StringSanitizer, DictSanitizer, EmailSanitizer, ValidationError, MultiValidationError	43	from univention.management.console.modules.sanitizers import StringSanitizer, DictSanitizer, EmailSanitizer, ValidationError, MultiValidationError
44		44
45	from univention.googleapps.auth import GappsAuth, SCOPE, GoogleAppError, AuthenticationError, AuthenticationErrorRetry	45	from univention.googleapps.auth import GappsAuth, SCOPE, GoogleAppError, AuthenticationError, AuthenticationErrorRetry
Lines 84-93 def query(self): Link Here
84	return {	84	return {
85	'initialized': GappsAuth.is_initialized(),	85	'initialized': GappsAuth.is_initialized(),
86	'sign-in-url': 'https://%s/simplesamlphp/saml2/idp/SSOService.php' % (sso_fqdn,),	86	'sign-in-url': 'https://%s/simplesamlphp/saml2/idp/SSOService.php' % (sso_fqdn,),
87	'sign-out-url': 'https://%s/simplesamlphp/saml2/idp/SingleLogoutService.php?ReturnTo=/ucs-overview' % (sso_fqdn,),	87	'sign-out-url': 'https://%s/simplesamlphp/saml2/idp/SingleLogoutService.php?ReturnTo=/univention/' % (sso_fqdn,),
88	'change-password-url': 'https://%s/univention-management-console/' % (fqdn,),	88	'change-password-url': 'https://%s/univention/management/' % (fqdn,),
89	}	89	}
90		90
		91	@allow_get
91	def certificate(self, request):	92	def certificate(self, request):
92	with open(ucr['saml/idp/certificate/certificate'], 'rb') as fd:	93	with open(ucr['saml/idp/certificate/certificate'], 'rb') as fd:
93	self.finished(request.id, fd.read(), mimetype='application/octet-stream')	94	self.finished(request.id, fd.read(), mimetype='application/octet-stream')
Lines 114-120 def upload(self, request): Link Here
114	self.finished(request.id, {	115	self.finished(request.id, {
115	'client_id': data['client_id'],	116	'client_id': data['client_id'],
116	'scope': ','.join(SCOPE),	117	'scope': ','.join(SCOPE),
117	# 'serviceaccounts_link': 'https://console.developers.google.com/permissions/serviceaccounts?project=%s' % (urllib.quote(data['project_id']),)	118	# 'serviceaccounts_link': 'https://console.developers.google.com/permissions/serviceaccounts?project=%s' % (urllib.quote(data['project_id']),)
118	}, message=_('The credentials have been successfully uploaded.'))	119	}, message=_('The credentials have been successfully uploaded.'))
119		120
120	@simple_response	121	@simple_response