Skip to content

Commit 7fb8705

Browse files
capcom6capcom6
committed
[gateway] add registration by code
1 parent 933a7b3 commit 7fb8705

File tree

11 files changed

+313
-22
lines changed

11 files changed

+313
-22
lines changed

‎app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayApi.kt

+24-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,17 @@ class GatewayApi(
6363
}.body()
6464
}
6565

66+
suspend fun deviceRegister(
67+
request: DeviceRegisterRequest,
68+
code: String
69+
): DeviceRegisterResponse {
70+
return client.post("$baseUrl/device") {
71+
header("Authorization", "Code $code")
72+
contentType(ContentType.Application.Json)
73+
setBody(request)
74+
}.body()
75+
}
76+
6677
suspend fun devicePatch(token: String, request: DevicePatchRequest) {
6778
client.patch("$baseUrl/device") {
6879
bearerAuth(token)
@@ -91,7 +102,13 @@ class GatewayApi(
91102
}.body()
92103
}
93104

94-
suspend fun changePassword(token: String, request: PasswordChangeRequest) {
105+
suspend fun getUserCode(credentials: Pair<String, String>): GetUserCodeResponse {
106+
return client.get("$baseUrl/user/code") {
107+
basicAuth(credentials.first, credentials.second)
108+
}.body()
109+
}
110+
111+
suspend fun changeUserPassword(token: String, request: PasswordChangeRequest) {
95112
client.patch("$baseUrl/user/password") {
96113
bearerAuth(token)
97114
contentType(ContentType.Application.Json)
@@ -140,6 +157,12 @@ class GatewayApi(
140157
val newPassword: String
141158
)
142159

160+
data class GetUserCodeResponse(
161+
val code: String,
162+
val validUntil: Date
163+
)
164+
165+
////////////////////////////////////////////////////////////////////////////////////////////////
143166
data class Message(
144167
val id: String,
145168
val message: String,

‎app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayService.kt

+29-8
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,20 @@ class GatewayService(
5959
this._api = null
6060
}
6161

62+
suspend fun getLoginCode(): GatewayApi.GetUserCodeResponse {
63+
val username = settings.username
64+
?: throw IllegalStateException("Username is not set")
65+
val password = settings.password
66+
?: throw IllegalStateException("Password is not set")
67+
68+
return api.getUserCode(username to password)
69+
}
70+
6271
suspend fun changePassword(current: String, new: String) {
6372
val info = settings.registrationInfo
6473
?: throw IllegalStateException("The device is not registered on the server")
6574

66-
this.api.changePassword(
75+
this.api.changeUserPassword(
6776
info.token,
6877
GatewayApi.PasswordChangeRequest(current, new)
6978
)
@@ -138,7 +147,7 @@ class GatewayService(
138147

139148
internal suspend fun registerDevice(
140149
pushToken: String?,
141-
credentials: Pair<String, String>? = null,
150+
registerMode: RegistrationMode
142151
) {
143152
if (!settings.enabled) return
144153

@@ -161,13 +170,19 @@ class GatewayService(
161170
}
162171

163172
try {
164-
val response = api.deviceRegister(
165-
GatewayApi.DeviceRegisterRequest(
166-
"${Build.MANUFACTURER}/${Build.PRODUCT}",
167-
pushToken
168-
),
169-
credentials
173+
val deviceName = "${Build.MANUFACTURER}/${Build.PRODUCT}"
174+
val request = GatewayApi.DeviceRegisterRequest(
175+
deviceName,
176+
pushToken
170177
)
178+
val response = when (registerMode) {
179+
RegistrationMode.Anonymous -> api.deviceRegister(request, null)
180+
is RegistrationMode.WithCode -> api.deviceRegister(request, registerMode.code)
181+
is RegistrationMode.WithCredentials -> api.deviceRegister(
182+
request,
183+
registerMode.login to registerMode.password
184+
)
185+
}
171186
this.settings.registrationInfo = response
172187

173188
events.emit(
@@ -226,4 +241,10 @@ class GatewayService(
226241
)
227242
messagesService.enqueueMessage(request)
228243
}
244+
245+
sealed class RegistrationMode {
246+
object Anonymous : RegistrationMode()
247+
class WithCredentials(val login: String, val password: String) : RegistrationMode()
248+
class WithCode(val code: String) : RegistrationMode()
249+
}
229250
}

‎app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/RegistrationWorker.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import androidx.work.WorkRequest
1212
import androidx.work.WorkerParameters
1313
import androidx.work.workDataOf
1414
import me.capcom.smsgateway.App
15+
import me.capcom.smsgateway.modules.gateway.GatewayService
1516
import me.capcom.smsgateway.modules.logs.LogsService
1617
import me.capcom.smsgateway.modules.logs.db.LogEntry
1718
import org.koin.core.component.KoinComponent
@@ -31,7 +32,10 @@ class RegistrationWorker(
3132

3233
when (isUpdate) {
3334
true -> App.instance.gatewayService.updateDevice(token ?: return Result.success())
34-
false -> App.instance.gatewayService.registerDevice(token)
35+
false -> App.instance.gatewayService.registerDevice(
36+
token,
37+
GatewayService.RegistrationMode.Anonymous
38+
)
3539
}
3640

3741
return Result.success()

‎app/src/main/java/me/capcom/smsgateway/ui/HomeFragment.kt

+21-2
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,16 @@ class HomeFragment : Fragment() {
7676
return@setFragmentResultListener
7777
}
7878

79+
FirstStartDialogFragment.Result.SignUp -> requestPermissionsAndStart()
80+
7981
FirstStartDialogFragment.Result.SignIn -> {
8082
val username = FirstStartDialogFragment.getUsername(data)
8183
val password = FirstStartDialogFragment.getPassword(data)
8284
lifecycleScope.launch {
8385
try {
8486
gatewaySvc.registerDevice(
8587
null,
86-
username to password
88+
GatewayService.RegistrationMode.WithCredentials(username, password)
8789
)
8890
requestPermissionsAndStart()
8991
} catch (th: Throwable) {
@@ -96,7 +98,24 @@ class HomeFragment : Fragment() {
9698
}
9799
}
98100

99-
FirstStartDialogFragment.Result.SignUp -> requestPermissionsAndStart()
101+
FirstStartDialogFragment.Result.SignInByCode -> {
102+
val code = FirstStartDialogFragment.getCode(data)
103+
lifecycleScope.launch {
104+
try {
105+
gatewaySvc.registerDevice(
106+
null,
107+
GatewayService.RegistrationMode.WithCode(code)
108+
)
109+
requestPermissionsAndStart()
110+
} catch (th: Throwable) {
111+
Toast.makeText(
112+
requireContext(),
113+
"Failed to register device: ${th.message}",
114+
Toast.LENGTH_LONG
115+
).show()
116+
}
117+
}
118+
}
100119
}
101120
}
102121
}

‎app/src/main/java/me/capcom/smsgateway/ui/dialogs/FirstStartDialogFragment.kt

+38-4
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,21 @@ class FirstStartDialogFragment : DialogFragment() {
2525
override fun onTabSelected(tab: TabLayout.Tab) {
2626
when (tab.position) {
2727
POSITION_SIGNUP -> {
28-
binding.layoutSignIn.isVisible = false
2928
binding.layoutSignUp.isVisible = true
29+
binding.layoutSignIn.isVisible = false
30+
binding.layoutSignInByCode.isVisible = false
3031
}
3132

3233
POSITION_SIGNIN -> {
34+
binding.layoutSignUp.isVisible = false
3335
binding.layoutSignIn.isVisible = true
36+
binding.layoutSignInByCode.isVisible = false
37+
}
38+
39+
POSITION_SIGNIN_BY_CODE -> {
3440
binding.layoutSignUp.isVisible = false
41+
binding.layoutSignIn.isVisible = false
42+
binding.layoutSignInByCode.isVisible = true
3543
}
3644
}
3745
}
@@ -47,6 +55,7 @@ class FirstStartDialogFragment : DialogFragment() {
4755
when (binding.tabLayout.selectedTabPosition) {
4856
POSITION_SIGNUP -> actionSignUp()
4957
POSITION_SIGNIN -> actionSignIn()
58+
POSITION_SIGNIN_BY_CODE -> actionSignInByCode()
5059
}
5160
}
5261

@@ -67,6 +76,16 @@ class FirstStartDialogFragment : DialogFragment() {
6776
super.onDestroyView()
6877
}
6978

79+
private fun actionSignUp() {
80+
setFragmentResult(
81+
REQUEST_KEY,
82+
Bundle().apply {
83+
putString(KEY_RESULT_CODE, Result.SignUp.name)
84+
}
85+
)
86+
dismiss()
87+
}
88+
7089
private fun actionSignIn() {
7190
val username = binding.editUsername.text.toString()
7291
val password = binding.editPassword.text.toString()
@@ -95,11 +114,21 @@ class FirstStartDialogFragment : DialogFragment() {
95114
dismiss()
96115
}
97116

98-
private fun actionSignUp() {
117+
private fun actionSignInByCode() {
118+
val code = binding.editCode.text.toString()
119+
120+
binding.editCodeLayout.error = null
121+
122+
if (code.isEmpty()) {
123+
binding.editCodeLayout.error = "Required"
124+
return
125+
}
126+
99127
setFragmentResult(
100128
REQUEST_KEY,
101129
Bundle().apply {
102-
putString(KEY_RESULT_CODE, Result.SignUp.name)
130+
putString(KEY_RESULT_CODE, Result.SignInByCode.name)
131+
putString(KEY_CODE, code)
103132
}
104133
)
105134
dismiss()
@@ -117,19 +146,22 @@ class FirstStartDialogFragment : DialogFragment() {
117146

118147
enum class Result {
119148
Canceled,
120-
SignIn,
121149
SignUp,
150+
SignIn,
151+
SignInByCode,
122152
}
123153

124154
companion object {
125155
const val REQUEST_KEY = "FirstStartDialogFragment"
126156

127157
private const val POSITION_SIGNUP = 0
128158
private const val POSITION_SIGNIN = 1
159+
private const val POSITION_SIGNIN_BY_CODE = 2
129160

130161
private const val KEY_RESULT_CODE = "result_code"
131162
private const val KEY_USERNAME = "username"
132163
private const val KEY_PASSWORD = "password"
164+
private const val KEY_CODE = "code"
133165

134166
fun newInstance(): FirstStartDialogFragment = FirstStartDialogFragment()
135167

@@ -138,5 +170,7 @@ class FirstStartDialogFragment : DialogFragment() {
138170

139171
fun getUsername(data: Bundle): String = requireNotNull(data.getString(KEY_USERNAME))
140172
fun getPassword(data: Bundle): String = requireNotNull(data.getString(KEY_PASSWORD))
173+
174+
fun getCode(data: Bundle): String = requireNotNull(data.getString(KEY_CODE))
141175
}
142176
}

‎app/src/main/java/me/capcom/smsgateway/ui/settings/CloudServerSettingsFragment.kt

+29
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import me.capcom.smsgateway.modules.gateway.GatewayService
1515
import me.capcom.smsgateway.modules.gateway.GatewaySettings
1616
import org.koin.android.ext.android.inject
1717
import java.net.URL
18+
import java.text.DateFormat
1819

1920
class CloudServerSettingsFragment : BasePreferenceFragment() {
2021

@@ -90,6 +91,34 @@ class CloudServerSettingsFragment : BasePreferenceFragment() {
9091
true
9192
}
9293
}
94+
95+
findPreference<Preference>("gateway.login_code")?.apply {
96+
isVisible = settings.username != null && settings.password != null
97+
98+
onPreferenceClickListener = Preference.OnPreferenceClickListener {
99+
this@CloudServerSettingsFragment.lifecycleScope.launch {
100+
try {
101+
requireActivity().findViewById<View>(R.id.progressBar).isVisible = true
102+
103+
val loginCode = service.getLoginCode()
104+
title = getString(
105+
R.string.login_code_expires,
106+
DateFormat.getDateTimeInstance().format(loginCode.validUntil)
107+
)
108+
summary = loginCode.code
109+
110+
listView.adapter?.notifyDataSetChanged()
111+
showToast(getString(R.string.success_long_press_to_copy))
112+
} catch (e: Exception) {
113+
showToast(getString(R.string.failed_to_get_login_code, e.message))
114+
} finally {
115+
requireActivity().findViewById<View>(R.id.progressBar).isVisible = false
116+
}
117+
}
118+
119+
true
120+
}
121+
}
93122
}
94123

95124
override fun onDisplayPreferenceDialog(preference: Preference) {

‎app/src/main/res/drawable-notnight/ic_code.xml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:tint="@color/black"
5+
android:viewportWidth="24"
6+
android:viewportHeight="24">
7+
8+
<path
9+
android:fillColor="@android:color/white"
10+
android:pathData="M3,11h8V3H3V11zM5,5h4v4H5V5z" />
11+
12+
<path
13+
android:fillColor="@android:color/white"
14+
android:pathData="M3,21h8v-8H3V21zM5,15h4v4H5V15z" />
15+
16+
<path
17+
android:fillColor="@android:color/white"
18+
android:pathData="M13,3v8h8V3H13zM19,9h-4V5h4V9z" />
19+
20+
<path
21+
android:fillColor="@android:color/white"
22+
android:pathData="M19,19h2v2h-2z" />
23+
24+
<path
25+
android:fillColor="@android:color/white"
26+
android:pathData="M13,13h2v2h-2z" />
27+
28+
<path
29+
android:fillColor="@android:color/white"
30+
android:pathData="M15,15h2v2h-2z" />
31+
32+
<path
33+
android:fillColor="@android:color/white"
34+
android:pathData="M13,17h2v2h-2z" />
35+
36+
<path
37+
android:fillColor="@android:color/white"
38+
android:pathData="M15,19h2v2h-2z" />
39+
40+
<path
41+
android:fillColor="@android:color/white"
42+
android:pathData="M17,17h2v2h-2z" />
43+
44+
<path
45+
android:fillColor="@android:color/white"
46+
android:pathData="M17,13h2v2h-2z" />
47+
48+
<path
49+
android:fillColor="@android:color/white"
50+
android:pathData="M19,15h2v2h-2z" />
51+
52+
</vector>

0 commit comments

Comments
 (0)