Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Save marcinwasowicz/8afb8dc6ab76ba79e5b0fb2c0d3fc14c to your computer and use it in GitHub Desktop.
Save marcinwasowicz/8afb8dc6ab76ba79e5b0fb2c0d3fc14c to your computer and use it in GitHub Desktop.
diff --git a/lib/hooks/peer-list-hooks.js b/lib/hooks/peer-list-hooks.js
index e8f968c90f..2d4379d417 100644
--- a/lib/hooks/peer-list-hooks.js
+++ b/lib/hooks/peer-list-hooks.js
@@ -29,7 +29,7 @@ function useCreateInitialPeerList(): () => Promise<void> {
peersDeviceLists.usersSignedDeviceLists,
);
const usersPlatformDetails = peersDeviceLists.usersDevicesPlatformDetails;
-
+ console.log(usersPlatformDetails);
dispatch({
type: setPeerDeviceListsActionType,
payload: { deviceLists: usersRawDeviceLists, usersPlatformDetails },
diff --git a/lib/utils/services-utils.js b/lib/utils/services-utils.js
index 684f444314..c22609665e 100644
--- a/lib/utils/services-utils.js
+++ b/lib/utils/services-utils.js
@@ -7,7 +7,7 @@ import type { AuthMetadata } from '../shared/identity-client-context.js';
// If this is true then we're using the identity service for auth. After we
// auth, the identity service gives us a CSAT, which we can use to auth with
// other Comm services.
-const usingCommServicesAccessToken = false;
+const usingCommServicesAccessToken = true;
// 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
diff --git a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
index c8fbf1e895..6f266ec6a7 100644
--- a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
+++ b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
@@ -842,19 +842,19 @@ bool create_schema(sqlite3 *db) {
void set_encryption_key(
sqlite3 *db,
const std::string &encryptionKey = SQLiteQueryExecutor::encryptionKey) {
- std::string set_encryption_key_query =
- "PRAGMA key = \"x'" + encryptionKey + "'\";";
-
- char *error_set_key;
- sqlite3_exec(
- db, set_encryption_key_query.c_str(), nullptr, nullptr, &error_set_key);
-
- if (error_set_key) {
- std::ostringstream error_message;
- error_message << "Failed to set encryption key: " << error_set_key;
- throw std::system_error(
- ECANCELED, std::generic_category(), error_message.str());
- }
+ // std::string set_encryption_key_query =
+ // "PRAGMA key = \"x'" + encryptionKey + "'\";";
+
+ // char *error_set_key;
+ // sqlite3_exec(
+ // db, set_encryption_key_query.c_str(), nullptr, nullptr, &error_set_key);
+
+ // if (error_set_key) {
+ // std::ostringstream error_message;
+ // error_message << "Failed to set encryption key: " << error_set_key;
+ // throw std::system_error(
+ // ECANCELED, std::generic_category(), error_message.str());
+ // }
}
int get_database_version(sqlite3 *db) {
diff --git a/services/identity/src/database/device_list.rs b/services/identity/src/database/device_list.rs
index 48f6332afd..9f81cc7351 100644
--- a/services/identity/src/database/device_list.rs
+++ b/services/identity/src/database/device_list.rs
@@ -357,6 +357,16 @@ impl From<DeviceRow> for AttributeMap {
ATTR_ITEM_ID.to_string(),
DeviceIDAttribute(value.device_id).into(),
),
+ (
+ OLD_ATTR_DEVICE_TYPE.to_string(),
+ AttributeValue::S(
+ value.platform_details.device_type.as_str_name().to_string(),
+ ),
+ ),
+ (
+ OLD_ATTR_CODE_VERSION.to_string(),
+ AttributeValue::N(value.platform_details.code_version.to_string()),
+ ),
(
ATTR_PLATFORM_DETAILS.to_string(),
value.platform_details.into(),
diff --git a/services/terraform/remote/service_identity.tf b/services/terraform/remote/service_identity.tf
index 64d30c7dd3..b115d835dc 100644
--- a/services/terraform/remote/service_identity.tf
+++ b/services/terraform/remote/service_identity.tf
@@ -1,5 +1,5 @@
locals {
- identity_service_image_tag = local.is_staging ? "0.19-staging" : "0.18"
+ identity_service_image_tag = local.is_staging ? "0.20-staging-test" : "0.18"
identity_service_server_image = "commapp/identity-server:${local.identity_service_image_tag}"
identity_service_container_name = "identity-server"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment