Dodat primer upita sa auth header-om.

4 files changed, 13 insertions, 6 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt
index b2c8bf5..6e6e368 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt
@@ -84,7 +84,7 @@ class FragmentLogin : Fragment() {
             if(!emailString.isEmpty() && !passwordString.isEmpty()&& checkPassword(passwordString)==true && checkEmail(emailString)==true) {
 
                 var loginData= Login(emailString,passwordString)
-                val authApi= RetrofitHelper.getInstanceNoAuth()
+                val authApi= RetrofitHelper.getInstance()
                 val request=authApi.login(loginData)
 
                 request.enqueue(object : retrofit2.Callback<String?> {
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt
index 2201128..cce3d04 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt
@@ -81,7 +81,7 @@ class FragmentRegister : Fragment() {
 
                 var registerData=Register(nameString,usernameString,emailString,passwordString)
 
-                val authApi=RetrofitHelper.getInstanceNoAuth()
+                val authApi=RetrofitHelper.getInstance()
 
                 val request=authApi.register(registerData)
 
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IAuthApi.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IAuthApi.kt
index bd430a8..22935a5 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IAuthApi.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IAuthApi.kt
@@ -2,9 +2,11 @@ package com.example.brzodolokacije.Interfaces
 
 import com.example.brzodolokacije.Models.Auth.Login
 import com.example.brzodolokacije.Models.Auth.Register
+import com.example.brzodolokacije.Models.Post
 import okhttp3.ResponseBody
 import retrofit2.Call
 import retrofit2.http.Body
+import retrofit2.http.Header
 import retrofit2.http.POST
 
 interface IAuthApi {
@@ -12,4 +14,7 @@ interface IAuthApi {
     fun login(@Body obj:Login): Call<String>
     @POST("/api/auth/register")
     fun register(@Body obj:Register):Call<ResponseBody>
+
+    //@POST("putanja")
+    //fun add(@Body obj:Post,@Header("Authorization") authHeader:String):Call<Post>
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
index 4e9e0e6..5f7e8d3 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
@@ -2,6 +2,8 @@ package com.example.brzodolokacije.Services
 
 import com.example.brzodolokacije.Interfaces.IAuthApi
 import com.google.gson.GsonBuilder
+import okhttp3.OkHttpClient
+import okhttp3.Request
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
@@ -10,14 +12,14 @@ object RetrofitHelper {
     val baseUrl="http://10.0.2.2:5279"
 
     private var retrofit_noauth: IAuthApi? = null
+    private var retrofit_auth: IAuthApi? = null
 
-
-    fun getInstanceNoAuth():IAuthApi{
+    fun getInstance():IAuthApi{
         if(retrofit_noauth==null)
-            retrofit_noauth= createInstanceNoAuth()
+            retrofit_noauth= createInstance()
         return retrofit_noauth as IAuthApi
     }
-    private fun createInstanceNoAuth():IAuthApi{
+    private fun createInstance():IAuthApi{
         val gson = GsonBuilder()
             .setLenient()
             .create()