141 user database advanced

docs/source/inc_env_config.rst

@@ -42,6 +42,10 @@ K8s master URL (optional). All variables from https://github.com/fabric8io/kuber
 
 Patterns for allowed origins when the app requires authentication
 
+.. envvar:: NIVIO_AUTH_GITHUB_ALIAS_ATTRIBUTE
+
+GitHub user attribute to use as alias
+
 .. envvar:: NIVIO_AUTH_GITHUB_CLIENT_ID
 
 GitHub app OAuth2 client id
@@ -50,6 +54,10 @@ GitHub app OAuth2 client id
 
 GitHub app OAuth2 client secret
 
+.. envvar:: NIVIO_AUTH_GITHUB_NAME_ATTRIBUTE
+
+GitHub user attribute to use as name
+
 .. envvar:: NIVIO_AUTH_LOGIN_MODE
 
 Authentication mode: none, optional, required

pom.xml

@@ -56,6 +56,13 @@
             <artifactId>spring-boot-starter-oauth2-client</artifactId>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.springframework.security.oauth.boot/spring-security-oauth2-autoconfigure -->
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+            <version>2.6.3</version>
+        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
@@ -294,7 +301,7 @@
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>openapi-generator</artifactId>
-            <version>5.3.1</version>
+            <version>5.3.0</version>
         </dependency>
 
         <!-- dot parsing -->
@@ -304,6 +311,18 @@
             <version>0.18.1</version>
         </dependency>
 
+        <!--        H2 database-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>2.1.210</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>

src/main/java/de/bonndan/nivio/Application.java

@@ -11,4 +11,5 @@ public class Application {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
+
 }

src/main/java/de/bonndan/nivio/appuser/AppUser.java

@@ -0,0 +1,164 @@
+package de.bonndan.nivio.appuser;
+
+import javax.persistence.*;
+
+
+@Entity(name = "AppUser")
+@Table(
+        name = "appUser",
+        uniqueConstraints = {
+                @UniqueConstraint(name = "emailUnique",
+                        columnNames = "email"),
+                @UniqueConstraint(name = "externalIdAndIdProviderUnique",
+                        columnNames = {"externalId", "idProvider"})
+
+        }
+)
+public class AppUser {
+
+    @SequenceGenerator(
+            name = "userSequence",
+            sequenceName = "userSequence",
+            allocationSize = 1
+    )
+    @GeneratedValue(
+            strategy = GenerationType.SEQUENCE,
+            generator = "userSequence"
+    )
+    @Id
+    @Column(
+            name = "id",
+            nullable = false
+    )
+    private Long id;
+
+    @Column(
+            name = "externalId",
+            nullable = false,
+            columnDefinition = "VARCHAR"
+    )
+    private String externalId;
+
+    @Column(
+            name = "idProvider",
+            nullable = false,
+            columnDefinition = "VARCHAR"
+    )
+    private String idProvider;
+
+    @Column(
+            name = "name",
+            columnDefinition = "TEXT"
+    )
+    private String name;
+
+    @Column(
+            name = "alias",
+            nullable = false,
+            columnDefinition = "TEXT"
+    )
+    private String alias;
+
+    @Column(
+            name = "email",
+            columnDefinition = "VARCHAR"
+    )
+    private String email;
+
+    @Column(
+            name = "avatarUrl",
+            columnDefinition = "TEXT"
+    )
+    private String avatarUrl;
+
+    @Column(
+            name = "role",
+            nullable = false,
+            columnDefinition = "TEXT"
+    )
+    @Enumerated(EnumType.STRING)
+    private AppUserRole appUserRole;
+
+    @Column
+    private Boolean locked;
+
+    @Column
+    private Boolean enabled;
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() { return name; }
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getAvatarUrl() {
+        return avatarUrl;
+    }
+
+    public AppUserRole getAppUserRole() {
+        return appUserRole;
+    }
+
+    public String getExternalId() {
+        return externalId;
+    }
+
+    public String getIdProvider() {
+        return idProvider;
+    }
+
+    public Boolean getLocked() {
+        return locked;
+    }
+
+    public Boolean getEnabled() {
+        return enabled;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public void setAvatarUrl(String avatarUrl) {
+        this.avatarUrl = avatarUrl;
+    }
+
+    public void setAppUserRole(AppUserRole appUserRole) {
+        this.appUserRole = appUserRole;
+    }
+
+    public void setLocked(Boolean locked) {
+        this.locked = locked;
+    }
+
+    public void setEnabled(Boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public void setExternalId(String externalId) {
+        this.externalId = externalId;
+    }
+
+    public void setIdProvider(String idProvider) { this.idProvider = idProvider; }
+
+}

src/main/java/de/bonndan/nivio/appuser/AppUserRepository.java

@@ -0,0 +1,15 @@
+package de.bonndan.nivio.appuser;
+
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Optional;
+
+@Repository
+@Transactional(readOnly = true)
+public interface AppUserRepository extends CrudRepository<AppUser, Long> {
+
+    Optional<AppUser> findByExternalIdAndIdProvider(String externalId, String idProvider);
+
+}

src/main/java/de/bonndan/nivio/appuser/AppUserRole.java

@@ -0,0 +1,23 @@
+package de.bonndan.nivio.appuser;
+
+import java.util.Objects;
+
+public enum AppUserRole {
+    USER,
+    ADMIN;
+
+    // declare your defaults with constant values
+    private static final AppUserRole defaultValue = USER;
+
+    // `of` as a substitute for `valueOf` handling the default value
+    public static AppUserRole of(String value) {
+        if (Objects.isNull(value)) {
+            return defaultValue;
+        }
+        else if (!ADMIN.name().equalsIgnoreCase(value)){
+            return defaultValue;
+        }
+        else return AppUserRole.valueOf(value);
+    }
+
+}

src/main/java/de/bonndan/nivio/security/AuthConfigProperties.java

@@ -12,8 +12,6 @@
 
 /**
  * Configuration of authentication and related matters.
- *
- *
  */
 @Configuration
 @ConfigurationProperties("auth")

src/main/java/de/bonndan/nivio/security/CustomOAuth2User.java

@@ -10,30 +10,35 @@
 import org.springframework.security.oauth2.core.user.OAuth2User;
 
 /**
- * Implementation of {@link OAuth2User} which provides an id, alias and avatar url
+ * Implementation of {@link OAuth2User} which provides an alias, name, avatar url, external id, and idProvider
  */
 public class CustomOAuth2User implements OAuth2User {
 
-    private final String id;
-    private final String alias;
     private final String name;
     private final String avatarUrl;
+    @NonNull
+    private final String alias;
+    private final String externalId;
+    private final String idProvider;
     private final Map<String, Object> attributes;
     private final Collection<? extends GrantedAuthority> authorities;
 
-    public CustomOAuth2User(@NonNull final String id,
+    public CustomOAuth2User(@NonNull final String externalId,
                             @NonNull final String alias,
-                            @NonNull final String name,
+                            @Nullable final String name,
                             @NonNull final Map<String, Object> attributes,
                             @NonNull final Collection<? extends GrantedAuthority> authorities,
-                            @Nullable final String avatarUrl
+                            @Nullable final String avatarUrl,
+                            @NonNull final String idProvider
     ) {
-        this.id = Objects.requireNonNull(id, "id must not be null");
-        this.name = Objects.requireNonNull(name, "name must not be null");
+        this.externalId = Objects.requireNonNull(externalId, "id must not be null");
         this.alias = Objects.requireNonNull(alias, "alias must not be null");
         this.attributes = Objects.requireNonNull(attributes, "attributes must not be null");
         this.authorities = Objects.requireNonNull(authorities, "authorities must not be null");
+        this.idProvider = Objects.requireNonNull(idProvider, "idProvider must not be null");
+        this.name = name;
         this.avatarUrl = avatarUrl;
+
     }
 
     @Override
@@ -57,12 +62,17 @@ public String getAvatarUrl() {
     }
 
     @NonNull
-    public String getId() {
-        return id;
+    public String getAlias() {
+        return alias;
     }
 
     @NonNull
-    public String getAlias() {
-        return alias;
+    public String getIdProvider() {
+        return idProvider;
+    }
+
+    @NonNull
+    public String getExternalId() {
+        return externalId;
     }
-}
+}