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

Use 'flowcrypt.com/shared-tenant-fes' instead of 'flowcrypt.com/api' #2171

Merged
merged 62 commits into from
Mar 13, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
e344961
Migrated to use 'flowcrypt.com/shared-tenant-fes' instead of 'flowcry…
DenBond7 Jan 23, 2023
69b7122
Reverted back some changes. Removed unused code.| #2162
DenBond7 Jan 23, 2023
bf4b835
Reverted back some changes.| #2162
DenBond7 Jan 23, 2023
53fe0df
Reverted back some changes.| #2162
DenBond7 Jan 23, 2023
d79a5cb
Refactored code.| #2162
DenBond7 Jan 23, 2023
9e37f91
Refactored code.| #2162
DenBond7 Jan 23, 2023
f821300
Revert "Refactored code.| #2162"
DenBond7 Jan 24, 2023
f16cbfa
wip
DenBond7 Jan 24, 2023
a085632
wip
DenBond7 Jan 24, 2023
e872963
wip
DenBond7 Jan 24, 2023
436bc95
Refactored code.| #2162
DenBond7 Jan 25, 2023
c914c1f
Renamed ApiService to RetrofitApiServiceInterface. Refactored code.| …
DenBond7 Jan 25, 2023
da14c05
Renamed FlowcryptApiRepository to ApiClientRepository. Refactored cod…
DenBond7 Jan 25, 2023
0b607fc
Dropped ApiRepository. Refactored code.| #2162
DenBond7 Jan 25, 2023
1b9f45a
Refactored code.| #2162
DenBond7 Jan 26, 2023
97cdf1b
Refactored code.| #2162
DenBond7 Jan 26, 2023
148ba58
Updated the database version to 35. Modified 'accounts' table(renamed…
DenBond7 Jan 26, 2023
23b449e
Refactored code.| #2162
DenBond7 Jan 26, 2023
541f541
Refactored code.| #2162
DenBond7 Jan 26, 2023
9229045
Refactored code.| #2162
DenBond7 Jan 26, 2023
143372b
Refactored code.| #2162
DenBond7 Jan 26, 2023
5970c1e
Fixed RetrofitApiServiceInterface.fesGetClientConfiguration().| #2162
DenBond7 Jan 26, 2023
3661a53
Modified build.gradle. Added 'common' productFlavors.| #2162
DenBond7 Jan 26, 2023
0b53089
Added using BuildConfig.BACKEND_URL.| #2162
DenBond7 Jan 26, 2023
34e7af8
Modified GeneralUtil.| #2162
DenBond7 Jan 27, 2023
a01ab7a
Reverted back some changes in ComposeMsgViewModel.| #2162
DenBond7 Jan 27, 2023
e5520f3
Refactored code.| #2162
DenBond7 Jan 27, 2023
0459ddd
Reverted back wrong changes.| #2162
DenBond7 Jan 27, 2023
243b13d
Fixed some tests.| #2162
DenBond7 Jan 27, 2023
d88340b
Temporary disbled some test. Refactored code.| #2162
DenBond7 Jan 27, 2023
7b342fb
Changed devTest urls. Fixed some tests.| #2162
DenBond7 Jan 27, 2023
9ec5080
Refactored code.| #2162
DenBond7 Jan 27, 2023
f0c0eca
Made changes for retrofit implementation of some API.| #2162
DenBond7 Jan 27, 2023
fba0a1c
Fixed some more tests.| #2162
DenBond7 Jan 27, 2023
588c191
Fixed some more tests.| #2162
DenBond7 Jan 27, 2023
9bbaef5
Refactored code.| #2162
DenBond7 Jan 28, 2023
0d10e2a
Refactored code.| #2162
DenBond7 Jan 28, 2023
375b93b
Merge branch 'master' into issue_2162_shared-tenant-fes
DenBond7 Feb 27, 2023
2769842
Refactored code.| #2162
DenBond7 Feb 27, 2023
50da8ac
Fixed merge issue.| #2162
DenBond7 Feb 27, 2023
adfcd8e
Fixed MainSignInFragmentEnterpriseFlowTest.| #2162
DenBond7 Feb 28, 2023
ebb81ca
Merge branch 'master' into issue_2162_shared-tenant-fes
tomholub Mar 1, 2023
0fd42bf
Fixed continueBasedOnFlavorSettings().| #2162
DenBond7 Mar 2, 2023
12aecdc
Updated tests.| #2162
DenBond7 Mar 6, 2023
d3c4d75
Changed build.gradle to use three build type: release, debug, uiTests…
DenBond7 Mar 7, 2023
57c53fb
Fixed compilation issue.| #2162
DenBond7 Mar 7, 2023
9a8527b
Fixed compilation issue.Step 2.| #2162
DenBond7 Mar 8, 2023
07084e3
Updated FesDuringSetupEnterpriseFlowTest.| #2162
DenBond7 Mar 8, 2023
0786af1
Refactored code.| #2162
DenBond7 Mar 8, 2023
b47043d
Handled a situation of sign-in users(gmail.com) in the enterprise bui…
DenBond7 Mar 8, 2023
e235216
Added EnterpriseTestsFilter.| #2162
DenBond7 Mar 8, 2023
911eaf5
Update Semaphore settings to run enterprise tests.| #2162
DenBond7 Mar 8, 2023
15854a5
Update Semaphore settings to run enterprise tests. Step 2.| #2162
DenBond7 Mar 8, 2023
5e468a3
Update Semaphore settings to run enterprise tests. Step 3.| #2162
DenBond7 Mar 8, 2023
3154f56
Update Semaphore settings to run enterprise tests. Step 4.| #2162
DenBond7 Mar 9, 2023
f921e8b
Update Semaphore settings to run enterprise tests. Step 5.| #2162
DenBond7 Mar 9, 2023
505b9b9
Marked some tests as FlakyTest.| #2162
DenBond7 Mar 9, 2023
91e91b9
Marked some tests as FlakyTest. Step 2.| #2162
DenBond7 Mar 9, 2023
358e803
Merge branch 'master' into issue_2162_shared-tenant-fes
DenBond7 Mar 9, 2023
c3adb20
Marked some tests as FlakyTest. Step 3.| #2162
DenBond7 Mar 9, 2023
6a3284c
Reverted back some changes.| #2162
DenBond7 Mar 10, 2023
0e84d93
Merge branch 'master' into issue_2162_shared-tenant-fes
DenBond7 Mar 10, 2023
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 FlowCrypt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ android {
buildConfigField 'boolean', 'IS_HTTP_LOG_ENABLED', 'false'
buildConfigField 'String', 'HTTP_LOG_LEVEL', "\"NONE\""
buildConfigField 'String', 'ATTESTER_URL', "\"https://flowcrypt.com/attester/\""
buildConfigField 'String', 'API_URL', "\"https://flowcrypt.com/api/\""
buildConfigField 'String', 'API_URL', "\"https://flowcrypt.com/shared-tenant-fes/\""
DenBond7 marked this conversation as resolved.
Show resolved Hide resolved
resValue 'string', 'gradle_is_acra_enabled', 'true'
resValue 'string', 'gradle_is_mail_debug_enabled', 'false'
resValue 'string', 'gradle_is_http_log_enabled', 'false'
Expand Down Expand Up @@ -138,7 +138,7 @@ android {
buildConfigField 'boolean', 'IS_HTTP_LOG_ENABLED', 'true'
buildConfigField 'String', 'HTTP_LOG_LEVEL', "\"BODY\""
buildConfigField 'String', 'ATTESTER_URL', "\"https://flowcrypt.com/attester/\""
buildConfigField 'String', 'API_URL', "\"https://flowcrypt.com/api/\""
buildConfigField 'String', 'API_URL', "\"https://flowcrypt.com/shared-tenant-fes/\""
resValue 'string', 'gradle_is_acra_enabled', 'false'
resValue 'string', 'gradle_is_mail_debug_enabled', 'true'
resValue 'string', 'gradle_is_http_log_enabled', 'true'
Expand All @@ -153,7 +153,7 @@ android {
buildConfigField 'boolean', 'IS_HTTP_LOG_ENABLED', 'true'
buildConfigField 'String', 'HTTP_LOG_LEVEL', "\"BASIC\""
buildConfigField 'String', 'ATTESTER_URL', "\"https://flowcrypt.com/attester/\""
buildConfigField 'String', 'API_URL', "\"https://flowcrypt.com/api/\""
buildConfigField 'String', 'API_URL', "\"https://flowcrypt.com/shared-tenant-fes/\""
resValue 'string', 'gradle_is_acra_enabled', 'true'
resValue 'string', 'gradle_is_mail_debug_enabled', 'false'
resValue 'string', 'gradle_is_http_log_enabled', 'false'
Expand Down Expand Up @@ -186,7 +186,7 @@ android {
buildConfigField 'boolean', 'IS_HTTP_LOG_ENABLED', 'true'
buildConfigField 'String', 'HTTP_LOG_LEVEL', "\"BASIC\""
buildConfigField 'String', 'ATTESTER_URL', "\"https://flowcrypt.com/attester/\""
buildConfigField 'String', 'API_URL', "\"https://flowcrypt.com/api/\""
buildConfigField 'String', 'API_URL', "\"https://flowcrypt.com/shared-tenant-fes/\""
resValue 'string', 'gradle_is_acra_enabled', 'true'
resValue 'string', 'gradle_is_mail_debug_enabled', 'false'
resValue 'string', 'gradle_is_http_log_enabled', 'false'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class FlowCryptApplication : Application(), Configuration.Provider {
)

httpSender {
uri = "https://flowcrypt.com/api/help/acra"
uri = "https://flowcrypt.com/shared-tenant-fes/help/acra"
DenBond7 marked this conversation as resolved.
Show resolved Hide resolved
httpMethod = HttpSender.Method.POST
}
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ interface ApiService {
): Response<WelcomeMessageResponse>

/**
* This method create a [Call] object for the API "https://flowcrypt.com/api/help/feedback"
* This method create a [Call] object for the API "https://flowcrypt.com/shared-tenant-fes/help/feedback"
DenBond7 marked this conversation as resolved.
Show resolved Hide resolved
*
* @param body POJO model for requests
* @return [<]
Expand Down Expand Up @@ -113,7 +113,7 @@ interface ApiService {
suspend fun checkPolicyForWkdDirect(@Path("directHost") directHost: String): Response<ResponseBody>

/**
* This method calls "https://flowcrypt.com/api/account/get"
* This method calls "https://flowcrypt.com/shared-tenant-fes/account/get"
*/
@POST(BuildConfig.API_URL + "account/get")
suspend fun getClientConfigurationFromFlowCryptComBackend(
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@

package com.flowcrypt.email.api.retrofit.request.model

import com.flowcrypt.email.api.retrofit.request.api.PostHelpFeedbackRequest
import com.google.gson.annotations.Expose
import com.google.gson.annotations.SerializedName

/**
* The model of [PostHelpFeedbackRequest].
*
* @author DenBond7
* Date: 30.05.2017
* Time: 12:42
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize

/**
* This class describes a response from the https://flowcrypt.com/api/link/message API.
* This class describes a response from the https://flowcrypt.com/shared-tenant-fes/link/message API.
*
*
* `POST /initial/confirm
DenBond7 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize

/**
* This class describes a response from the https://flowcrypt.com/api/message/reply API.
* This class describes a response from the https://flowcrypt.com/shared-tenant-fes/message/reply API.
*
*
* `POST /message/reply
DenBond7 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down