Skip to content
Snippets Groups Projects
Unverified Commit 961f9e68 authored by Matej Hrica's avatar Matej Hrica
Browse files

Rename authorization microservice to user microservice

The name is misleading, since Authorization is now taken care of by spring-security using OIDC.
This microservice will provide information about users of this application.
parent 4d6dd6ba
No related branches found
No related tags found
No related merge requests found
Showing
with 37 additions and 38 deletions
......@@ -11,7 +11,7 @@ services:
- "8080:8080"
authorization:
build: "./authorization"
build: "./user"
ports:
- "8083:8083"
......
......@@ -7,11 +7,11 @@
<version>1.0-SNAPSHOT</version>
<modules>
<module>core</module>
<module>authorization</module>
<module>authorization-client</module>
<module>user</module>
<module>report</module>
<module>weather</module>
<module>core-client</module>
<module>user-client</module>
<module>report-client</module>
<module>weather-client</module>
</modules>
......@@ -75,7 +75,7 @@
</dependency>
<dependency>
<groupId>cz.muni.fi.pa165</groupId>
<artifactId>authorization</artifactId>
<artifactId>user</artifactId>
<version>${version}</version>
</dependency>
<dependency>
......
File moved
File moved
......@@ -9,12 +9,12 @@
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>authorization-client</artifactId>
<artifactId>user-client</artifactId>
<version>1.0-SNAPSHOT</version>
<name>authorization-client</name>
<name>user-client</name>
<build>
<finalName>authorization-client-lib</finalName>
<finalName>user-client-lib</finalName>
<defaultGoal>install</defaultGoal>
<plugins>
......@@ -28,11 +28,11 @@
</goals>
<configuration>
<!-- see https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-maven-plugin/README.md -->
<inputSpec>${project.basedir}/../authorization/openapi.yaml</inputSpec>
<inputSpec>${project.basedir}/../user/openapi.yaml</inputSpec>
<generatorName>java</generatorName>
<apiPackage>cz.muni.fi.pa165.authorization.client</apiPackage>
<modelPackage>cz.muni.fi.pa165.authorization.client.model</modelPackage>
<invokerPackage>cz.muni.chat.fi.pa165.authorization.client.invoker</invokerPackage>
<apiPackage>cz.muni.fi.pa165.user.client</apiPackage>
<modelPackage>cz.muni.fi.pa165.user.client.model</modelPackage>
<invokerPackage>cz.muni.chat.fi.pa165.user.client.invoker</invokerPackage>
<verbose>false</verbose>
<generateApiTests>false</generateApiTests>
<generateModelTests>false</generateModelTests>
......
File moved
File moved
File moved
openapi: 3.0.3
info:
title: Airport Manager authorization microservice
description: Airport Manager authorization microservice
title: Airport Manager uesr microservice
description: Airport Manager user microservice
version: 1.0.0
servers:
- url: "{scheme}://{server}:{port}"
......
......@@ -8,10 +8,10 @@
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>authorization</artifactId>
<artifactId>user</artifactId>
<name>authorization</name>
<description>Authorization service for Airport Manager</description>
<name>user</name>
<description>User service for Airport Manager</description>
<dependencies>
......@@ -105,12 +105,12 @@
<configuration>
<inputSpec>${project.basedir}/openapi.yaml</inputSpec>
<generatorName>spring</generatorName>
<apiPackage>cz.muni.fi.pa165.authorization.server.api</apiPackage>
<modelPackage>cz.muni.fi.pa165.authorization.server.model</modelPackage>
<apiPackage>cz.muni.fi.pa165.user.server.api</apiPackage>
<modelPackage>cz.muni.fi.pa165.user.server.model</modelPackage>
<!-- https://openapi-generator.tech/docs/generators/spring -->
<configOptions>
<basePackage>cz.muni.fi.pa165.authorization.server</basePackage>
<configPackage>cz.muni.fi.pa165.authorization.server.config</configPackage>
<basePackage>cz.muni.fi.pa165.user.server</basePackage>
<configPackage>cz.muni.fi.pa165.user.server.config</configPackage>
<useSpringBoot3>true</useSpringBoot3>
<useTags>true</useTags>
<delegatePattern>true</delegatePattern>
......
package cz.muni.fi.pa165.authorization.server.config;
package cz.muni.fi.pa165.user.server.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
......
package cz.muni.fi.pa165.authorization.server.rest;
import cz.muni.fi.pa165.authorization.server.api.UserApiDelegate;
import cz.muni.fi.pa165.authorization.server.model.CreationUserDto;
import cz.muni.fi.pa165.authorization.server.model.LoginDto;
import cz.muni.fi.pa165.authorization.server.model.LoginResponse;
import cz.muni.fi.pa165.authorization.server.model.UserDto;
import cz.muni.fi.pa165.authorization.server.service.UserService;
package cz.muni.fi.pa165.user.server.rest;
import cz.muni.fi.pa165.user.server.api.UserApiDelegate;
import cz.muni.fi.pa165.user.server.model.CreationUserDto;
import cz.muni.fi.pa165.user.server.model.LoginDto;
import cz.muni.fi.pa165.user.server.model.LoginResponse;
import cz.muni.fi.pa165.user.server.model.UserDto;
import cz.muni.fi.pa165.user.server.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
......
package cz.muni.fi.pa165.authorization.server.service;
package cz.muni.fi.pa165.user.server.service;
import cz.muni.fi.pa165.authorization.server.model.CreationUserDto;
import cz.muni.fi.pa165.authorization.server.model.LoginDto;
import cz.muni.fi.pa165.authorization.server.model.LoginResponse;
import cz.muni.fi.pa165.authorization.server.model.UserDto;
import org.springframework.http.ResponseEntity;
import cz.muni.fi.pa165.user.server.model.CreationUserDto;
import cz.muni.fi.pa165.user.server.model.LoginDto;
import cz.muni.fi.pa165.user.server.model.LoginResponse;
import cz.muni.fi.pa165.user.server.model.UserDto;
import org.springframework.stereotype.Service;
import java.util.List;
......
package cz.muni.fi.pa165.authorization.server;
package cz.muni.fi.pa165.user.server;
import com.fasterxml.jackson.databind.ObjectMapper;
import cz.muni.fi.pa165.authorization.server.model.LoginResponse;
import cz.muni.fi.pa165.authorization.server.model.UserDto;
import cz.muni.fi.pa165.user.server.model.LoginResponse;
import cz.muni.fi.pa165.user.server.model.UserDto;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment