From d5f603e0ddc1e21a111b2ef15cb3332e09286b74 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Mon, 31 Oct 2022 13:09:27 +0100 Subject: Dodat jwtDecoder. Dodata provera na startu aplikacije da li je korisnik ulogovan i u zavisnosti od toga se starta activity. --- Client/BrzoDoLokacije/app/build.gradle | 3 ++ .../com/example/brzodolokacije/MainActivity.kt | 32 +++++++++++++++++----- 2 files changed, 28 insertions(+), 7 deletions(-) (limited to 'Client') diff --git a/Client/BrzoDoLokacije/app/build.gradle b/Client/BrzoDoLokacije/app/build.gradle index e000050..f6faf0d 100644 --- a/Client/BrzoDoLokacije/app/build.gradle +++ b/Client/BrzoDoLokacije/app/build.gradle @@ -49,4 +49,7 @@ dependencies { //Retrofit implementation 'com.squareup.retrofit2:retrofit:2.7.2' implementation 'com.squareup.retrofit2:converter-gson:2.7.2' + + //JWT + implementation 'com.auth0.android:jwtdecode:2.0.1' } \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt index abf041a..1208564 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt @@ -3,13 +3,11 @@ package com.example.brzodolokacije import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle -import android.util.Log -import android.view.View -import android.widget.Button -import androidx.fragment.app.FragmentTransaction +import com.auth0.android.jwt.JWT import com.example.brzodolokacije.Activities.ActivityLoginRegister -import com.example.brzodolokacije.Fragments.FragmentLogin -import com.example.brzodolokacije.Fragments.FragmentRegister +import com.example.brzodolokacije.Activities.NavigationActivity +import com.example.brzodolokacije.Services.SharedPreferencesHelper + class MainActivity : AppCompatActivity() { @@ -17,8 +15,28 @@ class MainActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + val intent:Intent + + if(checkLoggedIn()) + intent= Intent(this, NavigationActivity::class.java) + else + intent= Intent(this, ActivityLoginRegister::class.java) + - val intent= Intent(this, ActivityLoginRegister::class.java) startActivity(intent) + } + + fun checkLoggedIn():Boolean{ + var jwtString=SharedPreferencesHelper.getValue("jwt",this) + if(jwtString==null) + return false + var jwt:JWT=JWT(jwtString) + if(jwt.isExpired(30)) + return false + return true + + + + } } \ No newline at end of file -- cgit v1.2.3