Skip to content
This repository was archived by the owner on Sep 22, 2025. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,12 @@ dependencies {
implementation 'com.google.firebase:firebase-auth:23.0.0'
implementation 'com.google.firebase:firebase-firestore:25.0.0'


implementation platform('com.google.firebase:firebase-bom:33.1.2')
implementation 'com.google.firebase:firebase-auth'

implementation 'com.facebook.android:facebook-login:latest.release'

implementation 'com.google.firebase:firebase-messaging:24.0.0'
implementation 'com.google.firebase:firebase-firestore-ktx:25.0.0'
implementation 'com.google.android.gms:play-services-auth:21.2.0'
Expand Down
23 changes: 23 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,30 @@
android:exported="false" />

<activity android:name=".ModulesActivity" />
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id" />

<meta-data
android:name="com.facebook.sdk.ClientToken"
android:value="@string/fb_login_protocol_scheme" />

<!-- Facebook login activities -->
<activity
android:name="com.facebook.FacebookActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name" />

<activity
android:name="com.facebook.CustomTabActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="@string/fb_login_protocol_scheme" />
</intent-filter>
</activity>

<activity android:name=".Module1CoursesActivity" />
<activity android:name=".HomecareInductionActivity" />
Expand Down
118 changes: 96 additions & 22 deletions app/src/main/java/deakin/gopher/guardian/view/general/LoginActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,28 @@ package deakin.gopher.guardian.view.general
import android.content.DialogInterface
import android.content.Intent
import android.os.Bundle
import android.util.Log
import android.view.View
import android.widget.Button
import android.widget.EditText
import android.widget.ProgressBar
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.app.AlertDialog
import com.facebook.CallbackManager
import com.facebook.FacebookCallback
import com.facebook.FacebookException
import com.facebook.FacebookSdk
import com.facebook.login.LoginResult
import com.facebook.login.widget.LoginButton
import com.google.android.gms.auth.api.signin.GoogleSignIn
import com.google.android.gms.auth.api.signin.GoogleSignInAccount
import com.google.android.gms.auth.api.signin.GoogleSignInClient
import com.google.android.gms.auth.api.signin.GoogleSignInOptions
import com.google.android.gms.common.SignInButton
import com.google.android.gms.common.api.ApiException
import com.google.android.gms.tasks.Task
import com.google.firebase.auth.FacebookAuthProvider
import com.google.firebase.auth.FirebaseAuth
import com.google.firebase.auth.GoogleAuthProvider
import com.google.gson.Gson
Expand All @@ -39,9 +47,36 @@ import retrofit2.Response
class LoginActivity : BaseActivity() {
private lateinit var gsoClient: GoogleSignInClient

// Facebook
private lateinit var callbackManager: CallbackManager
private lateinit var fbLoginButton: LoginButton

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_login)

try {
val info =
packageManager.getPackageInfo(
packageName,
android.content.pm.PackageManager.GET_SIGNING_CERTIFICATES,
)
for (signature in info.signingInfo.apkContentsSigners) {
val md = java.security.MessageDigest.getInstance("SHA")
md.update(signature.toByteArray())
val keyHash = android.util.Base64.encodeToString(md.digest(), android.util.Base64.DEFAULT)
Log.d("FB_KEY_HASH", "KeyHash: $keyHash")
}
} catch (e: Exception) {
Log.e("FB_KEY_HASH", "Error generating key hash", e)
}

// --- Initialize Facebook SDK ---
FacebookSdk.setApplicationId(getString(R.string.facebook_app_id))
FacebookSdk.setClientToken(getString(R.string.facebook_client_token))
@Suppress("DEPRECATION")
FacebookSdk.sdkInitialize(applicationContext)

val mEmail: EditText = findViewById(R.id.Email)
val mPassword: EditText = findViewById(R.id.password)
val progressBar: ProgressBar = findViewById(R.id.progressBar)
Expand All @@ -50,8 +85,59 @@ class LoginActivity : BaseActivity() {
val mCreateBtn: Button = findViewById(R.id.loginRegisterBtn)
val forgotTextLink: TextView = findViewById(R.id.forgotPassword)

// --- Facebook setup ---
callbackManager = CallbackManager.Factory.create()
fbLoginButton = findViewById(R.id.loginFacebookBtn)
fbLoginButton.setPermissions("public_profile", "email")
fbLoginButton.registerCallback(
callbackManager,
object : FacebookCallback<LoginResult> {
override fun onSuccess(result: LoginResult) {
Log.d("FB_LOGIN", "Facebook login success, token: ${result.accessToken.token}")
Toast.makeText(this@LoginActivity, "Facebook Login Success!", Toast.LENGTH_SHORT).show()

val fbToken = result.accessToken.token
val credential = FacebookAuthProvider.getCredential(fbToken)

FirebaseAuth.getInstance().signInWithCredential(credential)
.addOnCompleteListener { task ->
if (task.isSuccessful) {
AlertDialog.Builder(this@LoginActivity)
.setTitle("Continue as")
.setItems(arrayOf("Admin", "Nurse", "Caretaker")) { _, which ->
val role =
when (which) {
0 -> Role.Admin
1 -> Role.Nurse
2 -> Role.Caretaker
else -> Role.Caretaker
}
// Pass selected role to your navigation or backend
NavigationService(this@LoginActivity).toHomeScreenForRole(role)
}
.setCancelable(false)
.show()
} else {
showMessage(getString(R.string.toast_login_error, task.exception?.message))
}
}
}

override fun onCancel() {
showMessage("Facebook login cancelled")
}

override fun onError(error: FacebookException) {
showMessage("Facebook login error: ${error.message}")
}
},
)

// --- Google setup (as you had) ---
val gso =
GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
// If Firebase Google sign-in ever fails with null idToken, add:
// .requestIdToken(getString(R.string.default_web_client_id))
.requestEmail()
.build()
gsoClient = GoogleSignIn.getClient(this, gso)
Expand All @@ -62,7 +148,6 @@ class LoginActivity : BaseActivity() {
val passwordInput = mPassword.text.toString().trim { it <= ' ' }

val loginValidationError = validateInputs(emailInput)

if (loginValidationError != null) {
progressBar.hide()
Toast.makeText(
Expand All @@ -74,7 +159,6 @@ class LoginActivity : BaseActivity() {
}

val call = ApiClient.apiService.login(emailInput, passwordInput)

call.enqueue(
object : Callback<AuthResponse> {
override fun onResponse(
Expand All @@ -83,13 +167,11 @@ class LoginActivity : BaseActivity() {
) {
progressBar.hide()
if (response.isSuccessful && response.body() != null) {
// Handle successful login
val user = response.body()!!.user
val token = response.body()!!.token
SessionManager.createLoginSession(user, token)
NavigationService(this@LoginActivity).toPinCodeActivity(user.role)
} else {
// Handle error
val errorResponse =
Gson().fromJson(
response.errorBody()?.string(),
Expand All @@ -103,7 +185,6 @@ class LoginActivity : BaseActivity() {
call: Call<AuthResponse>,
t: Throwable,
) {
// Handle failure
progressBar.hide()
showMessage(getString(R.string.toast_login_error, t.message))
}
Expand All @@ -123,36 +204,24 @@ class LoginActivity : BaseActivity() {
forgotTextLink.setOnClickListener { v: View ->
val resetMail = EditText(v.context)
val passwordResetDialog = AlertDialog.Builder(v.context)

with(passwordResetDialog) {
setTitle(getString(R.string.text_reset_password))
setMessage(getString(R.string.text_enter_your_email_to_received_reset_link))
setView(resetMail)
}

passwordResetDialog.setPositiveButton(
getString(R.string.yes),
) { _: DialogInterface?, _: Int ->
passwordResetDialog.setPositiveButton(getString(R.string.yes)) { _: DialogInterface?, _: Int ->
val mail = resetMail.text.toString()
sendResetPasswordEmail(mail)
}
passwordResetDialog.setNegativeButton(
getString(R.string.no),
) { _: DialogInterface?, _: Int -> }
passwordResetDialog.setNegativeButton(getString(R.string.no)) { _: DialogInterface?, _: Int -> }
passwordResetDialog.create().show()
}
}

private fun validateInputs(rawEmail: String?): LoginValidationError? {
if (rawEmail.isNullOrEmpty()) {
return LoginValidationError.EmptyEmail
}

if (rawEmail.isNullOrEmpty()) return LoginValidationError.EmptyEmail
val emailAddress = EmailAddress(rawEmail)
if (emailAddress.isValid().not()) {
return LoginValidationError.InvalidEmail
}

if (!emailAddress.isValid()) return LoginValidationError.InvalidEmail
return null
}

Expand All @@ -170,7 +239,6 @@ class LoginActivity : BaseActivity() {
?: getString(R.string.toast_reset_link_sent_to_your_email),
)
} else {
// Handle error
val errorResponse =
Gson().fromJson(
response.errorBody()?.string(),
Expand Down Expand Up @@ -198,6 +266,12 @@ class LoginActivity : BaseActivity() {
) {
super.onActivityResult(requestCode, resultCode, data)

// Facebook first
if (::callbackManager.isInitialized) {
callbackManager.onActivityResult(requestCode, resultCode, data)
}

// Google
if (requestCode == RC_GOOGLE_SIGN_IN) {
val task = GoogleSignIn.getSignedInAccountFromIntent(data)
handleSignInResult(task)
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/layout/activity_login.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,15 @@
android:textColor="@color/white"
app:cornerRadius="24dp" />

<com.facebook.login.widget.LoginButton
android:id="@+id/loginFacebookBtn"
android:layout_width="200dp"
android:layout_height="60dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:text="Continue with Facebook" />

<TextView
android:id="@+id/forgotPassword"
android:layout_width="wrap_content"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@

<string name="web_client_id">274677794777-fu1sosmmrqm4bgvmkf76gdc3v430d03v.apps.googleusercontent.com</string>

<string name="facebook_app_id">769250915495699</string>
<string name="fb_login_protocol_scheme">fb769250915495699</string>
<string name="facebook_client_token">a1ad3d3a28c60443562f9e9037951d96</string>

<string name="ek_img_content">ExportKit Image</string>
<string name="welcome__marilyn___string">Welcome, Marilyn !</string>
<string name="new_patient_string">New Patient</string>
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Wed Aug 31 11:56:40 AEST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0-milestone-1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading