Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added authentication to All In #11

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added authentication to All In #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad9b382
WIP: Local changes to authentication branch
Dec 3, 2024
bc75ffd
Merge remote-tracking branch 'origin/main' into feature/authentication
Dec 3, 2024
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
222 changes: 114 additions & 108 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,111 +1,117 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.5</version>
<relativePath></relativePath>
<!-- lookup parent from repository -->
</parent>
<groupId>com.appdev</groupId>
<artifactId>all-in</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>all-in</name>
<description>All In Backend</description>
<properties>
<java.version>17</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.6.1</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.17.2</version>
</dependency>
<dependency>
<groupId>com.github.javafaker</groupId>
<artifactId>javafaker</artifactId>
<version>1.0.2</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.43.0</version>
<configuration>
<java>
<cleanthat></cleanthat>
<googleJavaFormat></googleJavaFormat>
<importOrder></importOrder>
<removeUnusedImports></removeUnusedImports>
<formatAnnotations></formatAnnotations>
<trimTrailingWhitespace></trimTrailingWhitespace>
<endWithNewline></endWithNewline>
</java>
<pom>
<sortPom></sortPom>
</pom>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.12</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<goals>
<goal>report</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.5</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
<groupId>com.appdev</groupId>
<artifactId>all-in</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>all-in</name>
<description>All In Backend</description>
<properties>
<java.version>17</java.version>
</properties>

<!-- Dependencies Section -->
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.6.1</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.17.2</version>
</dependency>
<dependency>
<groupId>com.google.firebase</groupId>
<artifactId>firebase-admin</artifactId>
<version>9.4.1</version>
</dependency>
<dependency>
<groupId>com.github.javafaker</groupId>
<artifactId>javafaker</artifactId>
<version>1.0.2</version>
</dependency>
</dependencies>

<!-- Build Section -->
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.12</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.43.0</version>
<configuration>
<java>
<googleJavaFormat/>
<removeUnusedImports/>
<trimTrailingWhitespace/>
<endWithNewline/>
</java>
</configuration>
</plugin>
</plugins>
</build>
</project>

24 changes: 19 additions & 5 deletions src/main/java/com/appdev/allin/user/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,14 @@ public class User {
@Column(name = "balance", nullable = false)
private Double balance = 1000.0;

@OneToMany(mappedBy = "owner", fetch = FetchType.EAGER)
private List<Contract> contracts = new LinkedList<>();
@Column(name = "firebase_uid", nullable = false, unique = true)
private String firebaseUid;

@OneToMany (mappedBy = "sessionId", fetch = FetchType.EAGER)
private List<UserSession> sessions = new LinkedList<>();

@OneToMany(mappedBy = "owner", fetch = FetchType.EAGER)
private List<Contract> contracts = new LinkedList<>();

@OneToMany(mappedBy = "seller", fetch = FetchType.EAGER)
private List<Transaction> sellerTransactions = new LinkedList<>();
Expand Down Expand Up @@ -92,9 +98,17 @@ public void setBalance(Double balance) {
this.balance = balance;
}

public List<Contract> getContracts() {
return contracts;
}
public String getFirebaseUid() {
return firebaseUid;
}

public void setFirebaseUid(String firebaseUid) {
this.firebaseUid = firebaseUid;
}

public List<Contract> getContracts() {
return contracts;
}

public void setContracts(List<Contract> contracts) {
this.contracts = contracts;
Expand Down
116 changes: 116 additions & 0 deletions src/main/java/com/appdev/allin/user/UserSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
package com.appdev.allin.user;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityManager;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import java.util.UUID;

import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseToken;

@Entity
@Table(name = "sessionIds")
public class UserSession {

@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(columnDefinition = "uuid")
private UUID id;

@Column (nullable = false)
private String firebaseUid;

@Column(nullable = false, columnDefinition = "deviceToken")
private String deviceToken;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user", nullable = false)
private User user;

@Column(nullable = false)
private UUID sessionId;

public UUID getId() {
return id;
}

public void setId(UUID id) {
this.id = id;
}

public String getFirebaseUid() {
return firebaseUid;
}

public void setFirebaseUid(String firebaseUid) {
this.firebaseUid = firebaseUid;
}

public String getDeviceToken() {
return deviceToken;
}

public void setDeviceToken(String deviceToken) {
this.deviceToken = deviceToken;
}

public User getUser() {
return user;
}

public void setUser(User user) {
this.user = user;
}

public UUID getSessionId() {
return sessionId;
}

public void setSessionId(UUID sessionId) {
this.sessionId = sessionId;
}

public UserSession() {
this.sessionId = UUID.randomUUID();
}


public static UserSession createSession(String firebaseIdToken, String deviceToken, EntityManager entityManager) {
try {
FirebaseToken decodedToken = FirebaseAuth.getInstance().verifyIdToken(firebaseIdToken);
String firebaseUid = decodedToken.getUid();

User user = entityManager.createQuery("SELECT user from User user where user.firebaseUid = :firebaseUid", User.class)
.setParameter("firebaseUid", firebaseUid)
.getResultStream()
.findFirst()
.orElseGet(() -> {
User newUser = new User();
newUser.setFirebaseUid(firebaseUid);
newUser.setUsername(decodedToken.getName());
newUser.setEmail(decodedToken.getEmail());
entityManager.persist(newUser);
return newUser;
});
UserSession session = new UserSession();
session.setFirebaseUid(firebaseUid);
session.setUser(user);
session.setDeviceToken(deviceToken);

entityManager.persist(session);

return session;
} catch (Exception e) {
throw new RuntimeException("Authentication failed: " + e.getMessage(), e);
}
}


}
Loading