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.

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

Change services urls #609

Merged
merged 7 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions HowToLocalDev.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
export default {
botFrontEnd: "http://192.168.1.2:8080",
botBackend: "http://192.168.1.2:5000",
kycBackend: "https://openkyc.staging.jimber.org",
kycBackend: "https://openkyc.staging.threefold.me",
redirect_url: `/callback`,
appId: window.location.host,
seedPhrase:
Expand All @@ -32,7 +32,7 @@ export default {
```javascript
export default {
apiurl: "http://192.168.1.2:5000/",
openkycurl: "https://openkyc.staging.jimber.org/",
openkycurl: "https://openkyc.staging.threefold.me/",
};
```

Expand Down Expand Up @@ -83,7 +83,7 @@ class AppConfigLocal extends AppConfigImpl {
}

String openKycApiUrl() {
return "https://openkyc.staging.jimber.org";
return "https://openkyc.staging.threefold.me";
}

String threeBotApiUrl() {
Expand All @@ -99,7 +99,7 @@ class AppConfigLocal extends AppConfigImpl {
}

String wizardUrl() {
return 'https://wizard.staging.jimber.org/';
return 'https://wizard.staging.threefold.me/';
}
}
```
Expand Down
12 changes: 6 additions & 6 deletions app/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 176;
CURRENT_PROJECT_VERSION = 178;
DEVELOPMENT_TEAM = 5KWG4UBB25;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -392,7 +392,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.9.0;
MARKETING_VERSION = 3.9.1;
PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down Expand Up @@ -520,7 +520,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 176;
CURRENT_PROJECT_VERSION = 178;
DEVELOPMENT_TEAM = 5KWG4UBB25;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -537,7 +537,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.9.0;
MARKETING_VERSION = 3.9.1;
PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand All @@ -555,7 +555,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 176;
CURRENT_PROJECT_VERSION = 178;
DEVELOPMENT_TEAM = 5KWG4UBB25;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -572,7 +572,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.9.0;
MARKETING_VERSION = 3.9.1;
PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down
40 changes: 20 additions & 20 deletions app/lib/app_config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class AppConfigProduction extends AppConfigImpl {
}

String openKycApiUrl() {
return "https://openkyc.live";
return "https://openkyc.threefold.me";
}

String threeBotApiUrl() {
Expand All @@ -92,90 +92,90 @@ class AppConfigProduction extends AppConfigImpl {
}

String wizardUrl() {
return 'https://wizard.jimber.org/';
return 'https://wizard.threefold.me/';
}

String pKidUrl() {
return 'https://pkid.jimber.org/v1';
return 'https://pkid.threefold.me/v1';
}

Map<String, String> flagSmithConfig() {
return {
'url': 'https://flagsmith.jimber.io/api/v1/',
'url': 'https://flagsmith.threefold.me/api/v1/',
'apiKey': 'BuzktmbcnMJ77vznU7WhJB'
};
}
}

class AppConfigStaging extends AppConfigImpl {
String baseUrl() {
return "login.staging.jimber.io";
return "login.staging.threefold.me";
}

String openKycApiUrl() {
return 'https://openkyc.staging.jimber.io';
return 'https://kyc.staging.threefold.me';
}

String threeBotApiUrl() {
return "https://login.staging.jimber.io/api";
return "https://login.staging.threefold.me/api";
}

String threeBotFrontEndUrl() {
return "https://login.staging.jimber.io/";
return "https://login.staging.threefold.me/";
}

String threeBotSocketUrl() {
return "wss://login.staging.jimber.io";
return "wss://login.staging.threefold.me";
}

String wizardUrl() {
return 'https://wizard.staging.jimber.io/';
return 'https://wizard.staging.threefold.me/';
}

String pKidUrl() {
return 'https://pkid.staging.jimber.io/v1';
return 'https://pkid.staging.threefold.me/v1';
}

Map<String, String> flagSmithConfig() {
return {
'url': 'https://flagsmith.jimber.io/api/v1/',
'url': 'https://flagsmith.threefold.me/api/v1/',
'apiKey': 'n6YyxDdrePqwAF49KCYx7S'
};
}
}

class AppConfigTesting extends AppConfigImpl {
String baseUrl() {
return "login.testing.jimber.org";
return "login.testing.threefold.me";
}

String openKycApiUrl() {
return "https://openkyc.testing.jimber.org";
return "https://openkyc.testing.threefold.me";
}

String threeBotApiUrl() {
return "https://login.testing.jimber.org/api";
return "https://login.testing.threefold.me/api";
}

String threeBotFrontEndUrl() {
return "https://login.testing.jimber.org/";
return "https://login.testing.threefold.me/";
}

String threeBotSocketUrl() {
return "wss://login.testing.jimber.org";
return "wss://login.testing.threefold.me";
}

String wizardUrl() {
return 'https://wizard.staging.jimber.org/';
return 'https://wizard.staging.threefold.me/';
}

String pKidUrl() {
return 'https://pkid.staging.jimber.io/v1';
return 'https://pkid.staging.threefold.me/v1';
}

Map<String, String> flagSmithConfig() {
return {
'url': 'https://flagsmith.jimber.io/api/v1/',
'url': 'https://flagsmith.threefold.me/api/v1/',
'apiKey': 'VtTsMwJwiF69QWFWHGEMKM'
};
}
Expand Down
4 changes: 2 additions & 2 deletions app/lib/app_config_local.template
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class AppConfigLocal extends AppConfigImpl {
}

String wizardUrl() {
return 'https://wizard.jimber.org/';
return 'https://wizard.threefold.me/';
}

String pKidUrl() {
Expand All @@ -32,7 +32,7 @@ class AppConfigLocal extends AppConfigImpl {

Map<String, String> flagSmithConfig() {
return {
'url': 'https://flagsmith.jimber.io/api/v1/',
'url': 'https://flagsmith.threefold.me/api/v1/',
'apiKey': 'm3L3gTcQYcFwCzSGxFJJWd'
};
}
Expand Down
6 changes: 3 additions & 3 deletions app/lib/apps/news/news_config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ abstract class NewsConfigImpls {

class NewsConfigStaging extends NewsConfigImpls {
String appId() {
return 'news.threefoldconnect.jimber.org';
return 'news.staging.threefold.me';
}

String redirectUrl() {
Expand All @@ -43,7 +43,7 @@ class NewsConfigStaging extends NewsConfigImpls {

class NewsConfigProduction extends NewsConfigImpls {
String appId() {
return 'news.threefoldconnect.jimber.org';
return 'news.threefold.me';
}

String redirectUrl() {
Expand All @@ -53,7 +53,7 @@ class NewsConfigProduction extends NewsConfigImpls {

class NewsConfigTesting extends NewsConfigImpls {
String appId() {
return 'news.testing.jimber.org';
return 'news.testing.threefold.me';
}

String redirectUrl() {
Expand Down
34 changes: 18 additions & 16 deletions app/lib/apps/news/news_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@ class NewsWidget extends StatefulWidget {
_NewsState createState() => _NewsState();
}

class _NewsState extends State<NewsWidget>
with AutomaticKeepAliveClientMixin {
class _NewsState extends State<NewsWidget> with AutomaticKeepAliveClientMixin {
late InAppWebViewController webView;
late InAppWebView iaWebView;

String url = "";
String initialEndsWith= "";
String initialEndsWith = "";
double progress = 0;
var config = NewsConfig();

Expand All @@ -36,15 +35,17 @@ class _NewsState extends State<NewsWidget>
}

_NewsState() {
this.initialEndsWith = new DateTime.now().millisecondsSinceEpoch.toString();
this.initialEndsWith = new DateTime.now().millisecondsSinceEpoch.toString();
iaWebView = InAppWebView(
initialUrlRequest: URLRequest(url:Uri.parse('https://news.threefoldconnect.jimber.org?cache_buster=' + initialEndsWith
)),

initialUrlRequest: URLRequest(
url: Uri.parse(
'https://news.threefold.me?cache_buster=' + initialEndsWith)),
initialOptions: InAppWebViewGroupOptions(
crossPlatform: InAppWebViewOptions(),
android: AndroidInAppWebViewOptions(
supportMultipleWindows: true, thirdPartyCookiesEnabled: true, useHybridComposition: true),
supportMultipleWindows: true,
thirdPartyCookiesEnabled: true,
useHybridComposition: true),
ios: IOSInAppWebViewOptions()),
onWebViewCreated: (InAppWebViewController controller) {
webView = controller;
Expand Down Expand Up @@ -79,14 +80,15 @@ class _NewsState extends State<NewsWidget>
@override
Widget build(BuildContext context) {
super.build(context);
return LayoutDrawer(titleText: 'News', content:
Column(
children: <Widget>[
Expanded(
child: Container(child: iaWebView),
),
],
));
return LayoutDrawer(
titleText: 'News',
content: Column(
children: <Widget>[
Expanded(
child: Container(child: iaWebView),
),
],
));
}

@override
Expand Down
6 changes: 3 additions & 3 deletions app/lib/apps/wallet/wallet_config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ abstract class WalletConfigImpls {

class WalletConfigStaging extends WalletConfigImpls {
String appId() {
return 'wallet.staging.jimber.io';
return 'wallet.staging.threefold.me';
}

String redirectUrl() {
Expand All @@ -53,7 +53,7 @@ class WalletConfigProduction extends WalletConfigImpls {

class WalletConfigTesting extends WalletConfigImpls {
String appId() {
return 'wallet.testing.jimber.org';
return 'wallet.testing.threefold.me';
}

String redirectUrl() {
Expand All @@ -64,7 +64,7 @@ class WalletConfigTesting extends WalletConfigImpls {
class WalletConfigLocal extends WalletConfigImpls {
String appId() {
return 'localhost:8080';
// return 'wallet.staging.jimber.org';
// return 'wallet.staging.threefold.me';
}

String redirectUrl() {
Expand Down
2 changes: 1 addition & 1 deletion app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: A decentralized login application

publish_to: "none"

version: 3.9.0+176
version: 3.9.1+178

environment:
sdk: ">=2.12.0<3.0.0"
Expand Down
4 changes: 2 additions & 2 deletions frontend/public/config.testing.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default ({
apiurl: 'https://login.testing.jimber.org/',
openkycurl: 'https://openkyc.testing.jimber.org/',
apiurl: 'https://login.testing.threefold.me/',
openkycurl: 'https://openkyc.testing.threefold.me/',
deeplink: 'threebot-testing://'
})