Send and receive SMS messages using your Android phone programmatically via a simple HTTP API
Use axiom for logs and fix bug with phone API key
Acho Arnolda9dc66bc6dd9
diff --git a/android/app/src/main/java/com/httpsms/HttpSmsApiService.kt b/android/app/src/main/java/com/httpsms/HttpSmsApiService.ktindex 5f72dfad..3389b186 100644--- a/android/app/src/main/java/com/httpsms/HttpSmsApiService.kt+++ b/android/app/src/main/java/com/httpsms/HttpSmsApiService.kt@@ -220,10 +220,9 @@ class HttpSmsApiService(private val apiKey: String, private val baseURL: URI) {return Triple(null,"Cannot validate the API key. Check if it is correct and try again.", null)}- response.close()Timber.i("FCM token submitted correctly with API key [$apiKey] and server url [$baseURL]" )-val payload = ResponsePhone.fromJson(response.body!!.string())?.data+ response.close()return Triple(payload, null, null)} catch (ex: Exception) {return Triple(null, null, ex.message)diff --git a/android/app/src/main/java/com/httpsms/LoginActivity.kt b/android/app/src/main/java/com/httpsms/LoginActivity.ktindex e666bd96..9f4b1a9b 100644--- a/android/app/src/main/java/com/httpsms/LoginActivity.kt+++ b/android/app/src/main/java/com/httpsms/LoginActivity.kt@@ -302,12 +302,18 @@ class LoginActivity : AppCompatActivity() {var e164PhoneNumber = formatE164(phoneNumber.text.toString().trim())var response = service.updateFcmToken(e164PhoneNumber, Constants.SIM1, Settings.getFcmToken(this) ?: "")- if(response.second != null || response.third != null || !SmsManagerService.isDualSIM(this)) {- Timber.e("error updating fcm token [${response.second}]")+ if(response.second != null || response.third != null) {+ Timber.e("error updating fcm token [${response.second}], third [${response.third}]")liveData.postValue(Pair(response.second, response.third))return@Thread}+ if (!SmsManagerService.isDualSIM(this)) {+ Timber.d("single sim detected, no need to update sim2")+ liveData.postValue(Pair(null, null))+ return@Thread+ }+e164PhoneNumber = formatE164(phoneNumberSIM2.text.toString().trim())response = service.updateFcmToken(e164PhoneNumber, Constants.SIM2, Settings.getFcmToken(this) ?: "")diff --git a/android/app/src/main/java/com/httpsms/LogzTree.kt b/android/app/src/main/java/com/httpsms/LogzTree.ktindex c9cd69cb..68a81c8e 100644--- a/android/app/src/main/java/com/httpsms/LogzTree.kt+++ b/android/app/src/main/java/com/httpsms/LogzTree.kt@@ -35,11 +35,12 @@ class LogzTree(val context: Context): Timber.DebugTree() {t)- val body = Klaxon().toJsonString(logEntry).toRequestBody("application/x-www-form-urlencoded".toMediaType())+ val body = Klaxon().toJsonString(listOf(logEntry)).toRequestBody("application/json".toMediaType())val request: Request = Request.Builder()- .url("https://listener.logz.io:8071?token=xPDQiZOOfemERsCaVsJXtMbhKfWdVyNk&type=http-bulk")+ .url("https://api.axiom.co/v1/datasets/production/ingest").post(body)- .header("Content-Type", "application/x-www-form-urlencoded")+ .header("Content-Type", "application/json")+ .header("Authorization", "Bearer xaat-2a2e0b73-3702-4971-a80f-be3956934950").build()Thread {diff --git a/android/app/src/main/java/com/httpsms/MainActivity.kt b/android/app/src/main/java/com/httpsms/MainActivity.ktindex d691ae6f..5f76ada8 100644--- a/android/app/src/main/java/com/httpsms/MainActivity.kt+++ b/android/app/src/main/java/com/httpsms/MainActivity.kt@@ -335,7 +335,6 @@ class MainActivity : AppCompatActivity() {if (Settings.getActiveStatus(applicationContext, Constants.SIM2)) {phoneNumbers.add(Settings.getSIM2PhoneNumber(applicationContext))}- Timber.w("numbers = [${phoneNumbers.joinToString()}]")val isStored = HttpSmsApiService.create(context).storeHeartbeat(phoneNumbers.toTypedArray(), charging)if (!isStored) {error = "Could not send heartbeat make sure the phone is connected to the internet"diff --git a/api/pkg/di/container.go b/api/pkg/di/container.goindex cd21e074..bd8d089e 100644--- a/api/pkg/di/container.go+++ b/api/pkg/di/container.go@@ -699,7 +699,6 @@ func (container *Container) PhoneAPIKeyRepository() (repository repositories.Phocontainer.Logger(),container.Tracer(),container.DB(),- container.UserRistrettoCache(),)}diff --git a/api/pkg/repositories/gorm_phone_api_key_repository.go b/api/pkg/repositories/gorm_phone_api_key_repository.goindex 86e4786b..692616eb 100644--- a/api/pkg/repositories/gorm_phone_api_key_repository.go+++ b/api/pkg/repositories/gorm_phone_api_key_repository.go@@ -44,13 +44,13 @@ func (repository *gormPhoneAPIKeyRepository) RemovePhoneByID(ctx context.Contextdefer span.End()query := `-UPDATE ?+UPDATE phone_api_keysSET phone_ids = array_remove(phone_ids, ?),phone_numbers = array_remove(phone_numbers, ?)WHERE user_id = ? AND array_position(phone_ids, ?) IS NOT NULL;`err := repository.db.WithContext(ctx).- Raw(query, (entities.PhoneAPIKey{}).TableName(), phoneID, phoneNumber, userID, phoneID).+ Exec(query, phoneID, phoneNumber, userID, phoneID).Errorif err != nil {msg := fmt.Sprintf("cannot remove phone with ID [%s] and number [%s] for user with ID [%s] ", phoneID, phoneNumber, userID)@@ -103,7 +103,7 @@ func (repository *gormPhoneAPIKeyRepository) LoadAuthContext(ctx context.Context}phoneAPIKey := new(entities.PhoneAPIKey)- err := repository.db.WithContext(ctx).Where("api_key = ?", phoneAPIKey).First(apiKey).Error+ err := repository.db.WithContext(ctx).Where("api_key = ?", apiKey).First(phoneAPIKey).Errorif errors.Is(err, gorm.ErrRecordNotFound) {msg := fmt.Sprintf("phone api key [%s] does not exist", apiKey)return entities.AuthContext{}, repository.tracer.WrapErrorSpan(span, stacktrace.PropagateWithCode(err, ErrCodeNotFound, msg))@@ -121,7 +121,7 @@ func (repository *gormPhoneAPIKeyRepository) LoadAuthContext(ctx context.ContextPhoneNumbers: phoneAPIKey.PhoneNumbers,}- if result := repository.cache.SetWithTTL(apiKey, authUser, 1, 1*time.Hour); !result {+ if result := repository.cache.SetWithTTL(apiKey, authUser, 1, 15*time.Second); !result {msg := fmt.Sprintf("cannot cache [%T] with ID [%s] and result [%t]", authUser, phoneAPIKey.ID, result)ctxLogger.Error(repository.tracer.WrapErrorSpan(span, stacktrace.NewError(msg)))}@@ -168,13 +168,13 @@ func (repository *gormPhoneAPIKeyRepository) AddPhone(ctx context.Context, phoneerr := crdbgorm.ExecuteTx(ctx, repository.db, nil, func(tx *gorm.DB) error {query := `-UPDATE ?+UPDATE phone_api_keysSET phone_ids = array_remove(phone_ids, ?),phone_numbers = array_remove(phone_numbers, ?)WHERE user_id = ?;`err := tx.WithContext(ctx).- Raw(query, phoneAPIKey.TableName(), phone.ID, phone.PhoneNumber, phone.UserID).+ Exec(query, phone.ID, phone.PhoneNumber, phone.UserID).Errorif err != nil {msg := fmt.Sprintf("cannot remove phone with ID [%s] from API Key with ID [%s] for user with ID [%s]", phone.ID, phoneAPIKey.ID, phone.UserID)@@ -182,18 +182,19 @@ WHERE user_id = ?;}query = `-UPDATE ?+UPDATE phone_api_keysSET phone_ids = array_append(phone_ids, ?),phone_numbers = array_append(phone_numbers, ?)WHERE array_position(phone_ids, ?) IS NULL AND id = ?;`- err = repository.db.WithContext(ctx).- Raw(query, phoneAPIKey.TableName(), phone.ID, phone.PhoneNumber, phoneAPIKey.ID).+ err = tx.WithContext(ctx).+ Exec(query, phone.ID, phone.PhoneNumber, phone.ID, phoneAPIKey.ID).Errorif err != nil {msg := fmt.Sprintf("cannot add [%T] with ID [%s] from API Key with ID [%s] for user with ID [%s]", phone, phone.ID, phoneAPIKey.ID, phone.UserID)return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))}+return nil})if err != nil {@@ -209,21 +210,19 @@ func (repository *gormPhoneAPIKeyRepository) RemovePhone(ctx context.Context, phdefer span.End()query := `-UPDATE ?+UPDATE phone_api_keysSET phone_ids = array_remove(phone_ids, ?),phone_numbers = array_remove(phone_numbers, ?)WHERE id = ?;`err := repository.db.WithContext(ctx).- Raw(query, phoneAPIKey.TableName(), phone.ID, phone.PhoneNumber, phoneAPIKey.ID).+ Exec(query, phone.ID, phone.PhoneNumber, phoneAPIKey.ID).Errorif err != nil {msg := fmt.Sprintf("cannot remove phone with ID [%s] from phone API key with ID [%s]", phone.ID, phoneAPIKey.ID)return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))}- repository.cache.Del(phoneAPIKey.APIKey)-return nil}diff --git a/web/pages/phone-api-keys/index.vue b/web/pages/phone-api-keys/index.vueindex 691edc0f..cfc1d9ff 100644--- a/web/pages/phone-api-keys/index.vue+++ b/web/pages/phone-api-keys/index.vue@@ -119,7 +119,7 @@</td><td>{{ phoneApiKey.created_at | timestamp }}</td><td>- <ul v-if="phoneApiKey.phone_numbers" class="ml-n3">+ <ul v-if="phoneApiKey.phone_numbers.length" class="ml-n3"><liv-for="phoneNumber in phoneApiKey.phone_numbers":key="phoneNumber"@@ -141,7 +141,7 @@</v-btn></li></ul>- <span v-else>-</span>+ <span v-else class="text--secondary">-</span></td><td><v-btn@@ -405,7 +405,7 @@ export default Vue.extend({this.loading = truethis.$store.dispatch('indexPhoneApiKeys')- .then((phoneApiKeys) => {+ .then((phoneApiKeys: Array<EntitiesPhoneAPIKey>) => {this.phoneApiKeys = phoneApiKeys}).finally(() => {@@ -423,7 +423,7 @@ export default Vue.extend({)?.id,}).then(() => {- this.deleteApiKeyDialog = false+ this.removePhoneFromApiKeyDialog = falsethis.loadPhoneApiKeys()}).finally(() => {diff --git a/web/store/index.ts b/web/store/index.tsindex debe6bf4..71a1314f 100644--- a/web/store/index.ts+++ b/web/store/index.ts@@ -518,12 +518,12 @@ export const actions = {deletePhoneFromPhoneApiKey(context: ActionContext<State, State>,- payload: { phoneAPIKeyID: string; phoneID: string },+ payload: { phoneApiKeyId: string; phoneId: string },) {return new Promise<void>((resolve, reject) => {axios.delete<ResponsesNoContent>(- `/v1/api-keys/${payload.phoneAPIKeyID}/phones/${payload.phoneID}`,+ `/v1/api-keys/${payload.phoneApiKeyId}/phones/${payload.phoneId}`,).then(async (response: AxiosResponse<ResponsesNoContent>) => {await context.dispatch('addNotification', {