Merge pull request #6488 from JohnNiang/feat/login-logout-pages

Add support for customizing login and logout pages

api/src/main/java/run/halo/app/core/extension/AuthProvider.java

@@ -48,6 +48,15 @@ public static class AuthProviderSpec {
         @Schema(requiredMode = REQUIRED, description = "Authentication url of the auth provider")
         private String authenticationUrl;
 
+        private String method = "GET";
+
+        private boolean rememberMeSupport = false;
+
+        /**
+         * Auth type: form or oauth2.
+         */
+        private AuthType authType;
+
         private String bindingUrl;
 
         private String unbindUrl;
@@ -77,4 +86,10 @@ public static class ConfigMapRef {
         @Schema(requiredMode = REQUIRED, minLength = 1)
         private String name;
     }
+
+    public enum AuthType {
+        FORM,
+        OAUTH2,
+        ;
+    }
 }

api/src/main/java/run/halo/app/extension/Unstructured.java

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -35,7 +36,12 @@
 @SuppressWarnings("rawtypes")
 public class Unstructured implements Extension {
 
-    public static final ObjectMapper OBJECT_MAPPER = Json.mapper();
+    @SuppressWarnings("deprecation")
+    public static final ObjectMapper OBJECT_MAPPER = Json.mapper()
+        // We don't want to change the default mapper
+        // so we copy a new one and configure it
+        .copy()
+        .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS);
 
     private final Map data;
 

api/src/main/java/run/halo/app/infra/ExternalLinkProcessor.java

@@ -1,5 +1,9 @@
 package run.halo.app.infra;
 
+import java.net.URI;
+import org.springframework.http.HttpRequest;
+import reactor.core.publisher.Mono;
+
 /**
  * {@link ExternalLinkProcessor} to process an in-site link to an external link.
  *
@@ -17,4 +21,18 @@ public interface ExternalLinkProcessor {
      * @return processed link or original link
      */
     String processLink(String link);
+
+    /**
+     * Process the URI to an external URL.
+     * <p>
+     * If the URI is an in-site link, then process it to an external link with
+     * {@link ExternalUrlSupplier#getRaw()} or {@link ExternalUrlSupplier#getURL(HttpRequest)},
+     * otherwise return the original URI.
+     * </p>
+     *
+     * @param uri uri to process
+     * @return processed URI or original URI
+     */
+    Mono<URI> processLink(URI uri);
+
 }

api/src/main/java/run/halo/app/infra/SystemSetting.java

@@ -67,8 +67,8 @@ public static class Basic {
     @Data
     public static class User {
         public static final String GROUP = "user";
-        Boolean allowRegistration;
-        Boolean mustVerifyEmailOnRegistration;
+        boolean allowRegistration;
+        boolean mustVerifyEmailOnRegistration;
         String defaultRole;
         String avatarPolicy;
     }

application/build.gradle

@@ -80,6 +80,10 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'io.projectreactor:reactor-test'
+
+    // webjars
+    runtimeOnly 'org.webjars.npm:jsencrypt:3.3.2'
+    runtimeOnly 'org.webjars.npm:normalize.css:8.0.1'
 }
 
 tasks.register('createChecksums', Checksum) {
@@ -164,4 +168,4 @@ tasks.named('generateOpenApiDocs') {
     outputs.upToDateWhen {
         false
     }
-}
+}