Page MenuHomePhabricator
Differential D8879

[lib] Move conversion function out of validation utils
ClosedPublic
Actions

Authored by michal on Aug 21 2023, 1:48 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 4, 4:39 AM
Unknown Object (File)
Fri, Apr 4, 1:22 AM
Unknown Object (File)
Thu, Apr 3, 10:40 PM
Unknown Object (File)
Thu, Apr 3, 8:38 PM
Unknown Object (File)
Thu, Apr 3, 7:38 PM
Unknown Object (File)
Thu, Apr 3, 3:41 AM
Unknown Object (File)
Mar 7 2025, 1:28 AM
Unknown Object (File)
Mar 1 2025, 6:09 PM
View All Files
Subscribers
ashoat

Details

Reviewers
tomek
inka
kamil
ginsu
Commits
rCOMMfeb5be94bf6f: [lib] Move conversion function out of validation utils
Summary

Changes required for fixing ENG-4670 introduce some cyclic dependencies so we need to move some things around.

Test Plan

yarn test-all, yarn eslint, yarn flow-all

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

michal created this revision.Aug 21 2023, 1:48 AM
Herald added a subscriber: ashoat. · View Herald TranscriptAug 21 2023, 1:48 AM
michal added a child revision: D8880: [keyserver] Convert urlInfo in website responders.Aug 21 2023, 1:57 AM
Harbormaster completed remote builds in B21933: Diff 30125.Aug 21 2023, 2:05 AM
michal requested review of this revision.Aug 21 2023, 2:05 AM
michal planned changes to this revision.Aug 21 2023, 8:00 AM
michal updated this revision to Diff 30145.Aug 21 2023, 8:22 AM

Remove unrelated changes

michal updated this revision to Diff 30146.Aug 21 2023, 8:25 AM

Fix

Harbormaster completed remote builds in B21948: Diff 30145.Aug 21 2023, 8:40 AM
Harbormaster completed remote builds in B21949: Diff 30146.Aug 21 2023, 8:42 AM
kamil accepted this revision.Aug 22 2023, 12:55 AM
This revision is now accepted and ready to land.Aug 22 2023, 12:55 AM
Closed by commit rCOMMfeb5be94bf6f: [lib] Move conversion function out of validation utils (authored by Michal Gniadek <michal.gniadek@swmansion.com>). · Explain WhyAug 22 2023, 3:13 AM
This revision was automatically updated to reflect the committed changes.
Michal Gniadek <michal.gniadek@swmansion.com> added a commit: rCOMMfeb5be94bf6f: [lib] Move conversion function out of validation utils.

Revision Contents
Changeset List

PathSize
keyserver/
src/
utils/
8 lines
lib/
selectors/
7 lines
utils/
conversion-utils.js
validation-utils.js
169 lines
69 lines
119 lines
67 lines

Diff 30125

View Options

keyserver/src/utils/validation-utils.js

  • This file was added.
#import "CommServicesAuthMetadataEmitter.h"
#import <Foundation/Foundation.h>
#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>
NSString *const commServicesAuthMetadata = @"commServicesAuthMetadata";
@interface CommServicesAuthMetadataEmitterIOSWrapper
marcinAuthorUnsubmitted
Done
Inline Actions

It might look uncommon to have interface declaration and implementation next to each other in a single file but in fact we don't need to expose CommServicesAuthMetadataIOSWrapper. If we want to call sendAuthMetadataToJS from Objective - C we can use the common C++ API so let's avoid creating unnecessary files and duplication the same API.

marcin: It might look uncommon to have interface declaration and implementation next to each other in a…
bartekUnsubmitted
Not Done
Inline Actions

It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes sense here

bartek: It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes…
: RCTEventEmitter <RCTBridgeModule>
@property(nonatomic) BOOL hasListeners;
+ (void)sendToJSAccessToken:(NSString *)accessToken
withUserID:(NSString *)userID
withDeviceID:(NSString *)deviceID;
bartekUnsubmitted
Not Done
Inline Actions

What about sendAccessTokenToJS: ... withUserID: ... withDeviceID?

Initially, I got confused because I understood sendToJSAccessToken as "send something to JS-based access token" 😅

bartek: What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused…
varunUnsubmitted
Not Done
Inline Actions

+1

varun: +1
@end
@implementation CommServicesAuthMetadataEmitterIOSWrapper
RCT_EXPORT_MODULE(CommServicesAuthMetadataEmitter);
static CommServicesAuthMetadataEmitterIOSWrapper *sharedInstance = nil;
- (instancetype)init {
self = [super init];
if (!self) {
return self;
}
_hasListeners = NO;
return self;
}
- (void)startObserving {
@synchronized([self class]) {
_hasListeners = YES;
sharedInstance = self;
}
}
- (void)stopObserving {
@synchronized([self class]) {
_hasListeners = NO;
sharedInstance = nil;
}
}
- (NSArray<NSString *> *)supportedEvents {
return @[ commServicesAuthMetadata ];
}
- (NSDictionary *)constantsToExport {
return @{@"COMM_SERVICES_AUTH_METADATA" : commServicesAuthMetadata};
}
+ (BOOL)requiresMainQueueSetup {
return YES;
}
+ (void)sendToJSAccessToken:(NSString *)accessToken
withUserID:(NSString *)userID
withDeviceID:(NSString *)deviceID {
@synchronized([self class]) {
if (!sharedInstance) {
return;
}
NSDictionary *eventBody = @{
@"accessToken" : accessToken,
@"userID" : userID,
@"deviceID" : deviceID
};
[sharedInstance sendEventWithName:commServicesAuthMetadata body:eventBody];
}
}
@end
namespace comm {
void CommServicesAuthMetadataEmitter::sendAuthMetadataToJS(
rust::String accessToken,
rust::String userID,
rust::String deviceID) {
NSString *accessTokenObjC =
[NSString stringWithCString:std::string(accessToken).c_str()
encoding:NSUTF8StringEncoding];
NSString *userIDObjC = [NSString stringWithCString:std::string(userID).c_str()
encoding:NSUTF8StringEncoding];
NSString *deviceIDObjC =
[NSString stringWithCString:std::string(deviceID).c_str()
encoding:NSUTF8StringEncoding];
[CommServicesAuthMetadataEmitterIOSWrapper sendToJSAccessToken:accessTokenObjC
withUserID:userIDObjC
withDeviceID:deviceIDObjC];
}
} // namespace comm
View Options

lib/selectors/socket-selectors.js

  • This file was added.
#import "CommServicesAuthMetadataEmitter.h"
#import <Foundation/Foundation.h>
#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>
NSString *const commServicesAuthMetadata = @"commServicesAuthMetadata";
@interface CommServicesAuthMetadataEmitterIOSWrapper
marcinAuthorUnsubmitted
Done
Inline Actions

It might look uncommon to have interface declaration and implementation next to each other in a single file but in fact we don't need to expose CommServicesAuthMetadataIOSWrapper. If we want to call sendAuthMetadataToJS from Objective - C we can use the common C++ API so let's avoid creating unnecessary files and duplication the same API.

marcin: It might look uncommon to have interface declaration and implementation next to each other in a…
bartekUnsubmitted
Not Done
Inline Actions

It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes sense here

bartek: It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes…
: RCTEventEmitter <RCTBridgeModule>
@property(nonatomic) BOOL hasListeners;
+ (void)sendToJSAccessToken:(NSString *)accessToken
withUserID:(NSString *)userID
withDeviceID:(NSString *)deviceID;
bartekUnsubmitted
Not Done
Inline Actions

What about sendAccessTokenToJS: ... withUserID: ... withDeviceID?

Initially, I got confused because I understood sendToJSAccessToken as "send something to JS-based access token" 😅

bartek: What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused…
varunUnsubmitted
Not Done
Inline Actions

+1

varun: +1
@end
@implementation CommServicesAuthMetadataEmitterIOSWrapper
RCT_EXPORT_MODULE(CommServicesAuthMetadataEmitter);
static CommServicesAuthMetadataEmitterIOSWrapper *sharedInstance = nil;
- (instancetype)init {
self = [super init];
if (!self) {
return self;
}
_hasListeners = NO;
return self;
}
- (void)startObserving {
@synchronized([self class]) {
_hasListeners = YES;
sharedInstance = self;
}
}
- (void)stopObserving {
@synchronized([self class]) {
_hasListeners = NO;
sharedInstance = nil;
}
}
- (NSArray<NSString *> *)supportedEvents {
return @[ commServicesAuthMetadata ];
}
- (NSDictionary *)constantsToExport {
return @{@"COMM_SERVICES_AUTH_METADATA" : commServicesAuthMetadata};
}
+ (BOOL)requiresMainQueueSetup {
return YES;
}
+ (void)sendToJSAccessToken:(NSString *)accessToken
withUserID:(NSString *)userID
withDeviceID:(NSString *)deviceID {
@synchronized([self class]) {
if (!sharedInstance) {
return;
}
NSDictionary *eventBody = @{
@"accessToken" : accessToken,
@"userID" : userID,
@"deviceID" : deviceID
};
[sharedInstance sendEventWithName:commServicesAuthMetadata body:eventBody];
}
}
@end
namespace comm {
void CommServicesAuthMetadataEmitter::sendAuthMetadataToJS(
rust::String accessToken,
rust::String userID,
rust::String deviceID) {
NSString *accessTokenObjC =
[NSString stringWithCString:std::string(accessToken).c_str()
encoding:NSUTF8StringEncoding];
NSString *userIDObjC = [NSString stringWithCString:std::string(userID).c_str()
encoding:NSUTF8StringEncoding];
NSString *deviceIDObjC =
[NSString stringWithCString:std::string(deviceID).c_str()
encoding:NSUTF8StringEncoding];
[CommServicesAuthMetadataEmitterIOSWrapper sendToJSAccessToken:accessTokenObjC
withUserID:userIDObjC
withDeviceID:deviceIDObjC];
}
} // namespace comm
View Options

lib/utils/conversion-utils.js

  • This file was added.
#import "CommServicesAuthMetadataEmitter.h"
#import <Foundation/Foundation.h>
#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>
NSString *const commServicesAuthMetadata = @"commServicesAuthMetadata";
@interface CommServicesAuthMetadataEmitterIOSWrapper
marcinAuthorUnsubmitted
Done
Inline Actions

It might look uncommon to have interface declaration and implementation next to each other in a single file but in fact we don't need to expose CommServicesAuthMetadataIOSWrapper. If we want to call sendAuthMetadataToJS from Objective - C we can use the common C++ API so let's avoid creating unnecessary files and duplication the same API.

marcin: It might look uncommon to have interface declaration and implementation next to each other in a…
bartekUnsubmitted
Not Done
Inline Actions

It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes sense here

bartek: It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes…
: RCTEventEmitter <RCTBridgeModule>
@property(nonatomic) BOOL hasListeners;
+ (void)sendToJSAccessToken:(NSString *)accessToken
withUserID:(NSString *)userID
withDeviceID:(NSString *)deviceID;
bartekUnsubmitted
Not Done
Inline Actions

What about sendAccessTokenToJS: ... withUserID: ... withDeviceID?

Initially, I got confused because I understood sendToJSAccessToken as "send something to JS-based access token" 😅

bartek: What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused…
varunUnsubmitted
Not Done
Inline Actions

+1

varun: +1
@end
@implementation CommServicesAuthMetadataEmitterIOSWrapper
RCT_EXPORT_MODULE(CommServicesAuthMetadataEmitter);
static CommServicesAuthMetadataEmitterIOSWrapper *sharedInstance = nil;
- (instancetype)init {
self = [super init];
if (!self) {
return self;
}
_hasListeners = NO;
return self;
}
- (void)startObserving {
@synchronized([self class]) {
_hasListeners = YES;
sharedInstance = self;
}
}
- (void)stopObserving {
@synchronized([self class]) {
_hasListeners = NO;
sharedInstance = nil;
}
}
- (NSArray<NSString *> *)supportedEvents {
return @[ commServicesAuthMetadata ];
}
- (NSDictionary *)constantsToExport {
return @{@"COMM_SERVICES_AUTH_METADATA" : commServicesAuthMetadata};
}
+ (BOOL)requiresMainQueueSetup {
return YES;
}
+ (void)sendToJSAccessToken:(NSString *)accessToken
withUserID:(NSString *)userID
withDeviceID:(NSString *)deviceID {
@synchronized([self class]) {
if (!sharedInstance) {
return;
}
NSDictionary *eventBody = @{
@"accessToken" : accessToken,
@"userID" : userID,
@"deviceID" : deviceID
};
[sharedInstance sendEventWithName:commServicesAuthMetadata body:eventBody];
}
}
@end
namespace comm {
void CommServicesAuthMetadataEmitter::sendAuthMetadataToJS(
rust::String accessToken,
rust::String userID,
rust::String deviceID) {
NSString *accessTokenObjC =
[NSString stringWithCString:std::string(accessToken).c_str()
encoding:NSUTF8StringEncoding];
NSString *userIDObjC = [NSString stringWithCString:std::string(userID).c_str()
encoding:NSUTF8StringEncoding];
NSString *deviceIDObjC =
[NSString stringWithCString:std::string(deviceID).c_str()
encoding:NSUTF8StringEncoding];
[CommServicesAuthMetadataEmitterIOSWrapper sendToJSAccessToken:accessTokenObjC
withUserID:userIDObjC
withDeviceID:deviceIDObjC];
}
} // namespace comm
View Options

lib/utils/conversion-utils.test.js

  • This file was added.
#import "CommServicesAuthMetadataEmitter.h"
#import <Foundation/Foundation.h>
#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>
NSString *const commServicesAuthMetadata = @"commServicesAuthMetadata";
@interface CommServicesAuthMetadataEmitterIOSWrapper
marcinAuthorUnsubmitted
Done
Inline Actions

It might look uncommon to have interface declaration and implementation next to each other in a single file but in fact we don't need to expose CommServicesAuthMetadataIOSWrapper. If we want to call sendAuthMetadataToJS from Objective - C we can use the common C++ API so let's avoid creating unnecessary files and duplication the same API.

marcin: It might look uncommon to have interface declaration and implementation next to each other in a…
bartekUnsubmitted
Not Done
Inline Actions

It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes sense here

bartek: It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes…
: RCTEventEmitter <RCTBridgeModule>
@property(nonatomic) BOOL hasListeners;
+ (void)sendToJSAccessToken:(NSString *)accessToken
withUserID:(NSString *)userID
withDeviceID:(NSString *)deviceID;
bartekUnsubmitted
Not Done
Inline Actions

What about sendAccessTokenToJS: ... withUserID: ... withDeviceID?

Initially, I got confused because I understood sendToJSAccessToken as "send something to JS-based access token" 😅

bartek: What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused…
varunUnsubmitted
Not Done
Inline Actions

+1

varun: +1
@end
@implementation CommServicesAuthMetadataEmitterIOSWrapper
RCT_EXPORT_MODULE(CommServicesAuthMetadataEmitter);
static CommServicesAuthMetadataEmitterIOSWrapper *sharedInstance = nil;
- (instancetype)init {
self = [super init];
if (!self) {
return self;
}
_hasListeners = NO;
return self;
}
- (void)startObserving {
@synchronized([self class]) {
_hasListeners = YES;
sharedInstance = self;
}
}
- (void)stopObserving {
@synchronized([self class]) {
_hasListeners = NO;
sharedInstance = nil;
}
}
- (NSArray<NSString *> *)supportedEvents {
return @[ commServicesAuthMetadata ];
}
- (NSDictionary *)constantsToExport {
return @{@"COMM_SERVICES_AUTH_METADATA" : commServicesAuthMetadata};
}
+ (BOOL)requiresMainQueueSetup {
return YES;
}
+ (void)sendToJSAccessToken:(NSString *)accessToken
withUserID:(NSString *)userID
withDeviceID:(NSString *)deviceID {
@synchronized([self class]) {
if (!sharedInstance) {
return;
}
NSDictionary *eventBody = @{
@"accessToken" : accessToken,
@"userID" : userID,
@"deviceID" : deviceID
};
[sharedInstance sendEventWithName:commServicesAuthMetadata body:eventBody];
}
}
@end
namespace comm {
void CommServicesAuthMetadataEmitter::sendAuthMetadataToJS(
rust::String accessToken,
rust::String userID,
rust::String deviceID) {
NSString *accessTokenObjC =
[NSString stringWithCString:std::string(accessToken).c_str()
encoding:NSUTF8StringEncoding];
NSString *userIDObjC = [NSString stringWithCString:std::string(userID).c_str()
encoding:NSUTF8StringEncoding];
NSString *deviceIDObjC =
[NSString stringWithCString:std::string(deviceID).c_str()
encoding:NSUTF8StringEncoding];
[CommServicesAuthMetadataEmitterIOSWrapper sendToJSAccessToken:accessTokenObjC
withUserID:userIDObjC
withDeviceID:deviceIDObjC];
}
} // namespace comm
View Options

lib/utils/validation-utils.js

Loading...
View Options

lib/utils/validation-utils.test.js

Loading...