From 50137896fe21dbf890b576fe7d39948c767673ec Mon Sep 17 00:00:00 2001
From: Alexander Tratsevskiy <at@calculate.ru>
Date: Tue, 24 Oct 2023 17:00:03 +0300
Subject: [PATCH] Revert "TG-435 www-plugins/chrome-bitwarden: fix"

This reverts commit 8c961b90b1d3c3135494366c93f0f145067ac709.
---
 .../www-client/chromium-80/Default/01-install-bitwarden.sh  | 2 +-
 .../www-client/chromium-80/Default/Preferences.extensions   | 4 ++--
 ...-2023.5.1-r1.ebuild => chrome-bitwarden-2023.5.1.ebuild} | 0
 www-plugins/chrome-bitwarden/files/configure.py             | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename www-plugins/chrome-bitwarden/{chrome-bitwarden-2023.5.1-r1.ebuild => chrome-bitwarden-2023.5.1.ebuild} (100%)

diff --git a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-bitwarden.sh b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-bitwarden.sh
index 12f173050..8c7bf24e6 100644
--- a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-bitwarden.sh
+++ b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-bitwarden.sh
@@ -5,7 +5,7 @@ mkdir -p #-ur_home_path-#/.config/chromium/Default/Extensions/${plugin_id}
 mkdir -p "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings" &>/dev/null
 cp -r /usr/share/chrome-bitwarden/* #-ur_home_path-#/.config/chromium/Default/Extensions/$plugin_id
 
-/usr/share/chrome-bitwarden/configure.py #-ur_home_path-#/.config/chromium $plugin_id "#-ini(user_credentials.bitwarden_login)-#" "#-ini(user_credentials.bitwarden_pw)-#" "#-ini(user_credentials.bitwarden_url)-#"&>/dev/null <<EOF
+/usr/share/chrome-bitwarden/configure.py #-ur_home_path-#/.config/chromium $plugin_id "#-ini(user_credentials.bitwarden_login)-#" "#-ini(user_credentials.bitwarden_pw)-#" &>/dev/null <<EOF
 {
     "userId": {
 	"data": {
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.extensions b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.extensions
index f7b1daa8a..26802eada 100644
--- a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.extensions
+++ b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.extensions
@@ -470,7 +470,7 @@
                         "managed_schema": "managed_schema.json"
                     },
                     "update_url": "https://clients2.google.com/service/update2/crx",
-                    "version": "2023.5.1",
+                    "version": "#-pkg(www-plugins/chrome-bitwarden)-#",
                     "web_accessible_resources": [
                         "notification/bar.html",
                         "images/icon38.png",
@@ -478,7 +478,7 @@
                     ]
                 },
                 "needs_sync": true,
-                "path": "nngceckbapebfimnlniiiahkandclblb/2023.5.1_0",
+                "path": "nngceckbapebfimnlniiiahkandclblb/#-pkg(www-plugins/chrome-bitwarden)-#_0",
                 "preferences": {},
                 "regular_only_preferences": {},
                 "state": 1,
diff --git a/www-plugins/chrome-bitwarden/chrome-bitwarden-2023.5.1-r1.ebuild b/www-plugins/chrome-bitwarden/chrome-bitwarden-2023.5.1.ebuild
similarity index 100%
rename from www-plugins/chrome-bitwarden/chrome-bitwarden-2023.5.1-r1.ebuild
rename to www-plugins/chrome-bitwarden/chrome-bitwarden-2023.5.1.ebuild
diff --git a/www-plugins/chrome-bitwarden/files/configure.py b/www-plugins/chrome-bitwarden/files/configure.py
index f83520013..16f70b0dc 100644
--- a/www-plugins/chrome-bitwarden/files/configure.py
+++ b/www-plugins/chrome-bitwarden/files/configure.py
@@ -42,13 +42,14 @@ def hash_password(password, salt=None, iterations=600000):
     return password_hash
 
 
-def authorization(password,login,url):
+def authorization(password,login):
     """
     Авторизация и получение данных
     """
 
     global url, Key, PrivateKey, hashKey, access_token, refresh_token, userId
 
+    url = "https://vw.calculate.ru"
     pre_login_url = url + "/identity/accounts/prelogin"
     login_url = url + "/identity/connect/token"
     profile_url = url + "/api/accounts/profile"
@@ -140,9 +141,8 @@ chrome_dir = sys.argv[1]
 ext_id = sys.argv[2]
 login = sys.argv[3]
 password = sys.argv[4]
-url = sys.argv[5]
 
-authorization(password,login,url)
+authorization(password,login)
 update_json(data_list)
 
 db_path = path.join(chrome_dir,"Default/Local Extension Settings", ext_id)