WIP: Add reminder mode for pwd confirmation

Signed-off-by: Louis Chemineau <[email protected]>

src/components/PasswordDialog.vue

@@ -21,7 +21,7 @@
 			<NcButton class="vue-password-confirmation__submit"
 				type="primary"
 				native-type="submit"
-				:disabled="!password">
+				:disabled="!password || loading">
 				<template v-if="loading" #icon>
 					<NcLoadingIcon :size="20" />
 				</template>
@@ -62,7 +62,7 @@ export default defineComponent({
 	props: {
 		callback: {
 			type: Function,
-			required: false
+			required: true,
 		},
 	},
 
@@ -110,15 +110,7 @@ export default defineComponent({
 			}
 
 			try {
-				if (this.callback === undefined) {
-					const url = generateUrl('/login/confirm')
-					const { data } = await axios.post(url, { password: this.password })
-					window.nc_lastLogin = data.lastLogin
-				} else {
-					await this.callback(this.password)
-					window.nc_lastLogin = Date.now() / 1000
-				}
-
+				await this.callback(this.password)
 				this.$emit('confirmed')
 			} catch (e) {
 				this.showError = true

src/main.ts

@@ -94,36 +94,57 @@ function getPasswordDialog(callback?: (password: string) => Promise<any>): Promi
  * @param axios
  */
 export function withPasswordConfirmation(axios: Axios): Axios {
-	const {
-		promise: passwordDialogCallbackResolution,
-		resolve: resolvePwdDialogCallback,
-		reject: rejectPwdDialogCallback,
-	} = Promise.withResolvers()
+	let resolvePwdDialogCallback: (value: unknown) => void
+	let rejectPwdDialogCallback: (reason?: any) => void
+	let firstTry = true
 
-	axios.interceptors.request.use(async (config) => {
+	const pwdConfirmationAxios = axios.create() as Axios
+
+	// TODO: copy axios instance
+	pwdConfirmationAxios.interceptors.request.use(async (config) => {
 		return new Promise((resolve, reject) => {
 			getPasswordDialog((password: string) => {
-				resolve({
+				const authenticatedConfig = {
 					...config,
 					auth: {
 						username: getCurrentUser()?.uid ?? '',
 						password,
 					},
-				})
+				}
+
+				if (firstTry) {
+					firstTry = false
+					resolve(authenticatedConfig)
+				} else {
+					return axios.request(authenticatedConfig)
+				}
+
+				const { promise, resolve: subResolve, reject: subReject } = Promise.withResolvers()
+				resolvePwdDialogCallback = subResolve
+				rejectPwdDialogCallback = subReject
 
-				// Await for request to be done
-				return passwordDialogCallbackResolution
+				return promise
 			})
 		})
 	})
 
-	axios.interceptors.response.use((response) => {
-		if (response.request.auth !== undefined) {
+	pwdConfirmationAxios.interceptors.response.use(
+		(response) => {
 			resolvePwdDialogCallback(undefined)
-		}
-
-		return response
-	})
-
-	return axios
+			return response
+		},
+		(error) => {
+			// TODO intercept reject to inform dialog
+			if (error.config.auth !== undefined) {
+				rejectPwdDialogCallback(error)
+			}
+		},
+		{
+			runWhen(config) {
+				return config.auth !== undefined
+			},
+		},
+	)
+
+	return pwdConfirmationAxios
 }