From b7f2b9a4fcfd8c70b0f77e058b409f558287973e Mon Sep 17 00:00:00 2001 From: Benoît Verhaeghe Date: Sun, 5 Feb 2017 23:46:13 +0100 Subject: [PATCH] Authorization for all --- app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/CreateEvent.java | 12 +++++++++++- app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/DeleteEvent.java | 13 ++++++++++++- app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/ModifyEvent.java | 12 +++++++++++- app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java | 12 +++++++++++- app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/CreateConsommation.java | 13 ++++++++++++- app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/DeleteConsommation.java | 12 +++++++++++- app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/ModifyConsommation.java | 12 +++++++++++- app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/PaiementConsommation.java | 12 +++++++++++- app/src/main/java/net/plil/clubinfo/etunicorn/app/credit/Crediter.java | 13 ++++++++++++- app/src/main/java/net/plil/clubinfo/etunicorn/app/debit/Debiter.java | 15 +++++++++++++-- 10 files changed, 115 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/CreateEvent.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/CreateEvent.java index 33a9900..6dacedb 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/CreateEvent.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/CreateEvent.java @@ -18,12 +18,14 @@ import android.widget.ProgressBar; import android.widget.Spinner; import android.widget.Toast; +import com.android.volley.AuthFailureError; import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; import net.plil.clubinfo.etunicorn.R; +import net.plil.clubinfo.etunicorn.app.MainActivity; import net.plil.clubinfo.etunicorn.utils.VolleyUtils; import org.json.JSONException; @@ -31,7 +33,9 @@ import org.json.JSONObject; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.HashMap; import java.util.Locale; +import java.util.Map; public class CreateEvent extends DialogFragment { @@ -145,7 +149,13 @@ public class CreateEvent extends DialogFragment { Toast.makeText(getContext(), error.getMessage(), Toast.LENGTH_LONG).show(); } } - ); + ){ + @Override + public Map getHeaders() throws AuthFailureError { + Map headers = new HashMap(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + }}; jsonObjectRequest.setTag(CreateEvent.class); VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); } diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/DeleteEvent.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/DeleteEvent.java index e88408d..02a67f3 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/DeleteEvent.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/DeleteEvent.java @@ -11,18 +11,23 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.Toast; +import com.android.volley.AuthFailureError; import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; import net.plil.clubinfo.etunicorn.R; +import net.plil.clubinfo.etunicorn.app.MainActivity; import net.plil.clubinfo.etunicorn.data.Consommation; import net.plil.clubinfo.etunicorn.data.Event; import net.plil.clubinfo.etunicorn.utils.VolleyUtils; import org.json.JSONObject; +import java.util.HashMap; +import java.util.Map; + public class DeleteEvent extends DialogFragment { @@ -89,7 +94,13 @@ public class DeleteEvent extends DialogFragment { Toast.makeText(getContext(), R.string.delete_refused, Toast.LENGTH_LONG).show(); } } - ); + ){ + @Override + public Map getHeaders() throws AuthFailureError { + Map headers = new HashMap(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + }}; jsonObjectRequest.setTag(DeleteEvent.class); VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); } diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/ModifyEvent.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/ModifyEvent.java index e2275e9..1b16ef7 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/ModifyEvent.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/ModifyEvent.java @@ -18,12 +18,14 @@ import android.widget.ProgressBar; import android.widget.Spinner; import android.widget.Toast; +import com.android.volley.AuthFailureError; import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; import net.plil.clubinfo.etunicorn.R; +import net.plil.clubinfo.etunicorn.app.MainActivity; import net.plil.clubinfo.etunicorn.data.Event; import net.plil.clubinfo.etunicorn.utils.VolleyUtils; @@ -32,7 +34,9 @@ import org.json.JSONObject; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.HashMap; import java.util.Locale; +import java.util.Map; public class ModifyEvent extends DialogFragment { @@ -149,7 +153,13 @@ public class ModifyEvent extends DialogFragment { } } - ); + ){ + @Override + public Map getHeaders() throws AuthFailureError { + Map headers = new HashMap(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + }}; jsonObjectRequest.setTag(ModifyEvent.class); VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); } diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java index bd96bb9..6169988 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java @@ -11,12 +11,14 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; +import com.android.volley.AuthFailureError; import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; import net.plil.clubinfo.etunicorn.R; +import net.plil.clubinfo.etunicorn.app.MainActivity; import net.plil.clubinfo.etunicorn.app.NFCSupport; import net.plil.clubinfo.etunicorn.data.Event; import net.plil.clubinfo.etunicorn.utils.VolleyUtils; @@ -24,7 +26,9 @@ import net.plil.clubinfo.etunicorn.utils.VolleyUtils; import org.json.JSONException; import org.json.JSONObject; +import java.util.HashMap; import java.util.Locale; +import java.util.Map; public class PaiementEvent extends DialogFragment implements NFCSupport { @@ -99,7 +103,13 @@ public class PaiementEvent extends DialogFragment implements NFCSupport { Toast.makeText(getContext(), R.string.payment_refused, Toast.LENGTH_LONG).show(); } } - ); + ){ + @Override + public Map getHeaders() throws AuthFailureError { + Map headers = new HashMap(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + }}; jsonObjectRequest.setTag(PaiementEvent.class); VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/CreateConsommation.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/CreateConsommation.java index 7759bd2..10cb039 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/CreateConsommation.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/CreateConsommation.java @@ -14,17 +14,22 @@ import android.widget.Button; import android.widget.EditText; import android.widget.ProgressBar; +import com.android.volley.AuthFailureError; import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; import net.plil.clubinfo.etunicorn.R; +import net.plil.clubinfo.etunicorn.app.MainActivity; import net.plil.clubinfo.etunicorn.utils.VolleyUtils; import org.json.JSONException; import org.json.JSONObject; +import java.util.HashMap; +import java.util.Map; + public class CreateConsommation extends DialogFragment { @@ -102,7 +107,13 @@ public class CreateConsommation extends DialogFragment { dismiss(); } } - ); + ){ + @Override + public Map getHeaders() throws AuthFailureError { + Map headers = new HashMap(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + }}; jsonObjectRequest.setTag(CreateConsommation.class); VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); } diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/DeleteConsommation.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/DeleteConsommation.java index 552c3bb..31a606b 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/DeleteConsommation.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/DeleteConsommation.java @@ -12,19 +12,23 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; +import com.android.volley.AuthFailureError; import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; import net.plil.clubinfo.etunicorn.R; +import net.plil.clubinfo.etunicorn.app.MainActivity; import net.plil.clubinfo.etunicorn.data.Consommation; import net.plil.clubinfo.etunicorn.utils.VolleyUtils; import org.json.JSONException; import org.json.JSONObject; +import java.util.HashMap; import java.util.Locale; +import java.util.Map; public class DeleteConsommation extends DialogFragment { @@ -90,7 +94,13 @@ public class DeleteConsommation extends DialogFragment { Toast.makeText(getContext(), R.string.delete_refused, Toast.LENGTH_LONG).show(); } } - ); + ){ + @Override + public Map getHeaders() throws AuthFailureError { + Map headers = new HashMap(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + }}; jsonObjectRequest.setTag(DeleteConsommation.class); VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); } diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/ModifyConsommation.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/ModifyConsommation.java index 750f7dc..71e433a 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/ModifyConsommation.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/ModifyConsommation.java @@ -13,19 +13,23 @@ import android.widget.EditText; import android.widget.ProgressBar; import android.widget.Toast; +import com.android.volley.AuthFailureError; import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; import net.plil.clubinfo.etunicorn.R; +import net.plil.clubinfo.etunicorn.app.MainActivity; import net.plil.clubinfo.etunicorn.data.Consommation; import net.plil.clubinfo.etunicorn.utils.VolleyUtils; import org.json.JSONException; import org.json.JSONObject; +import java.util.HashMap; import java.util.Locale; +import java.util.Map; public class ModifyConsommation extends DialogFragment { @@ -121,7 +125,13 @@ public class ModifyConsommation extends DialogFragment { Toast.makeText(getContext(), R.string.modify_refused, Toast.LENGTH_LONG).show(); } } - ); + ){ + @Override + public Map getHeaders() throws AuthFailureError { + Map headers = new HashMap(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + }}; jsonObjectRequest.setTag(ModifyConsommation.class); VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); } diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/PaiementConsommation.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/PaiementConsommation.java index 387e005..d95e0b8 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/PaiementConsommation.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/PaiementConsommation.java @@ -12,12 +12,14 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; +import com.android.volley.AuthFailureError; import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; import net.plil.clubinfo.etunicorn.R; +import net.plil.clubinfo.etunicorn.app.MainActivity; import net.plil.clubinfo.etunicorn.app.NFCSupport; import net.plil.clubinfo.etunicorn.app.event.PaiementEvent; import net.plil.clubinfo.etunicorn.data.Consommation; @@ -26,7 +28,9 @@ import net.plil.clubinfo.etunicorn.utils.VolleyUtils; import org.json.JSONException; import org.json.JSONObject; +import java.util.HashMap; import java.util.Locale; +import java.util.Map; public class PaiementConsommation extends DialogFragment implements NFCSupport { @@ -108,7 +112,13 @@ public class PaiementConsommation extends DialogFragment implements NFCSupport { Toast.makeText(getContext(), R.string.payment_refused, Toast.LENGTH_LONG).show(); } } - ); + ){ + @Override + public Map getHeaders() throws AuthFailureError { + Map headers = new HashMap(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + }}; jsonObjectRequest.setTag(PaiementConsommation.class); VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); } diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/credit/Crediter.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/credit/Crediter.java index 23f13e8..dc0d908 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/credit/Crediter.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/credit/Crediter.java @@ -11,12 +11,14 @@ import android.view.ViewGroup; import android.widget.EditText; import android.widget.ProgressBar; +import com.android.volley.AuthFailureError; import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; import net.plil.clubinfo.etunicorn.R; +import net.plil.clubinfo.etunicorn.app.MainActivity; import net.plil.clubinfo.etunicorn.app.NFCSupport; import net.plil.clubinfo.etunicorn.data.Personne; import net.plil.clubinfo.etunicorn.utils.VolleyUtils; @@ -24,6 +26,9 @@ import net.plil.clubinfo.etunicorn.utils.VolleyUtils; import org.json.JSONException; import org.json.JSONObject; +import java.util.HashMap; +import java.util.Map; + public class Crediter extends Fragment implements NFCSupport{ private EditText mMoneyEditText; @@ -96,7 +101,13 @@ public class Crediter extends Fragment implements NFCSupport{ Snackbar.make(coordinatorLayout, error.getMessage(), Snackbar.LENGTH_LONG).show(); } } - ); + ){ + @Override + public Map getHeaders() throws AuthFailureError { + Map headers = new HashMap(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + }}; jsonObjectRequest.setTag(Crediter.class); VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); } diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/debit/Debiter.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/debit/Debiter.java index 1506d62..51a80c0 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/debit/Debiter.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/debit/Debiter.java @@ -11,12 +11,14 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ProgressBar; +import com.android.volley.AuthFailureError; import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; import net.plil.clubinfo.etunicorn.R; +import net.plil.clubinfo.etunicorn.app.MainActivity; import net.plil.clubinfo.etunicorn.app.NFCSupport; import net.plil.clubinfo.etunicorn.data.Personne; import net.plil.clubinfo.etunicorn.utils.VolleyUtils; @@ -24,6 +26,9 @@ import net.plil.clubinfo.etunicorn.utils.VolleyUtils; import org.json.JSONException; import org.json.JSONObject; +import java.util.HashMap; +import java.util.Map; + public class Debiter extends Fragment implements NFCSupport { @@ -103,8 +108,14 @@ public class Debiter extends Fragment implements NFCSupport { Snackbar.make(coordinatorLayout, error.getMessage(), Snackbar.LENGTH_LONG).show(); } - } - ); + }) + { + @Override + public Map getHeaders() throws AuthFailureError { + Map headers = new HashMap(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + }}; jsonObjectRequest.setTag(Debiter.class); VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); } -- libgit2 0.21.2