implement frontend for user expiry/duration

this will add an optional validity period to users, where their account
will be disabled (or deleted) a specified amount of time after they
created it.

api.go

@@ -634,6 +634,12 @@ func (app *appContext) GenerateInvite(gc *gin.Context) {
 	} else {
 		invite.RemainingUses = 1
 	}
+	invite.UserDuration = req.UserDuration
+	if invite.UserDuration {
+		invite.UserDays = req.UserDays
+		invite.UserHours = req.UserHours
+		invite.UserMinutes = req.UserMinutes
+	}
 	invite.ValidTill = validTill
 	if emailEnabled && req.Email != "" && app.config.Section("invite_emails").Key("enabled").MustBool(false) {
 		app.debug.Printf("%s: Sending invite email", inviteCode)
@@ -817,6 +823,10 @@ func (app *appContext) GetInvites(gc *gin.Context) {
 			Days:         days,
 			Hours:        hours,
 			Minutes:      minutes,
+			UserDuration: inv.UserDuration,
+			UserDays:     inv.UserDays,
+			UserHours:    inv.UserHours,
+			UserMinutes:  inv.UserMinutes,
 			Created:      app.formatDatetime(inv.Created),
 			Profile:      inv.Profile,
 			NoLimit:      inv.NoLimit,

html/admin.html

@@ -259,6 +259,17 @@
                     <span class="heading">{{ .strings.create }}</span>
                     <div class="row" id="create-inv">
                         <div class="card ~neutral !normal col">
+                            <div class="flex-row mb-1">
+                                <label class="flex-row-group mr-1">
+                                    <input type="radio" name="duration" class="unfocused" id="radio-inv-duration" checked>
+                                    <span class="button ~neutral !high supra full-width center">{{ .strings.inviteDuration }}</span>
+                                </label>
+                                <label class="flex-row-group ml-1">
+                                    <input type="radio" name="duration" class="unfocused" id="radio-user-duration">
+                                    <span class="button ~neutral !normal supra full-width center">{{ .strings.userDuration }}</span>
+                                </label>
+                            </div>
+                            <div id="inv-duration">
                                 <label class="label supra" for="create-days">{{ .strings.inviteDays }}</label>
                                 <div class="select ~neutral !normal mb-1 mt-half">
                                     <select id="create-days">
@@ -277,6 +288,34 @@
                                         <option>0</option>
                                     </select>
                                 </div>
+                            </div>
+                            <div id="user-duration" class="unfocused">
+                                <p class="support">{{ .strings.userDurationDescription }}</p>
+                                <div class="mb-half">
+                                    <label for="create-user-duration-enabled" class="button ~neutral !normal">
+                                        <input type="checkbox" id="create-user-duration-enabled" aria-label="User duration enabled">
+                                        <span class="ml-half">{{ .strings.enabled }} </span>
+                                    </label>
+                                </div>
+                                <label class="label supra" for="user-days">{{ .strings.inviteDays }}</label>
+                                <div class="select ~neutral !normal mb-1 mt-half">
+                                    <select id="user-days">
+                                        <option>0</option>
+                                    </select>
+                                </div>
+                                <label class="label supra" for="user-hours">{{ .strings.inviteHours }}</label>
+                                <div class="select ~neutral !normal mb-1 mt-half">
+                                    <select id="user-hours">
+                                        <option>0</option>
+                                    </select>
+                                </div>
+                                <label class="label supra" for="user-minutes">{{ .strings.inviteMinutes }}</label>
+                                <div class="select ~neutral !normal mb-1 mt-half">
+                                    <select id="user-minutes">
+                                        <option>0</option>
+                                    </select>
+                                </div>
+                            </div>
                             <label class="label supra" for="create-label"> {{ .strings.label }}</label>
                             <input type="text" id="create-label" class="input ~neutral !normal mb-1 mt-half">
                         </div>

html/form-base.html

@@ -7,6 +7,11 @@
     window.code = "{{ .code }}";
     window.messages = JSON.parse({{ .notifications }});
     window.confirmation = {{ .confirmation }};
+    window.userDurationEnabled = {{ .userDuration }};
+    window.userDurationDays = {{ .userDurationDays }};
+    window.userDurationHours = {{ .userDurationHours }};
+    window.userDurationMinutes = {{ .userDurationMinutes }};
+    window.userDurationMessage = {{ .userDurationMessage }};
 </script>
 <script src="js/form.js" type="module"></script>
 {{ end }}

html/form.html

@@ -37,6 +37,9 @@
                 </div>
                 <div class="row">
                     <div class="col">
+                        {{ if .userDuration }}
+                        <aside class="col aside sm ~warning" id="user-duration-message"></aside>
+                        {{ end }}
                         <form class="card ~neutral !normal" id="form-create" href="">
                             <label class="label supra">
                                 {{ .strings.username }}
@@ -44,13 +47,13 @@
                             </label>
                             
                             <label class="label supra" for="create-email">{{ .strings.emailAddress }}</label>
-                            <input type="email" class="input ~neutral 1high mt-half mb-1" placeholder="{{ .strings.emailAddress }}" id="create-email" aria-label="{{ .strings.emailAddress }}" value="{{ .email }}">
+                            <input type="email" class="input ~neutral !high mt-half mb-1" placeholder="{{ .strings.emailAddress }}" id="create-email" aria-label="{{ .strings.emailAddress }}" value="{{ .email }}">
                             
                             <label class="label supra" for="create-password">{{ .strings.password }}</label>
-                            <input type="password" class="input ~neutral 1high mt-half mb-1" placeholder="{{ .strings.password }}" id="create-password" aria-label="{{ .strings.password }}">
+                            <input type="password" class="input ~neutral !high mt-half mb-1" placeholder="{{ .strings.password }}" id="create-password" aria-label="{{ .strings.password }}">
                             
                             <label class="label supra" for="create-reenter-password">{{ .strings.reEnterPassword }}</label>
-                            <input type="password" class="input ~neutral 1high mt-half mb-1" placeholder="{{ .strings.password }}" id="create-reenter-password" aria-label="{{ .strings.reEnterPassword }}">
+                            <input type="password" class="input ~neutral !high mt-half mb-1" placeholder="{{ .strings.password }}" id="create-reenter-password" aria-label="{{ .strings.reEnterPassword }}">
                             <label>
                                 <input type="submit" class="unfocused">
                                 <span class="button ~urge !normal full-width center supra submit">{{ .strings.createAccountButton }}</span>

lang/admin/en-us.json

@@ -10,6 +10,7 @@
         "inviteHours": "Hours",
         "inviteMinutes": "Minutes",
         "inviteNumberOfUses": "Number of uses",
+        "inviteDuration": "Invite Duration",
         "warning": "Warning",
         "inviteInfiniteUsesWarning": "invites with infinite uses can be used abusively",
         "inviteSendToEmail": "Send to",
@@ -20,9 +21,12 @@
         "delete": "Delete",
         "name": "Name",
         "date": "Date",
+        "enabled": "Enabled",
+        "userDurationDescription": "A specified amount of time after each signup, jfa-go will delete/disable the account. You can change this behaviour in settings.",
         "lastActiveTime": "Last Active",
         "from": "From",
         "user": "User",
+        "userDuration": "User Duration",
         "aboutProgram": "About",
         "version": "Version",
         "commitNoun": "Commit",

lang/form/en-us.json

@@ -16,7 +16,8 @@
         "successHeader": "Success!",
         "successContinueButton": "Continue",
         "confirmationRequired": "Email confirmation required",
-        "confirmationRequiredMessage": "Please check your email inbox to verify your address."
+        "confirmationRequiredMessage": "Please check your email inbox to verify your address.",
+        "yourAccountIsValidUntil": "Your account will be valid until {date}."
     },
     "notifications": {
         "errorUserExists": "User already exists.",

models.go

@@ -33,6 +33,10 @@ type generateInviteDTO struct {
 	Days          int    `json:"days" example:"1"`                   // Number of days
 	Hours         int    `json:"hours" example:"2"`                  // Number of hours
 	Minutes       int    `json:"minutes" example:"3"`                // Number of minutes
+	UserDuration  bool   `json:"user-duration"`                      // Whether or not user duration is enabled
+	UserDays      int    `json:"user-days,omitempty" example:"1"`    // Number of days till user expiry
+	UserHours     int    `json:"user-hours,omitempty" example:"2"`   // Number of hours till user expiry
+	UserMinutes   int    `json:"user-minutes,omitempty" example:"3"` // Number of minutes till user expiry
 	Email         string `json:"email" example:"jeff@jellyf.in"`     // Send invite to this address
 	MultipleUses  bool   `json:"multiple-uses" example:"true"`       // Allow multiple uses
 	NoLimit       bool   `json:"no-limit" example:"false"`           // No invite use limit
@@ -72,6 +76,10 @@ type inviteDTO struct {
 	Days           int        `json:"days" example:"1"`                      // Number of days till expiry
 	Hours          int        `json:"hours" example:"2"`                     // Number of hours till expiry
 	Minutes        int        `json:"minutes" example:"3"`                   // Number of minutes till expiry
+	UserDuration   bool       `json:"user-duration"`                         // Whether or not user duration is enabled
+	UserDays       int        `json:"user-days,omitempty" example:"1"`       // Number of days till user expiry
+	UserHours      int        `json:"user-hours,omitempty" example:"2"`      // Number of hours till user expiry
+	UserMinutes    int        `json:"user-minutes,omitempty" example:"3"`    // Number of minutes till user expiry
 	Created        string     `json:"created" example:"01/01/20 12:00"`      // Date of creation
 	Profile        string     `json:"profile" example:"DefaultProfile"`      // Profile used on this invite
 	UsedBy         [][]string `json:"used-by,omitempty"`                     // Users who have used this invite

package-lock.json

@@ -236,9 +236,9 @@
       "integrity": "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY="
     },
     "esbuild": {
-      "version": "0.8.50",
+      "version": "0.8.53",
-      "resolved": "https://registry.npm.taobao.org/esbuild/download/esbuild-0.8.50.tgz",
+      "resolved": "https://registry.npm.taobao.org/esbuild/download/esbuild-0.8.53.tgz",
-      "integrity": "sha1-6/JP3gza0aNpeJ3W/XqCCwoB5Gw="
+      "integrity": "sha1-tAi7DKGynasT2Lv31Z9Zr+Z3boY="
     },
     "escalade": {
       "version": "3.1.1",

package.json

@@ -19,7 +19,7 @@
   "dependencies": {
     "@ts-stack/markdown": "^1.3.0",
     "a17t": "^0.4.0",
-    "esbuild": "^0.8.50",
+    "esbuild": "^0.8.53",
     "lodash": "^4.17.19",
     "mjml": "^4.8.0",
     "remixicon": "^2.5.0",

storage.go

@@ -59,6 +59,10 @@ type Invite struct {
 	NoLimit       bool                       `json:"no-limit"`
 	RemainingUses int                        `json:"remaining-uses"`
 	ValidTill     time.Time                  `json:"valid_till"`
+	UserDuration  bool                       `json:"user-duration"`
+	UserDays      int                        `json:"user-days,omitempty"`
+	UserHours     int                        `json:"user-hours,omitempty"`
+	UserMinutes   int                        `json:"user-minutes,omitempty"`
 	Email         string                     `json:"email"`
 	UsedBy        [][]string                 `json:"used-by"`
 	Notify        map[string]map[string]bool `json:"notify"`

ts/form.ts

@@ -10,6 +10,11 @@ interface formWindow extends Window {
     messages: { [key: string]: string };
     confirmation: boolean;
     confirmationModal: Modal
+    userDurationEnabled: boolean;
+    userDurationDays: number;
+    userDurationHours: number;
+    userDurationMinutes: number;
+    userDurationMessage: string;
 }
 
 interface pwValString {
@@ -34,6 +39,19 @@ if (window.confirmation) {
 }
 declare var window: formWindow;
 
+if (window.userDurationEnabled) {
+    const messageEl = document.getElementById("user-duration-message") as HTMLElement;
+    const calculateTime = () => {
+        let time = new Date()
+        time.setDate(time.getDate() + window.userDurationDays);
+        time.setHours(time.getHours() + window.userDurationHours);
+        time.setMinutes(time.getMinutes() + window.userDurationMinutes);
+        messageEl.textContent = window.userDurationMessage.replace("{date}", time.toDateString() + " " + time.toLocaleTimeString());
+        setTimeout(calculateTime, 1000);
+    };
+    calculateTime();
+}
+
 var defaultPwValStrings: pwValStrings = {
     length: {
         singular: "Must have at least {n} character",

ts/modules/invites.ts

@@ -62,6 +62,19 @@ export class DOMInvite implements Invite {
         this._infoArea.querySelector("span.inv-expiry").textContent = expiry;
     }
 
+    private _userDuration: string;
+    get userDurationTime(): string { return this._userDuration; }
+    set userDurationTime(d: string) {
+        const duration = this._middle.querySelector("span.user-duration") as HTMLSpanElement;
+        if (!d) {
+            duration.textContent = "";
+        } else {
+            duration.textContent = window.lang.strings("userDuration");
+        }
+        this._userDuration = d;
+        this._middle.querySelector("strong.user-duration-time").textContent = d;
+    }
+
     private _remainingUses: string = "1";
     get remainingUses(): string { return this._remainingUses; }
     set remainingUses(remaining: string) {
@@ -331,6 +344,7 @@ export class DOMInvite implements Invite {
         this._middle.innerHTML = `
         <p class="supra mb-1 top">${window.lang.strings("inviteDateCreated")} <strong class="inv-created"></strong></p>
         <p class="supra mb-1">${window.lang.strings("inviteRemainingUses")} <strong class="inv-remaining"></strong></p>
+        <p class="supra mb-1"><span class="user-duration"></span> <strong class="user-duration-time"></strong></p>
         `;
 
         this._right = document.createElement('div') as HTMLDivElement;
@@ -362,6 +376,7 @@ export class DOMInvite implements Invite {
         if (invite.label) {
             this.label = invite.label;
         }
+        this.userDurationTime = invite.userDurationTime || "";
     }
 
     asElement = (): HTMLDivElement => { return this._container; }
@@ -462,13 +477,25 @@ function parseInvite(invite: { [f: string]: string | number | string[][] | boole
     parsed.email = invite["email"] as string || "";
     parsed.label = invite["label"] as string || "";
     let time = "";
+    let userDurationTime = "";
     const fields = ["days", "hours", "minutes"];
+    let prefixes = [""];
+    if (invite["user-duration"] as boolean) { prefixes.push("user-"); }
     for (let i = 0; i < fields.length; i++) {
-        if (invite[fields[i]] != 0) {
+        for (let j = 0; j < prefixes.length; j++) {
-            time += `${invite[fields[i]]}${fields[i][0]} `;
+            if (invite[prefixes[j]+fields[i]]) {
+                let text = `${invite[prefixes[j]+fields[i]]}${fields[i][0]} `;
+                if (prefixes[j] ==  "user-") {
+                    userDurationTime += text;
+                } else {
+                    time += text;
+                }
+            }
         }
     }
     parsed.expiresIn = window.lang.var("strings", "inviteExpiresInTime", time.slice(0, -1));
+    parsed.userDuration = invite["user-duration"] as boolean;
+    parsed.userDurationTime = userDurationTime.slice(0, -1);
     parsed.remainingUses = invite["no-limit"] ? "∞" : String(invite["remaining-uses"])
     parsed.usedBy = invite["used-by"] as string[][] || [];
     parsed.created = invite["created"] as string || window.lang.strings("unknown");
@@ -481,6 +508,7 @@ function parseInvite(invite: { [f: string]: string | number | string[][] | boole
 export class createInvite {
     private _sendToEnabled = document.getElementById("create-send-to-enabled") as HTMLInputElement;
     private _sendTo = document.getElementById("create-send-to") as HTMLInputElement;
+    private _userDurationToggle = document.getElementById("create-user-duration-enabled") as HTMLInputElement;
     private _uses = document.getElementById('create-uses') as HTMLInputElement;
     private _infUses = document.getElementById("create-inf-uses") as HTMLInputElement;
     private _infUsesWarning = document.getElementById('create-inf-uses-warning') as HTMLParagraphElement;
@@ -491,6 +519,14 @@ export class createInvite {
     private _days = document.getElementById("create-days") as HTMLSelectElement;
     private _hours = document.getElementById("create-hours") as HTMLSelectElement;
     private _minutes = document.getElementById("create-minutes") as HTMLSelectElement;
+    private _userDays = document.getElementById("user-days") as HTMLSelectElement;
+    private _userHours = document.getElementById("user-hours") as HTMLSelectElement;
+    private _userMinutes = document.getElementById("user-minutes") as HTMLSelectElement;
+
+    private _invDurationButton = document.getElementById('radio-inv-duration') as HTMLInputElement;
+    private _userDurationButton = document.getElementById('radio-user-duration') as HTMLInputElement;
+    private _invDuration = document.getElementById('inv-duration');
+    private _userDuration = document.getElementById('user-duration');
 
     // Broadcast when new invite created
     private _newInviteEvent = new CustomEvent("newInviteEvent");
@@ -498,9 +534,11 @@ export class createInvite {
 
     private _count: Number = 30;
     private _populateNumbers = () => {
-        const fieldIDs = ["create-days", "create-hours", "create-minutes"];
+        const fieldIDs = ["days", "hours", "minutes"];
+        const prefixes = ["create-", "user-"];
         for (let i = 0; i < fieldIDs.length; i++) {
-            const field = document.getElementById(fieldIDs[i]);
+            for (let j = 0; j < prefixes.length; j++) { 
+                const field = document.getElementById(prefixes[j] + fieldIDs[i]);
                 field.textContent = '';
                 for (let n = 0; n <= this._count; n++) {
                    const opt = document.createElement("option") as HTMLOptionElement;
@@ -510,6 +548,7 @@ export class createInvite {
                 }
             }
         }
+    }
 
     get label(): string { return this._label.value; }
     set label(label: string) { this._label.value = label; }
@@ -580,6 +619,33 @@ export class createInvite {
         this._minutes.value = ""+n;
         this._checkDurationValidity();
     }
+    get userDuration(): boolean {
+        return this._userDurationToggle.checked;
+    }
+    set userDuration(enabled: boolean) {
+        this._userDurationToggle.checked = enabled;
+        this._userDays.disabled = !enabled;
+        this._userHours.disabled = !enabled;
+        this._userMinutes.disabled = !enabled;
+    }
+    get userDays(): number {
+        return +this._userDays.value;
+    }
+    set userDays(n: number) {
+        this._userDays.value = ""+n;
+    }
+    get userHours(): number {
+        return +this._userHours.value;
+    }
+    set userHours(n: number) {
+        this._userHours.value = ""+n;
+    }
+    get userMinutes(): number {
+        return +this._userMinutes.value;
+    }
+    set userMinutes(n: number) {
+        this._userMinutes.value = ""+n;
+    }
 
     get sendTo(): string { return this._sendTo.value; }
     set sendTo(address: string) { this._sendTo.value = address; }
@@ -613,10 +679,18 @@ export class createInvite {
 
     create = () => {
         toggleLoader(this._createButton);
+        let userDuration = this.userDuration;
+        if (this.userDays == 0 && this.userHours == 0 && this.userMinutes == 0) {
+            userDuration = false;
+        }
         let send = {
             "days": this.days,
             "hours": this.hours,
             "minutes": this.minutes,
+            "user-duration": userDuration,
+            "user-days": this.userDays,
+            "user-hours": this.userHours,
+            "user-minutes": this.userMinutes,
             "multiple-uses": (this.uses > 1 || this.infiniteUses),
             "no-limit": this.infiniteUses,
             "remaining-uses": this.uses,
@@ -642,12 +716,43 @@ export class createInvite {
         this._infUses.onchange = () => { this.infiniteUses = this.infiniteUses; };
         this.infiniteUses = false;
         this._sendToEnabled.onchange = () => { this.sendToEnabled = this.sendToEnabled; };
+        this.userDuration = false;
+        this._userDurationToggle.onchange = () => { this.userDuration = this._userDurationToggle.checked; }
+        this._userDays.disabled = true;
+        this._userHours.disabled = true;
+        this._userMinutes.disabled = true;
         this.sendToEnabled = false;
         this._createButton.onclick = this.create;
         this.sendTo = "";
         this.uses = 1;
         this.label = "";
 
+        const checkDuration = () => {
+            console.log("bbbb")
+            const invSpan = this._invDurationButton.nextElementSibling as HTMLSpanElement;
+            const userSpan = this._userDurationButton.nextElementSibling as HTMLSpanElement;
+            if (this._invDurationButton.checked) {
+                this._invDuration.classList.remove("unfocused");
+                this._userDuration.classList.add("unfocused");
+                invSpan.classList.add("!high");
+                invSpan.classList.remove("!normal");
+                userSpan.classList.add("!normal");
+                userSpan.classList.remove("!high");
+            } else if (this._userDurationButton.checked) {
+                this._userDuration.classList.remove("unfocused");
+                this._invDuration.classList.add("unfocused");
+                invSpan.classList.add("!normal");
+                invSpan.classList.remove("!high");
+                userSpan.classList.add("!high");
+                userSpan.classList.remove("!normal");
+            }
+        };
+
+        this._userDurationButton.checked = false;
+        this._invDurationButton.checked = true;
+        this._userDurationButton.onchange = checkDuration;
+        this._invDurationButton.onchange = checkDuration;
+
         this._days.onchange = this._checkDurationValidity;
         this._hours.onchange = this._checkDurationValidity;
         this._minutes.onchange = this._checkDurationValidity;

ts/typings/d.ts

@@ -90,6 +90,8 @@ interface Invite {
     notifyCreation?: boolean;
     profile?: string;
     label?: string;
+    userDuration?: boolean;
+    userDurationTime?: string;
 }
 
 interface inviteList {

views.go

@@ -182,6 +182,11 @@ func (app *appContext) InviteProxy(gc *gin.Context) {
 		"notifications":       app.storage.lang.Form[lang].notificationsJSON,
 		"code":                code,
 		"confirmation":        app.config.Section("email_confirmation").Key("enabled").MustBool(false),
+		"userDuration":        inv.UserDuration,
+		"userDurationDays":    inv.UserDays,
+		"userDurationHours":   inv.UserHours,
+		"userDurationMinutes": inv.UserMinutes,
+		"userDurationMessage": app.storage.lang.Form[lang].Strings.get("yourAccountIsValidUntil"),
 	})
 }