refactor: restructure code to satisfy linting rules

Signed-off-by: ernolf <raphael.gradenwitz@googlemail.com>
nextcloud · Aug 26, 2024 · af65887 · af65887
1 parent 1f71384
commit af65887
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 49 deletions.
diff --git a/src/components/LoginSetup.vue b/src/components/LoginSetup.vue
@@ -4,7 +4,7 @@
   - @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
   - @author 2024 [ernolf] Raphael Gradenwitz <raphael.gradenwitz@googlemail.com>
   -
-  - @license GNU AGPL version 3 or any later version
+  - @license AGPL-3.0-or-later
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
@@ -24,7 +24,7 @@
 	<div id="twofactor-totp-login-setup">
 		<div v-if="loading" class="loading" />
 		<SetupConfirmation v-if="secret"
-			:isCentered="true"
+			:center="true"
 			:loading="loadingConfirmation"
 			:secret="secret"
 			:qr-url="qrUrl"
@@ -36,9 +36,10 @@
 </template>
 
 <script>
+
 import Vue from 'vue'
 import Vuex from 'vuex'
-import store from '../store.js' // Store importieren
+import store from '../store.js' // import store
 
 import Logger from '../logger.js'
 import SetupConfirmation from './SetupConfirmation.vue'

diff --git a/src/components/PersonalTotpSettings.vue b/src/components/PersonalTotpSettings.vue
@@ -4,7 +4,7 @@
   - @author 2018 Christoph Wurst <christoph@winzerhof-wurst.at>
   - @author 2024 [ernolf] Raphael Gradenwitz <raphael.gradenwitz@googlemail.com>
   -
-  - @license GNU AGPL version 3 or any later version
+  - @license AGPL-3.0-or-later
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
@@ -46,6 +46,7 @@
 		</button>
 
 		<SetupConfirmation v-if="secret"
+			:center="false"
 			:secret="secret"
 			:qr-url="qrUrl"
 			:loading="loadingConfirmation"

diff --git a/src/components/SetupConfirmation.vue b/src/components/SetupConfirmation.vue
@@ -4,7 +4,7 @@
   - @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
   - @author 2024 [ernolf] Raphael Gradenwitz <raphael.gradenwitz@googlemail.com>
   -
-  - @license GNU AGPL version 3 or any later version
+  - @license AGPL-3.0-or-later
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
@@ -21,20 +21,20 @@
   -->
 
 <template>
-	<div :class="['setup-confirmation', { centered: isCentered }]">
+	<div :class="['setup-confirmation', { centered: center }]">
 		<p class="setup-confirmation__secret">
 			{{ t('twofactor_totp', 'Your new TOTP secret is:') }} {{ localSecret }}
 		</p>
 
 		<!-- Advanced Settings Button -->
-		<div :class="['advanced-settings-container', { centered: isCentered }]">
+		<div :class="['advanced-settings-container', { centered: center }]">
 			<button class="advanced-settings-btn" @click="toggleAdvancedSettings">
 				{{ showAdvanced ? t('twofactor_totp', 'Hide advanced settings') : t('twofactor_totp', 'Advanced settings') }}
 			</button>
 		</div>
 
 		<!-- Advanced Settings Section -->
-		<div v-if="showAdvanced" :class="['advanced-settings', { centered: isCentered }]">
+		<div v-if="showAdvanced" :class="['advanced-settings', { centered: center }]">
 			<p class="warning-message">
 				{{ t('twofactor_totp', 'Warning: Not all TOTP devices or smartphone apps support the full range of these advanced settings.') }}
 			</p>
@@ -43,8 +43,8 @@
 			</p>
 
 			<!-- Custom Secret Input -->
-			<div :class="['form-group', { centered: isCentered }]">
-				<label :class="{ centered: isCentered }"
+			<div :class="['form-group', { centered: center }]">
+				<label :class="{ centered: center }"
 					for="custom-secret"
 					@mouseleave="onMouseLeave">
 					{{ t('twofactor_totp', 'Secret') }}
@@ -63,8 +63,8 @@
 			<!-- Settings Row (Algorithm, Digits, Period) -->
 			<div class="form-row">
 				<!-- Algorithm Select -->
-				<div :class="['form-group', { centered: isCentered }]">
-					<label :class="{ centered: isCentered }"
+				<div :class="['form-group', { centered: center }]">
+					<label :class="{ centered: center }"
 						for="algorithm"
 						@mouseleave="onMouseLeave">
 						{{ t('twofactor_totp', 'Algorithm') }}
@@ -86,8 +86,8 @@
 				</div>
 
 				<!-- Digits Select -->
-				<div :class="['form-group', { centered: isCentered }]">
-					<label :class="{ centered: isCentered }"
+				<div :class="['form-group', { centered: center }]">
+					<label :class="{ centered: center }"
 						for="digits"
 						:title="t('twofactor_totp', 'OTP token length')"
 						@mouseleave="onMouseLeave">
@@ -105,8 +105,8 @@
 				</div>
 
 				<!-- Period Select -->
-				<div :class="['form-group', { centered: isCentered }]">
-					<label :class="{ centered: isCentered }"
+				<div :class="['form-group', { centered: center }]">
+					<label :class="{ centered: center }"
 						for="period"
 						:title="t('twofactor_totp', 'OTP validity in seconds')"
 						@mouseleave="onMouseLeave">
@@ -133,7 +133,7 @@
 		<p>{{ t('twofactor_totp', 'For quick setup, scan this QR code with your TOTP app:') }}</p>
 		<QR :value="qrUrl" :options="{ width: 150 }" />
 		<p>{{ t('twofactor_totp', 'After you configured your app, enter a test code below to ensure everything works correctly:') }}</p>
-		<div id="['totp-confirmation-container', { centered: isCentered }]">
+		<div id="['totp-confirmation-container', { centered: center }]">
 			<input id="totp-confirmation"
 				ref="confirmationInput"
 				v-model="confirmationCode"
@@ -164,7 +164,7 @@ export default {
 		QR,
 	},
 	props: {
-		isCentered: {
+		center: {
 			type: Boolean,
 			default: false,
 		},
@@ -324,7 +324,7 @@ export default {
 			const base32Regex = /^[A-Z2-7]*$/
 			const minLength = 26
 			const maxLength = 128
-			let warningMessages = []
+			const warningMessages = []
 			if (this.customSecret.length < minLength) {
 				warningMessages.push(this.t('twofactor_totp', 'The secret must have at least 26 characters.'))
 			}
@@ -336,9 +336,9 @@ export default {
 			}
 			// Set the warning message based on the validation
 			if (warningMessages.length > 0) {
-				this.customSecretWarning = warningMessages.join(' ');
+				this.customSecretWarning = warningMessages.join(' ')
 			} else {
-				this.customSecretWarning = false;
+				this.customSecretWarning = false
 			}
 			// Check if the settings have changed
 			this.checkIfSettingsChanged()
@@ -364,7 +364,7 @@ export default {
 
 <style lang="scss" scoped>
 .setup-confirmation {
-	/* Centered only if isCentered is true */
+	/* Centered only if center is true */
 	&.centered {
 		display: flex;
 		flex-direction: column;

diff --git a/src/logger.js b/src/logger.js
@@ -3,7 +3,7 @@
  *
  * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

diff --git a/src/main-login-setup.js b/src/main-login-setup.js
@@ -3,7 +3,7 @@
  *
  * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

diff --git a/src/main-settings.js b/src/main-settings.js
@@ -3,7 +3,7 @@
  *
  * @author 2018 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

diff --git a/src/services/StateService.js b/src/services/StateService.js
@@ -4,7 +4,7 @@
  * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author 2024 [ernolf] Raphael Gradenwitz <raphael.gradenwitz@googlemail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

diff --git a/src/state.js b/src/state.js
@@ -3,7 +3,7 @@
  *
  * @author 2018 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

diff --git a/src/store.js b/src/store.js
@@ -1,22 +1,3 @@
-/**
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @copyright Copyright (c) Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author 2024 [ernolf] Raphael Gradenwitz <raphael.gradenwitz@googlemail.com>
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
 import Vue from 'vue'
 import Vuex from 'vuex'
 

diff --git a/src/tests/components/PersonalTotpSettings.spec.js b/src/tests/components/PersonalTotpSettings.spec.js
@@ -3,7 +3,7 @@
  *
  * @author 2018 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

diff --git a/src/tests/components/SetupConfirmation.spec.js b/src/tests/components/SetupConfirmation.spec.js
@@ -3,7 +3,7 @@
  *
  * @author 2024 [ernolf] Raphael Gradenwitz <raphael.gradenwitz@googlemail.com>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

diff --git a/src/tests/jest.setup.js b/src/tests/jest.setup.js
@@ -3,7 +3,7 @@
  *
  * @author 2018 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as