77 class =" q-pa-lg shadow-1"
88 >
99 <q-form
10- @submit =" login"
10+ @submit =" showSkipLogin ? skipLogin() : login() "
1111 ref =" loginform"
1212 class =" q-gutter-md"
1313 >
1414 <q-card-section >
1515
1616 <q-input
17- square
18- filled
1917 v-model =" username"
20- type =" text"
21- ref =" username"
2218 :disable =" credentialsSaved"
2319 :label =" $t('username')"
2420 :class =" shake"
21+ :rules =" showSkipLogin ? [ val => val.length >= 0 ] : [ val => val && val.length > 0 || $t('usernameRequired') ]"
22+ type =" text"
23+ ref =" username"
24+ square
25+ filled
2526 lazy-rules
2627 no-error-icon
27- :rules =" [ val => val && val.length > 0 || $t('usernameRequired') ]"
2828 >
2929 <template v-slot :append >
3030 <q-icon name =" person"
3636 mode =" out-in"
3737 >
3838 <div
39- style =" q-gutter-md "
4039 v-if =" credentialsSaved"
40+ style =" q-gutter-md "
4141 >
4242 <q-btn
43+ :label =" $t('changeUser')"
44+ @click =" credentialsSaved = false"
4345 unelevated
4446 color =" light"
4547 size =" lg"
4648 class =" full-width"
47- :label =" $t('changeUser')"
48- @click =" credentialsSaved = false"
4949 />
5050 </div >
5151
5252 <q-input
53- square
54- filled
55- v-model =" password"
5653 v-else
54+ v-model =" password"
5755 :type =" isPwd ? 'password' : 'text'"
5856 :label =" $t('password')"
57+ :rules =" showSkipLogin ? [ val => val.length >= 0 ] : [ val => val && val.length > 0 || $t('passwordRequired') ]"
58+ square
59+ filled
5960 lazy-rules
6061 no-error-icon
61- :rules =" [ val => val && val.length > 0 || $t('passwordRequired') ]"
6262 >
6363 <template v-slot :append >
6464 <q-icon
6565 :name =" isPwd ? 'visibility_off' : 'visibility'"
66- class =" cursor-pointer"
6766 @click =" isPwd = !isPwd"
67+ class =" cursor-pointer"
6868 />
6969 </template >
7070 </q-input >
7171 </transition >
7272 </q-card-section >
7373 <q-card-actions class =" q-px-md"
74- <q-btn
75- autofocus
76- unelevated
74+ <q-btn-dropdown
75+ v-model =" showSkipLogin"
76+ :label =" showSkipLogin ? $t('loginSkip') : $t('login')"
77+ :disable =" loginButtonDisabled"
78+ @input =" resetValidation"
79+ dropdown-icon =" mdi-skip-next"
7780 color =" primary"
7881 size =" lg"
7982 class =" full-width"
8083 type =" submit"
8184 ref =" login"
82- :label =" $t('login')"
83- :disable =" loginButtonDisabled"
85+ unelevated
86+ persistent
87+ split
8488 />
8589 </q-card-actions >
8690 </q-form >
@@ -111,8 +115,8 @@ export default {
111115 username: ' '
112116 password: ' '
113117 loginButtonDisabled: false ,
118+ showSkipLogin: false ,
114119 shakeUsername: false ,
115- credentialsSaved: false ,
116120 isPwd: true ,
117121 langOptions: [
118122 { value: ' en-us' : ' English'
@@ -121,7 +125,7 @@ export default {
121125 }
122126 },
123127 computed: {
124- ... mapGetters (' lazystore' ' getLanguage'
128+ ... mapGetters (' lazystore' ' getLanguage' , ' getLoginSkipped ' , ' getCredentialsSaved '
125129 shake: {
126130 get () {
127131 // Add classes to trigger animations on username field when username is found in credential store
@@ -130,18 +134,66 @@ export default {
130134 },
131135 language: {
132136 get () {
133- // retrieve language settings from mapped getter
134137 return this .getLanguage
135138 },
136139 set (val) {
137- // set selected language to store
138140 this .$store .dispatch (' lazystore/setLanguage'
139141 }
142+ },
143+ loginSkipped: {
144+ get () {
145+ return this .getLoginSkipped
146+ },
147+ set (val) {
148+ this .$store .dispatch (' lazystore/setLoginSkipped'
149+ }
150+ },
151+ credentialsSaved: {
152+ get () {
153+ return this .getCredentialsSaved
154+ },
155+ set (val) {
156+ this .$store .dispatch (' lazystore/setCredentialsSaved'
157+ }
140158 }
141159 },
142160 methods: {
161+ resetForm (credentialsProvided ) {
162+ this .loginButtonDisabled = false
163+ this .credentialsSaved = false
164+ this .username = ' '
165+ this .password = ' '
166+ this .$refs .loginform .resetValidation ()
167+ this .$refs .username .focus ()
168+ this .$q .notify ({
169+ timeout: 5000 ,
170+ multiLine: false ,
171+ type: ' negative'
172+ icon: ' error'
173+ message: credentialsProvided ? this .$t (' wrongUsernameOrPassword' : this .$t (' failedToLogin'
174+ actions: [
175+ { label: this .$t (' dismiss' : ' white'
176+ ]
177+ })
178+ },
179+ resetValidation () {
180+ this .$refs .loginform .resetValidation ()
181+ },
182+ skipLogin () {
183+ this .loginButtonDisabled = true
184+ this .loginSkipped = true
185+ console .log (' Skipping login, certain commands may be unavailable.'
186+ this .$pwsh .shell .addCommand (` $Global:CredentialObject = [System.Management.Automation.PSCredential]::Empty`
187+ this .$pwsh .shell .invoke ().then (output => {
188+ this .$router .push ({ path: ' /scripts'
189+ }).catch (e => {
190+ console .error (` Failed to create empty Credential Object. Error message: ${ e} `
191+ this .resetForm (false )
192+ })
193+ },
143194 login () {
144195 this .loginButtonDisabled = true // Disable button during login attempt
196+ this .loginSkipped = false
145197 // Invoke function with either credential object or username and password
146198 if (this .credentialsSaved ) {
147199 console .log (` Creating new PowerShell session with saved credentials for user "${ this .username } `
@@ -159,28 +211,18 @@ export default {
159211 }
160212 if (data .error ) {
161213 console .error (` Failed to create new PowerShell session with supplied credentials. Error message: ${ output} `
162- this .loginButtonDisabled = false
163- this .credentialsSaved = false
164- this .username = ' '
165- this .password = ' '
166- this .$refs .loginform .resetValidation ()
167- this .$refs .username .focus ()
168- this .$q .notify ({
169- timeout: 5000 ,
170- multiLine: false ,
171- type: ' negative'
172- icon: ' error'
173- message: this .$t (' wrongUsernameOrPassword'
174- actions: [
175- { label: this .$t (' dismiss' : ' white'
176- ]
177- })
214+ this .resetForm (true )
178215 } else {
179216 console .log (data .output ) // Should write 'New Powershell session created succesfully.' from PS Function output
180217 // Route to main screen
181218 if (! this .credentialsSaved ) {
182219 this .$pwsh .shell .addCommand (` if (Get-Command New-StoredCredential -ErrorAction SilentlyContinue) {New-StoredCredential -Target 'Lazy Admin' -UserName '${ this .username } ${ this .password } `
183- this .$pwsh .shell .invoke ()
220+ this .$pwsh .shell .invoke ().then (o => {
221+ console .log (' Succesfully saved credentials to Credential Manager.'
222+ this .credentialsSaved = true
223+ }).catch (e => {
224+ console .error (` Failed to save credentials to Credential Manager. Error message: ${ e} `
225+ })
184226 }
185227 // Succesfully created session, push login and session commands to private pwsh variable
186228 if (this .credentialsSaved ) {
@@ -190,6 +232,9 @@ export default {
190232 }
191233 this .$router .push ({ path: ' /scripts'
192234 }
235+ }).catch (e => {
236+ console .error (` Failed to create new PowerShell session with supplied credentials. Error message: ${ e} `
237+ this .resetForm (false )
193238 })
194239 },
195240 pwshFallbackNotify () {
@@ -218,6 +263,7 @@ export default {
218263 this .$q .loading .show ()
219264 // Insert throttle to button functions
220265 this .login = throttle (this .login , 800 )
266+ this .skipLogin = throttle (this .skipLogin , 800 )
221267 console .log (` Application started by user ${ this .$q .electron .remote .process .env .USERDOMAIN } \\ ${ this .$q .electron .remote .process .env .USERNAME } ${ this .$q .electron .remote .process .env .COMPUTERNAME } `
222268 // Try to load saved credentials from Credential Manager
223269 this .$pwsh .shell .addCommand (GetSavedCredentials)
0 commit comments