RMET-2343 Social Logins Plugin - Update error codes (#39)

* feat: format error codes References: https://outsystemsrd.atlassian.net/browse/RMET-2343 * chore: update changelog * fix: fixing typo on error message --------- Co-authored-by: Marta Carlos <marta.carlos@outsystems.com>
OutSystems · Jan 23, 2024 · b70a06f · b70a06f
1 parent f41e55f
commit b70a06f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ The changes documented here do not include those from the original repository.
 
 ## [Unreleased]
 
+## 2023-03-20
+- Feat: Update error code format
+- Feat: [Android] Update error codes and descriptions (https://outsystemsrd.atlassian.net/browse/RMET-2343)
+
 ### 2023-03-16
 - Feat: [iOS] Update error codes and descriptions (https://outsystemsrd.atlassian.net/browse/RMET-2342).
 

diff --git a/hooks/utils.js b/hooks/utils.js
@@ -18,7 +18,7 @@ module.exports = {
                     } else throw new Error("Bad Request: make sure your apps is configured correctly")
                 }
                 if(err.response.status == 404){
-                    throw new Error("Not found: Social Logins Configurator is either outdated or CONFIGURATOR_BASE_URL is not well defined.");
+                    throw new Error("Not found: Social Logins Configurator is either outdated or SOCIAL_CONF_API_ENDPOINT is not well defined.");
                 }
             } else if(err.request){
                 throw new Error("Something went wrong with the request. " + err.toJSON());

diff --git a/src/android/com/outsystems/plugins/sociallogins/OSSocialLogins.kt b/src/android/com/outsystems/plugins/sociallogins/OSSocialLogins.kt
@@ -27,9 +27,13 @@ class OSSocialLogins : CordovaImplementation() {
     private var linkedinController: SocialLoginsLinkedinController? = null
     private var facebookController: SocialLoginsFacebookController? = null
 
+    companion object {
+        private const val ERROR_FORMAT_PREFIX = "OS-PLUG-SOCI-"
+    }
+
     private var delegate  = object : SocialLoginsInterface {
         override fun callbackError(error: SocialLoginError) {
-            sendPluginResult(null, Pair(error.code.toString(), error.message))
+            sendPluginResult(null, Pair(formatErrorCode(error.code), error.message))
         }
         override fun callbackUserInfo(result: UserInfo) {
             val pluginResponseJson = gson.toJson(result)
@@ -115,16 +119,16 @@ class OSSocialLogins : CordovaImplementation() {
             redirectUri = args.get(2).toString()
 
             if(clientId.isNullOrEmpty() || redirectUri.isNullOrEmpty()){
-                sendPluginResult(null, Pair(SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.code.toString(), SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.message))
+                sendPluginResult(null, Pair(formatErrorCode(SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.code), SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.message))
             }
             else{
                 setAsActivityResultCallback()
                 socialLoginController?.doLoginLinkedin(state, clientId, redirectUri, cordova.activity)
             }
         }catch (e: JSONException){
-            sendPluginResult(null, Pair(SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.code.toString(), SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.message))
+            sendPluginResult(null, Pair(formatErrorCode(SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.code), SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.message))
         }catch (e: Exception){
-            sendPluginResult(null, Pair(SocialLoginError.APPLE_SIGN_IN_GENERAL_ERROR.code.toString(), SocialLoginError.APPLE_SIGN_IN_GENERAL_ERROR.message))
+            sendPluginResult(null, Pair(formatErrorCode(SocialLoginError.APPLE_SIGN_IN_GENERAL_ERROR.code), SocialLoginError.APPLE_SIGN_IN_GENERAL_ERROR.message))
         }
 
     }
@@ -140,16 +144,16 @@ class OSSocialLogins : CordovaImplementation() {
             redirectUri = args.get(2).toString()
 
             if(clientId.isNullOrEmpty() || redirectUri.isNullOrEmpty()){
-                sendPluginResult(null, Pair(SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.code.toString(), SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.message))
+                sendPluginResult(null, Pair(formatErrorCode(SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.code), SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.message))
             }
             else{
                 setAsActivityResultCallback()
                 socialLoginController?.doLoginApple(state, clientId, redirectUri, cordova.activity)
             }
         }catch (e: JSONException){
-            sendPluginResult(null, Pair(SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.code.toString(), SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.message))
+            sendPluginResult(null, Pair(formatErrorCode(SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.code), SocialLoginError.MISSING_INPUT_PARAMETERS_ERROR.message))
         }catch (e: Exception){
-            sendPluginResult(null, Pair(SocialLoginError.APPLE_SIGN_IN_GENERAL_ERROR.code.toString(), SocialLoginError.APPLE_SIGN_IN_GENERAL_ERROR.message))
+            sendPluginResult(null, Pair(formatErrorCode(SocialLoginError.APPLE_SIGN_IN_GENERAL_ERROR.code), SocialLoginError.APPLE_SIGN_IN_GENERAL_ERROR.message))
         }
 
     }
@@ -171,4 +175,8 @@ class OSSocialLogins : CordovaImplementation() {
         return true
     }
 
+    private fun formatErrorCode(code: Int): String {
+        return ERROR_FORMAT_PREFIX + code.toString().padStart(4, '0')
+    }
+
 }