Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

waqas/compliant_deriv_auth_package_with_ctrader #433

Closed
wants to merge 5 commits into from
Closed

waqas/compliant_deriv_auth_package_with_ctrader #433

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b752df6
waqas/compliant_deriv_auth_package_with_ctrader
waqas-younas-deriv Feb 5, 2024
834c236
fix model exception
waqas-younas-deriv Feb 5, 2024
4d8a1d1
Update authorize_model.dart
waqas-younas-deriv Feb 6, 2024
1c4229e
Update authorize_model.dart
waqas-younas-deriv Feb 6, 2024
9cbd170
reverting localcurrenies chaage
waqas-younas-deriv Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions packages/deriv_auth/lib/core/models/authorize_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class AuthorizeResponseEntity extends AuthorizeResponseEntityModel {

/// PlatformEnum mapper.
final Map<String, PlatformEnum> platformEnumMapper = <String, PlatformEnum>{
'ctrader': PlatformEnum.ctrader,
'derivez': PlatformEnum.derivez,
'dtrade': PlatformEnum.dtrade,
'dwallet': PlatformEnum.dwallet,
Expand All @@ -84,6 +85,9 @@ final Map<String, PlatformEnum> platformEnumMapper = <String, PlatformEnum>{

/// Platform Enum indicating the account is on which platform.
enum PlatformEnum {
/// ctrader.
ctrader,

/// derivez.
derivez,

Expand Down Expand Up @@ -265,19 +269,10 @@ class AuthorizeEntity extends AuthorizeModel {
),
// TODOAuth(): fromjson(.tojson) wont work for localCurrencies .
// fast fix: localCurrencies: json['local_currencies'] == null
localCurrencies: json['local_currencies'] == null
? null
: Map<String, LocalCurrenciesPropertyEntity>.fromEntries(
json['local_currencies']
.entries
.map<MapEntry<String, LocalCurrenciesPropertyEntity>>(
(MapEntry<String, dynamic> entry) =>
MapEntry<String, LocalCurrenciesPropertyEntity>(
entry.key,
LocalCurrenciesPropertyEntity.fromJson(entry.value),
),
),
),
// localCurrencies: json['local_currencies'] == null
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uncomment changes to localCurrencie as deriv p2p is using it, and the issue is fix in #448

// ? null
// : Map.from(json["local_currencies"])
// .map((k, v) => MapEntry<String, LocalCurrenciesPropertyEntity>(k, LocalCurrenciesPropertyEntity.fromJson(v))),
loginid: json['loginid'],
preferredLanguage: json['preferred_language'],
scopes: json['scopes'] == null
Expand Down Expand Up @@ -618,7 +613,7 @@ class LocalCurrenciesPropertyEntity extends LocalCurrenciesPropertyModel {
/// Creates an instance from JSON.
factory LocalCurrenciesPropertyEntity.fromJson(Map<String, dynamic> json) =>
LocalCurrenciesPropertyEntity(
fractionalDigits: json['fractional_digits'],
fractionalDigits: json['fractional_digits'] as int,
);

/// Converts an instance to JSON.
Expand Down
Loading