Commit 3c12209b authored by Darrick Yong's avatar Darrick Yong

Merge branch 'master' into feat/style

parents 44963bb4 8cbcc3c4
......@@ -74,6 +74,12 @@
<artifactId>httpclient</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client</artifactId>
<version>1.31.2</version>
</dependency>
</dependencies>
<build>
......
package com.ascendfinalproject.warehouse.controllers;
import com.ascendfinalproject.warehouse.models.Session;
import com.ascendfinalproject.warehouse.services.SessionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value = "")
public class AuthenticationController {
@Autowired
SessionService sessionService;
@CrossOrigin
@PostMapping(value = "/auth")
public ResponseEntity<Session> authenticate(@RequestBody Session session) {
return sessionService.authenticate(session);
}
}
package com.ascendfinalproject.warehouse.controllers;
import com.ascendfinalproject.warehouse.models.OrderResponse;
import com.ascendfinalproject.warehouse.models.Session;
import com.ascendfinalproject.warehouse.models.WarehouseOrder;
import com.ascendfinalproject.warehouse.services.SessionService;
import com.ascendfinalproject.warehouse.services.WarehouseOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.Order;
......
package com.ascendfinalproject.warehouse.models;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.annotation.Id;
@Getter
@Setter
public class Session {
@Id
private String token;
}
package com.ascendfinalproject.warehouse.repositories;
import com.ascendfinalproject.warehouse.models.Session;
import org.springframework.data.repository.CrudRepository;
public interface SessionRepository extends CrudRepository<Session, String> {
}
package com.ascendfinalproject.warehouse.services;
import com.ascendfinalproject.warehouse.models.Session;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import java.net.HttpURLConnection;
import java.net.URL;
@Service
public class SessionService {
public ResponseEntity<Session> authenticate(Session session) {
int status = 404;
try {
URL url = new URL("https://oauth2.googleapis.com/tokeninfo?id_token=" + session.getToken());
HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("GET");
status = con.getResponseCode();
}
catch(Exception e) {
System.out.println("Bad Request: " + status);
}
if(status == 200) {
return ResponseEntity
.status(HttpStatus.ACCEPTED)
.body(session);
}
return ResponseEntity
.status(HttpStatus.BAD_REQUEST)
.body(null);
}
}
......@@ -43,13 +43,12 @@ public class WarehouseOrderService {
}
public Mono<WarehouseOrder> updateOrder(WarehouseOrder order, String id) {
return orderRepository.findById(id)
.flatMap(existingOrder -> {
existingOrder.setStatus(order.getStatus());
existingOrder.setModifiedAt(new Date(System.currentTimeMillis()));
return orderRepository.save(existingOrder);
});
return orderRepository.findById(id)
.flatMap(existingOrder -> {
existingOrder.setStatus(order.getStatus());
existingOrder.setModifiedAt(new Date(System.currentTimeMillis()));
return orderRepository.save(existingOrder);
});
}
public Mono<Void> deleteOrder(String id) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment