Page MenuHomePhorge
Files F33035713

D15211.1768409025.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D15211.1768409025.diff
View Options

diff --git a/lib/utils/services-utils.js b/lib/utils/services-utils.js
--- a/lib/utils/services-utils.js
+++ b/lib/utils/services-utils.js
@@ -2,10 +2,8 @@
import base64 from 'base-64';
-import { getConfig } from './config.js';
import { getMessageForException } from './errors.js';
import type { AuthMetadata } from '../shared/identity-client-context.js';
-import { isStaff, useIsCurrentUserStaff } from '../shared/staff-utils.js';
// If this is true, then the app is able to support multiple keyservers. This
// requires the use of Tunnelbroker and the backup service to persist and sync
@@ -31,20 +29,12 @@
// compaction and logs.
// Keep in sync with native/cpp/CommonCpp/Tools/ServicesUtils.h
function useFullBackupSupportEnabled(): boolean {
- const isCurrentUserStaff = useIsCurrentUserStaff();
- if (getConfig().isStaffRelease) {
- return true;
- }
- return isCurrentUserStaff;
+ return true;
}
+// Argument userID is unused. Not an issue, this func is going to be removed.
+// eslint-disable-next-line no-unused-vars
function fullBackupSupportEnabled(userID: ?string): boolean {
- if (getConfig().isStaffRelease) {
- return true;
- }
- if (!userID) {
- return false;
- }
- return isStaff(userID);
+ return true;
}
function createHTTPAuthorizationHeader(authMetadata: AuthMetadata): string {
diff --git a/native/cpp/CommonCpp/Tools/ServicesUtils.cpp b/native/cpp/CommonCpp/Tools/ServicesUtils.cpp
--- a/native/cpp/CommonCpp/Tools/ServicesUtils.cpp
+++ b/native/cpp/CommonCpp/Tools/ServicesUtils.cpp
@@ -1,12 +1,7 @@
#include "ServicesUtils.h"
-#include "StaffUtils.h"
namespace comm {
bool ServicesUtils::fullBackupSupport() {
-#if DEBUG
return true;
-#else
- return StaffUtils::isStaffRelease();
-#endif
}
} // namespace comm

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 14, 4:43 PM (11 h, 32 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5932923
Default Alt Text
D15211.1768409025.diff (1 KB)

Event Timeline