From e0de53b409c38366dc9ec3a168ed4b3c1d1c9ec7 Mon Sep 17 00:00:00 2001
From: UKDTOM <tm@orstrand.dk>
Date: Mon, 4 Jan 2021 01:41:25 +0100
Subject: [PATCH] #196 fixed

---
 public/locales/en.json                |  4 +++-
 src/components/modules/Main/Login.vue | 13 +++++++++++--
 src/store/modules/plextv.js           | 22 ++++++++++++----------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/public/locales/en.json b/public/locales/en.json
index 0e7128d..8f3dcb3 100644
--- a/public/locales/en.json
+++ b/public/locales/en.json
@@ -37,7 +37,9 @@
             "Password": "Password",
             "PasswordPrompt": "Enter your plex.tv password",
             "UsernameSave": "Remember Username",
-            "LoginBtn": "Sign in"
+            "LoginBtn": "Sign in",
+            "twoFA": "2Factor Authentication Code",
+            "twoFAPrompt": "If using 2FA, enter your code here, else leave as blank (optional)"
         },
         "SelServer": "Select Server",
         "Menu": {
diff --git a/src/components/modules/Main/Login.vue b/src/components/modules/Main/Login.vue
index d5bf7d8..a2cd12a 100644
--- a/src/components/modules/Main/Login.vue
+++ b/src/components/modules/Main/Login.vue
@@ -31,6 +31,14 @@
             <b-form-input type="password" id="input-2" v-model="input.password" trim></b-form-input>
         </b-form-group>
 
+        <b-form-group
+          id="fieldset-3"
+          :description="$t('Common.Login.twoFAPrompt')"
+          :label="$t('Common.Login.twoFA')"
+          label-for="input-1">
+            <b-form-input id="input-3" v-model="input.twoFA" trim></b-form-input>
+        </b-form-group>
+
         <b-form-group>
           <b-form-checkbox
             id="checkbox-1"
@@ -81,7 +89,7 @@ export default {
       log.verbose(`We have an Auth Token from cli or dev option`)
       store.dispatch('loginToPlexWithToken', {
       token: this.$store.getters.getAuthToken      
-      })
+      })      
     }
   },
   methods: {
@@ -91,7 +99,8 @@ export default {
     plexLogin(){
       store.dispatch('loginToPlex', {
       username: this.input.username,
-      password: this.input.password
+      password: this.input.password,
+      twoFA: this.input.twoFA
       })
             
       if(this.checkbox){
diff --git a/src/store/modules/plextv.js b/src/store/modules/plextv.js
index 77aa9b2..a5654c2 100644
--- a/src/store/modules/plextv.js
+++ b/src/store/modules/plextv.js
@@ -101,22 +101,24 @@ const actions = {
   },
   loginToPlex({ commit }, payload){    
     log.info("loginToPlex called")
+    var url = 'https://plex.tv/api/v2/users/signin';
+    url = url + '?login=' + payload.username;
+    url = url + '&password=' + payload.password;
+    if ( payload.twoFA ){
+      url = url + '&verificationCode=' + payload.twoFA
+    }    
     axios({
       method: 'POST',
-      url: 'https://plex.tv/users/sign_in.json',      
-      auth: {
-        username : payload.username,
-        password:  payload.password
-      },
+      url: url,      
       headers: wtutils.PMSHeader      
     })  
       .then(function (response) {
-        log.debug('loginToPlex: Response from fetchPlexServers recieved')
-        commit('UPDATE_AUTHTOKEN', response.data.user.authToken)
+        log.debug('loginToPlex: Response from fetchPlexServers recieved')        
+        commit('UPDATE_AUTHTOKEN', response.data.authToken)
         commit('UPDATE_AUTHENTICATED', true)
-        commit('UPDATE_AVATAR', response.data.user.thumb)
-        commit('UPDATE_PLEXNAME', response.data.user.username)
-        router.replace({name: "home"}); 
+        commit('UPDATE_AVATAR', response.data.thumb)
+        commit('UPDATE_PLEXNAME', response.data.username)
+        router.replace({name: "home"});
     })
       .catch(function (error) {
          if (error.response) {