web interfaces: don't include version number in html, only return it after authentication

second round for issue #322

webaccount/account.go

@@ -17,6 +17,7 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"time"
 
@@ -368,6 +369,11 @@ func (w Account) Logout(ctx context.Context) {
 	xcheckf(ctx, err, "logout")
 }
 
+// Version returns the version, goos and goarch.
+func (Account) Version(ctx context.Context) (version, goos, goarch string) {
+	return moxvar.Version, runtime.GOOS, runtime.GOARCH
+}
+
 // SetPassword saves a new password for the account, invalidating the previous
 // password.
 //

webaccount/account.js

@@ -380,6 +380,14 @@ var api;
 			const params = [];
 			return await _sherpaCall(this.baseURL, this.authState, { ...this.options }, paramTypes, returnTypes, fn, params);
 		}
+		// Version returns the version, goos and goarch.
+		async Version() {
+			const fn = "Version";
+			const paramTypes = [];
+			const returnTypes = [["string"], ["string"], ["string"]];
+			const params = [];
+			return await _sherpaCall(this.baseURL, this.authState, { ...this.options }, paramTypes, returnTypes, fn, params);
+		}
 		// SetPassword saves a new password for the account, invalidating the previous
 		// password.
 		// 
@@ -947,6 +955,9 @@ var api;
 	};
 })(api || (api = {}));
 // Javascript is generated from typescript, do not modify generated javascript because changes will be overwritten.
+let moxversion;
+let moxgoos;
+let moxgoarch;
 const login = async (reason) => {
 	return new Promise((resolve, _) => {
 		const origFocus = document.activeElement;
@@ -1086,7 +1097,7 @@ const crumbs = (...l) => {
 	];
 };
 const errmsg = (err) => '' + (err.message || '(no error message)');
-const footer = dom.div(style({ marginTop: '6ex', opacity: 0.75 }), link('https://www.xmox.nl', 'mox'), ' ', moxversion, ', ', dom.a(attr.href('licenses.txt'), 'licenses'));
+const footer = () => dom.div(style({ marginTop: '6ex', opacity: 0.75 }), link('https://www.xmox.nl', 'mox'), ' ', moxversion, ', ', dom.a(attr.href('licenses.txt'), 'licenses'));
 const domainName = (d) => {
 	return d.Unicode || d.ASCII;
 };
@@ -1768,7 +1779,7 @@ openssl pkcs12 \\
 	})), mailboxFileHint = dom.p(style({ display: 'none', fontStyle: 'italic', marginTop: '.5ex' }), 'This file must either be a zip file or a gzipped tar file with mbox and/or maildir mailboxes. For maildirs, an optional file "dovecot-keywords" is read additional keywords, like Forwarded/Junk/NotJunk. If an imported mailbox already exists by name, messages are added to the existing mailbox. If a mailbox does not yet exist it will be created. Messages are not deduplicated, importing them twice will result in duplicates.')), dom.div(style({ marginBottom: '1ex' }), dom.label(dom.div(style({ marginBottom: '.5ex' }), 'Skip mailbox prefix (optional)'), dom.input(attr.name('skipMailboxPrefix'), function focus() {
 		mailboxPrefixHint.style.display = '';
 	})), mailboxPrefixHint = dom.p(style({ display: 'none', fontStyle: 'italic', marginTop: '.5ex' }), 'If set, any mbox/maildir path with this prefix will have it stripped before importing. For example, if all mailboxes are in a directory "Takeout", specify that path in the field above so mailboxes like "Takeout/Inbox.mbox" are imported into a mailbox called "Inbox" instead of "Takeout/Inbox".')), dom.div(dom.submitbutton('Upload and import'), dom.p(style({ fontStyle: 'italic', marginTop: '.5ex' }), 'The file is uploaded first, then its messages are imported, finally messages are matched for threading. Importing is done in a transaction, you can abort the entire import before it is finished.')))), importAbortBox = dom.div(), // Outside fieldset because it gets disabled, above progress because may be scrolling it down quickly with problems.
-	importProgress = dom.div(style({ display: 'none' })), dom.br(), footer);
+	importProgress = dom.div(style({ display: 'none' })), dom.br(), footer());
 	(async () => {
 		// Try to show the progress of an earlier import session. The user may have just
 		// refreshed the browser.
@@ -1926,6 +1937,7 @@ const destination = async (name) => {
 };
 const init = async () => {
 	let curhash;
+	[moxversion, moxgoos, moxgoarch] = await client.Version();
 	const hashChange = async () => {
 		if (curhash === window.location.hash) {
 			return;

webaccount/account.ts

@@ -2,12 +2,13 @@
 
 // From HTML.
 declare let page: HTMLElement
-declare let moxversion: string
-declare let moxgoos: string
-declare let moxgoarch: string
 // From customization script.
 declare let moxBeforeDisplay: (webmailroot: HTMLElement) => void
 
+let moxversion: string
+let moxgoos: string
+let moxgoarch: string
+
 const login = async (reason: string) => {
 	return new Promise<string>((resolve: (v: string) => void, _) => {
 		const origFocus = document.activeElement
@@ -206,13 +207,14 @@ const crumbs = (...l: ({text: string, path: string} | string)[]) => {
 
 const errmsg = (err: unknown) => ''+((err as any).message || '(no error message)')
 
-const footer = dom.div(
-	style({marginTop: '6ex', opacity: 0.75}),
-	link('https://www.xmox.nl', 'mox'),
-	' ',
-	moxversion,
-	', ', dom.a(attr.href('licenses.txt'), 'licenses')
-)
+const footer = () =>
+	dom.div(
+		style({marginTop: '6ex', opacity: 0.75}),
+		link('https://www.xmox.nl', 'mox'),
+		' ',
+		moxversion,
+		', ', dom.a(attr.href('licenses.txt'), 'licenses')
+	)
 
 const domainName = (d: api.Domain) => {
 	return d.Unicode || d.ASCII
@@ -1602,7 +1604,7 @@ openssl pkcs12 \\
 		),
 		dom.br(),
 
-		footer,
+		footer(),
 	)
 
 	;(async () => {
@@ -1944,6 +1946,8 @@ const destination = async (name: string) => {
 const init = async () => {
 	let curhash: string | undefined
 
+	[moxversion, moxgoos, moxgoarch] = await client.Version()
+
 	const hashChange = async () => {
 		if (curhash === window.location.hash) {
 			return

webaccount/api.json

@@ -53,6 +53,31 @@
 			"Params": [],
 			"Returns": []
 		},
+		{
+			"Name": "Version",
+			"Docs": "Version returns the version, goos and goarch.",
+			"Params": [],
+			"Returns": [
+				{
+					"Name": "version",
+					"Typewords": [
+						"string"
+					]
+				},
+				{
+					"Name": "goos",
+					"Typewords": [
+						"string"
+					]
+				},
+				{
+					"Name": "goarch",
+					"Typewords": [
+						"string"
+					]
+				}
+			]
+		},
 		{
 			"Name": "SetPassword",
 			"Docs": "SetPassword saves a new password for the account, invalidating the previous\npassword.\n\nSessions are not interrupted, and will keep working. New login attempts must use\nthe new password.\n\nPassword must be at least 8 characters.\n\nSetting a user-supplied password is not allowed if NoCustomPassword is set\nfor the account.",

webaccount/api.ts

@@ -414,6 +414,15 @@ export class Client {
 		return await _sherpaCall(this.baseURL, this.authState, { ...this.options }, paramTypes, returnTypes, fn, params) as void
 	}
 
+	// Version returns the version, goos and goarch.
+	async Version(): Promise<[string, string, string]> {
+		const fn: string = "Version"
+		const paramTypes: string[][] = []
+		const returnTypes: string[][] = [["string"],["string"],["string"]]
+		const params: any[] = []
+		return await _sherpaCall(this.baseURL, this.authState, { ...this.options }, paramTypes, returnTypes, fn, params) as [string, string, string]
+	}
+
 	// SetPassword saves a new password for the account, invalidating the previous
 	// password.
 	//