From ff136e371f345716952b8c70ed770db4959975b7 Mon Sep 17 00:00:00 2001 From: "Jorge E. Gomez" Date: Thu, 25 May 2023 16:19:29 -0500 Subject: [PATCH] Removes obsolete patch included in oauth-multitoken --- apply_patches.sh | 4 ---- ...0_auth-oauth-multi-token_error-in-login.patch | 16 ---------------- 2 files changed, 20 deletions(-) delete mode 100644 patches/20210420_auth-oauth-multi-token_error-in-login.patch diff --git a/apply_patches.sh b/apply_patches.sh index 879a451..c350039 100755 --- a/apply_patches.sh +++ b/apply_patches.sh @@ -105,10 +105,6 @@ pt_community () OPTIONS="--directory=$DEST --strip=1" patch $OPTIONS < patches/20210821_base-location_no-zip-from-city.patch - DEST=$DESTDIR/community/auth_oauth_multi_token/ - OPTIONS="--directory=$DEST --strip=1" - patch $OPTIONS < patches/20210420_auth-oauth-multi-token_error-in-login.patch - DEST=$DESTDIR/community/account_invoice_force_number/ OPTIONS="--directory=$DEST --strip=2" patch $OPTIONS < patches/20211216_account-invoice-force-number_post-instead-of-action.patch diff --git a/patches/20210420_auth-oauth-multi-token_error-in-login.patch b/patches/20210420_auth-oauth-multi-token_error-in-login.patch deleted file mode 100644 index 4201b46..0000000 --- a/patches/20210420_auth-oauth-multi-token_error-in-login.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -rupN auth_oauth_multi_token/models/res_users.py auth_oauth_multi_token.patch/models/res_users.py ---- auth_oauth_multi_token/models/res_users.py 2021-05-31 18:39:08.015127916 -0500 -+++ auth_oauth_multi_token.patch/models/res_users.py 2021-05-31 20:37:17.138888645 -0500 -@@ -66,10 +66,10 @@ class ResUsers(models.Model): - res.oauth_master_uuid = self._generate_oauth_master_uuid() - - @api.model -- def _check_credentials(self, password): -+ def _check_credentials(self, password, env): - """Override to check credentials against multi tokens.""" - try: -- return super()._check_credentials(password) -+ return super()._check_credentials(password, env) - except exceptions.AccessDenied: - res = self.multi_token_model.sudo().search( - [("user_id", "=", self.env.uid), ("oauth_access_token", "=", password)]