diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 4eeb7658..44fcebe6 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -49,7 +49,6 @@ jobs: - name: context run: | echo ${{ secrets.KUBE_CONFIG }} | base64 --decode > ${HOME}/.kube/config - cat ${HOME}/.kube/config - name: Upgrade production on cluster run: | echo production-${{ github.sha }} diff --git a/HowToLocalDev.md b/HowToLocalDev.md index df300f39..a6bef30f 100644 --- a/HowToLocalDev.md +++ b/HowToLocalDev.md @@ -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: @@ -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/", }; ``` @@ -83,7 +83,7 @@ class AppConfigLocal extends AppConfigImpl { } String openKycApiUrl() { - return "https://openkyc.staging.jimber.org"; + return "https://openkyc.staging.threefold.me"; } String threeBotApiUrl() { @@ -99,7 +99,7 @@ class AppConfigLocal extends AppConfigImpl { } String wizardUrl() { - return 'https://wizard.staging.jimber.org/'; + return 'https://wizard.staging.threefold.me/'; } } ``` diff --git a/app/android/app/build_local b/app/android/app/build_local index 0032fae1..fa51847d 100644 --- a/app/android/app/build_local +++ b/app/android/app/build_local @@ -89,7 +89,6 @@ dependencies { implementation 'com.hbb20:ccp:2.4.0' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" - implementation "com.github.shuftipro:ShuftiPro_SDK:0.6.0" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" -} \ No newline at end of file +} diff --git a/app/android/app/build_production b/app/android/app/build_production index 2f2bb47b..fbcde236 100644 --- a/app/android/app/build_production +++ b/app/android/app/build_production @@ -88,7 +88,6 @@ dependencies { implementation 'com.hbb20:ccp:2.4.0' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" - implementation "com.github.shuftipro:ShuftiPro_SDK:0.6.0" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" } diff --git a/app/android/app/build_staging b/app/android/app/build_staging index 713f1f81..786d8861 100644 --- a/app/android/app/build_staging +++ b/app/android/app/build_staging @@ -88,7 +88,6 @@ dependencies { implementation 'com.hbb20:ccp:2.4.0' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" - implementation "com.github.shuftipro:ShuftiPro_SDK:0.6.0" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" -} \ No newline at end of file +} diff --git a/app/android/app/build_testing b/app/android/app/build_testing index 09a3f4b4..ff4c55c6 100644 --- a/app/android/app/build_testing +++ b/app/android/app/build_testing @@ -88,7 +88,6 @@ dependencies { implementation 'com.hbb20:ccp:2.4.0' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" - implementation "com.github.shuftipro:ShuftiPro_SDK:0.6.0" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" -} \ No newline at end of file +} diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj index 01aea843..1f141c85 100644 --- a/app/ios/Runner.xcodeproj/project.pbxproj +++ b/app/ios/Runner.xcodeproj/project.pbxproj @@ -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 = ( @@ -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"; @@ -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 = ( @@ -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"; @@ -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 = ( @@ -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"; diff --git a/app/lib/app_config.dart b/app/lib/app_config.dart index c80a099a..5acbc5cf 100644 --- a/app/lib/app_config.dart +++ b/app/lib/app_config.dart @@ -76,7 +76,7 @@ class AppConfigProduction extends AppConfigImpl { } String openKycApiUrl() { - return "https://openkyc.live"; + return "https://openkyc.threefold.me"; } String threeBotApiUrl() { @@ -92,16 +92,16 @@ 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 flagSmithConfig() { return { - 'url': 'https://flagsmith.jimber.io/api/v1/', + 'url': 'https://flagsmith.threefold.me/api/v1/', 'apiKey': 'BuzktmbcnMJ77vznU7WhJB' }; } @@ -109,36 +109,36 @@ class AppConfigProduction extends AppConfigImpl { 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 flagSmithConfig() { return { - 'url': 'https://flagsmith.jimber.io/api/v1/', + 'url': 'https://flagsmith.threefold.me/api/v1/', 'apiKey': 'n6YyxDdrePqwAF49KCYx7S' }; } @@ -146,36 +146,36 @@ class AppConfigStaging extends AppConfigImpl { 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 flagSmithConfig() { return { - 'url': 'https://flagsmith.jimber.io/api/v1/', + 'url': 'https://flagsmith.threefold.me/api/v1/', 'apiKey': 'VtTsMwJwiF69QWFWHGEMKM' }; } diff --git a/app/lib/app_config_local.template b/app/lib/app_config_local.template index 83fc4ab8..23242114 100644 --- a/app/lib/app_config_local.template +++ b/app/lib/app_config_local.template @@ -23,7 +23,7 @@ class AppConfigLocal extends AppConfigImpl { } String wizardUrl() { - return 'https://wizard.jimber.org/'; + return 'https://wizard.threefold.me/'; } String pKidUrl() { @@ -32,7 +32,7 @@ class AppConfigLocal extends AppConfigImpl { Map flagSmithConfig() { return { - 'url': 'https://flagsmith.jimber.io/api/v1/', + 'url': 'https://flagsmith.threefold.me/api/v1/', 'apiKey': 'm3L3gTcQYcFwCzSGxFJJWd' }; } diff --git a/app/lib/apps/news/news_config.dart b/app/lib/apps/news/news_config.dart index 22dd5c2a..a24d3b94 100644 --- a/app/lib/apps/news/news_config.dart +++ b/app/lib/apps/news/news_config.dart @@ -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() { @@ -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() { @@ -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() { diff --git a/app/lib/apps/news/news_widget.dart b/app/lib/apps/news/news_widget.dart index bbc01eea..14a18332 100644 --- a/app/lib/apps/news/news_widget.dart +++ b/app/lib/apps/news/news_widget.dart @@ -15,13 +15,12 @@ class NewsWidget extends StatefulWidget { _NewsState createState() => _NewsState(); } -class _NewsState extends State - with AutomaticKeepAliveClientMixin { +class _NewsState extends State with AutomaticKeepAliveClientMixin { late InAppWebViewController webView; late InAppWebView iaWebView; String url = ""; - String initialEndsWith= ""; + String initialEndsWith = ""; double progress = 0; var config = NewsConfig(); @@ -36,15 +35,17 @@ class _NewsState extends State } _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; @@ -79,14 +80,15 @@ class _NewsState extends State @override Widget build(BuildContext context) { super.build(context); - return LayoutDrawer(titleText: 'News', content: - Column( - children: [ - Expanded( - child: Container(child: iaWebView), - ), - ], - )); + return LayoutDrawer( + titleText: 'News', + content: Column( + children: [ + Expanded( + child: Container(child: iaWebView), + ), + ], + )); } @override diff --git a/app/lib/apps/wallet/wallet_config.dart b/app/lib/apps/wallet/wallet_config.dart index d0f78559..b95e4acd 100644 --- a/app/lib/apps/wallet/wallet_config.dart +++ b/app/lib/apps/wallet/wallet_config.dart @@ -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() { @@ -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() { @@ -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() { diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 0d16cdbf..d00c6cf1 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -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" diff --git a/backend/routes/misc.py b/backend/routes/misc.py index 6d15e1c7..63f21251 100644 --- a/backend/routes/misc.py +++ b/backend/routes/misc.py @@ -10,7 +10,7 @@ @api_misc.route("/minimumversion", methods=["get"]) def minimum_version_handler(): response = Response( - response=json.dumps({"android": 70, "ios": 70}), mimetype="application/json" + response=json.dumps({"android": 178, "ios": 178}), mimetype="application/json" ) return response diff --git a/frontend/public/config.prod.js b/frontend/public/config.prod.js index ae7cdaf0..14ddebeb 100644 --- a/frontend/public/config.prod.js +++ b/frontend/public/config.prod.js @@ -1,5 +1,5 @@ export default ({ apiurl: 'https://login.threefold.me/', - openkycurl: 'https://openkyc.live/', + openkycurl: 'https://openkyc.threefold.me/', deeplink: 'threebot://' }) diff --git a/frontend/public/config.testing.js b/frontend/public/config.testing.js index 71ff5f44..a79cdaa6 100644 --- a/frontend/public/config.testing.js +++ b/frontend/public/config.testing.js @@ -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://' }) diff --git a/helm_files/valuesProduction.yaml b/helm_files/valuesProduction.yaml index 2c9a337a..9e5a4c61 100755 --- a/helm_files/valuesProduction.yaml +++ b/helm_files/valuesProduction.yaml @@ -25,4 +25,7 @@ ingress: path: / service: wizard-prod port: 82 - + - name: wizard.threefold.me + path: / + service: wizard-prod + port: 82