diff --git a/config.example.json b/config.example.json new file mode 100644 index 0000000000000000000000000000000000000000..42af8c67a62d6eadc93b42c8b122e393d5549b5d --- /dev/null +++ b/config.example.json @@ -0,0 +1,50 @@ +{ + "domain": "quicksy.im", + "validate_phone_numbers": true, + "prevent_registration": false, + "min_version": "2.3.0", + "account_inactivity": "P28D", + "xmpp": { + "jid": "api.quicksy.im", + "secret": "…" + }, + "web": { + "host": "127.0.0.1", + "port": 4567 + }, + "db": { + "ejabberd": { + "url": "jdbc:mariadb://localhost:3306/ejabberd?characterEncoding=utf8", + "username": "…", + "password": "…" + }, + "quicksy": { + "url": "jdbc:mariadb://localhost:3306/quicksy?characterEncoding=utf8", + "username": "…", + "password": "…" + } + }, + "provider": { + "im.quicksy.server.verification.NexmoVerificationProvider": { + "deny": [ + 91 + ], + "parameter": { + "api_key": "…", + "api_secret": "…", + "phone_number": "…" + } + }, + "im.quicksy.server.verification.TwilioVerificationProvider": { + "parameter": { + "auth_token": "…" + } + } + }, + "pay_pal": { + "username": "…", + "password": "…", + "signature": "…" + }, + "cim_auth_token": "…" +} diff --git a/config.json.example b/config.json.example deleted file mode 100644 index 9486d8ae1d1db9ec0f373b6ff95445fb4ba17a88..0000000000000000000000000000000000000000 --- a/config.json.example +++ /dev/null @@ -1,31 +0,0 @@ -{ - "domain": "quicksy.im", - "twilio_auth_token": "***", - "validate_phone_numbers": true, - "min_version": "2.3.0", - "account_inactivity": "P28D", - "xmpp": { - "jid": "api.quicksy.im", - "secret": "***" - }, - "web": { - "host": "127.0.0.1", - "port": 4567 - }, - "db": { - "ejabberd" : { - "url": "jdbc:mariadb://localhost:3306/ejabberd?characterEncoding=utf8" - "username": "***", - "password": "***" - }, - "quicksy" : { - "url": "jdbc:mariadb://localhost:3306/quicksy?characterEncoding=utf8" - } - }, - "pay_pal": { - "username": "***", - "password": "***", - "signature": "***" - }, - "cim_auth_token": "***" -} diff --git a/src/main/java/im/quicksy/server/configuration/Configuration.java b/src/main/java/im/quicksy/server/configuration/Configuration.java index 857f4db648650ea0e43fe5254d2ebc004e1ee147..a78c3c0f68e589395fbfb09a6eae64508a20c2fe 100644 --- a/src/main/java/im/quicksy/server/configuration/Configuration.java +++ b/src/main/java/im/quicksy/server/configuration/Configuration.java @@ -227,7 +227,7 @@ public class Configuration { } public List<Integer> getDeny() { - return deny; + return deny == null ? Collections.emptyList() : deny; } } } diff --git a/src/main/java/im/quicksy/server/verification/MetaVerificationProvider.java b/src/main/java/im/quicksy/server/verification/MetaVerificationProvider.java index 1068f6cc6ec3bcb2974ca6411aca926811caaaa9..12bd3d95836675ff36e70434c606911600b87959 100644 --- a/src/main/java/im/quicksy/server/verification/MetaVerificationProvider.java +++ b/src/main/java/im/quicksy/server/verification/MetaVerificationProvider.java @@ -85,8 +85,8 @@ public class MetaVerificationProvider implements VerificationProvider { private final AbstractVerificationProvider provider; private ProviderWrapper(List<Integer> deny, AbstractVerificationProvider provider) { - this.deny = deny; - this.provider = provider; + this.deny = Preconditions.checkNotNull(deny); + this.provider = Preconditions.checkNotNull(provider); } } }