identity: auto enable 2fa by email on self hosted instance

Notesnook.API/Dockerfile

@@ -27,11 +27,13 @@ RUN dotnet build -c Release -o /app/build -a $TARGETARCH
 
 FROM build AS publish
 RUN dotnet publish -c Release -o /app/publish \
-    #--runtime alpine-x64 \
-    --self-contained true \
-    /p:PublishTrimmed=true \
-    /p:PublishSingleFile=true \
-    -a $TARGETARCH
+  #--runtime alpine-x64 \
+  --self-contained true \
+  /p:TrimMode=partial \
+  /p:PublishTrimmed=true \
+  /p:PublishSingleFile=true \
+  /p:JsonSerializerIsReflectionEnabledByDefault=true \
+  -a $TARGETARCH
 
 FROM --platform=$BUILDPLATFORM base AS final
 ARG TARGETARCH

README.md

@@ -8,7 +8,7 @@ This repo contains the full source code of the Notesnook Sync Server licensed un
 
 Requirements:
 
-1. [.NET 7](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)
+1. [.NET 8](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
 2. [git](https://git-scm.com/downloads)
 
 The first step is to `clone` the repository:
@@ -55,19 +55,14 @@ dotnet run --project Streetwriters.Identity/Streetwriters.Identity.csproj
 
 The sync server can easily be started using Docker.
 
-The first step is to `clone` the repository:
-
 ```bash
-git clone https://github.com/streetwriters/notesnook-sync-server.git
-
-# change directory
-cd notesnook-sync-server
+wget https://raw.githubusercontent.com/streetwriters/notesnook-sync-server/master/docker-compose.yml
 ```
 
 And then use Docker Compose to start the servers:
 
 ```bash
-docker-compose up
+docker compose up
 ```
 
 This takes care of setting up everything including MongoDB, Minio etc.
@@ -81,7 +76,7 @@ This takes care of setting up everything including MongoDB, Minio etc.
 - [x] Open source the SSE Messaging infrastructure
 - [x] Fully Dockerize all services
 - [x] Use self-hosted Minio for S3 storage
-- [ ] Publish on DockerHub
+- [x] Publish on DockerHub
 - [ ] Write self hosting docs
 - [ ] Add settings to change server URLs in Notesnook client apps
 

Streetwriters.Identity/Controllers/SignupController.cs

@@ -26,6 +26,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Streetwriters.Common;
+using Streetwriters.Common.Enums;
 using Streetwriters.Common.Models;
 using Streetwriters.Identity.Enums;
 using Streetwriters.Identity.Interfaces;
@@ -68,7 +69,7 @@ namespace Streetwriters.Identity.Controllers
                 var result = await UserManager.CreateAsync(new User
                 {
                     Email = form.Email,
-                    EmailConfirmed = false,
+                    EmailConfirmed = Constants.IS_SELF_HOSTED,
                     UserName = form.Username ?? form.Email,
                 }, form.Password);
 
@@ -101,15 +102,19 @@ namespace Streetwriters.Identity.Controllers
                 if (result.Succeeded)
                 {
                     var user = await UserManager.FindByEmailAsync(form.Email);
-
                     await UserManager.AddToRoleAsync(user, client.Id);
                     if (Constants.IS_SELF_HOSTED)
+                    {
                         await UserManager.AddClaimAsync(user, UserService.SubscriptionTypeToClaim(client.Id, Common.Enums.SubscriptionType.PREMIUM));
-                    await UserManager.AddClaimAsync(user, new Claim("platform", PlatformFromUserAgent(base.HttpContext.Request.Headers.UserAgent)));
-
-                    var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
-                    var callbackUrl = Url.TokenLink(user.Id.ToString(), code, client.Id, TokenType.CONFRIM_EMAIL, Request.Scheme);
-                    await EmailSender.SendConfirmationEmailAsync(user.Email, callbackUrl, client);
+                        await MFAService.EnableMFAAsync(user, MFAMethods.Email);
+                    }
+                    else
+                    {
+                        await UserManager.AddClaimAsync(user, new Claim("platform", PlatformFromUserAgent(base.HttpContext.Request.Headers.UserAgent)));
+                        var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
+                        var callbackUrl = Url.TokenLink(user.Id.ToString(), code, client.Id, TokenType.CONFRIM_EMAIL, Request.Scheme);
+                        await EmailSender.SendConfirmationEmailAsync(user.Email, callbackUrl, client);
+                    }
                     return Ok(new
                     {
                         userId = user.Id.ToString()

Streetwriters.Identity/Dockerfile

@@ -27,11 +27,13 @@ RUN dotnet build -c Release -o /app/build -a $TARGETARCH
 
 FROM build AS publish
 RUN dotnet publish -c Release -o /app/publish \
-    #--runtime alpine-x64 \
-    --self-contained true \
-    /p:PublishTrimmed=true \
-    /p:PublishSingleFile=true \
-    -a $TARGETARCH
+  #--runtime alpine-x64 \
+  --self-contained true \
+  /p:TrimMode=partial \
+  /p:PublishTrimmed=true \
+  /p:PublishSingleFile=true \
+  /p:JsonSerializerIsReflectionEnabledByDefault=true \
+  -a $TARGETARCH
 
 FROM --platform=$BUILDPLATFORM base AS final
 ARG TARGETARCH

Streetwriters.Messenger/Dockerfile

@@ -27,11 +27,13 @@ RUN dotnet build -c Release -o /app/build -a $TARGETARCH
 
 FROM build AS publish
 RUN dotnet publish -c Release -o /app/publish \
-    #--runtime alpine-x64 \
-    --self-contained true \
-    /p:PublishTrimmed=true \
-    /p:PublishSingleFile=true \
-    -a $TARGETARCH
+  #--runtime alpine-x64 \
+  --self-contained true \
+  /p:TrimMode=partial \
+  /p:PublishTrimmed=true \
+  /p:PublishSingleFile=true \
+  /p:JsonSerializerIsReflectionEnabledByDefault=true \
+  -a $TARGETARCH
 
 FROM --platform=$BUILDPLATFORM base AS final
 ARG TARGETARCH

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.4"
-
 x-server-discovery: &server-discovery
   NOTESNOOK_SERVER_PORT: 80
   NOTESNOOK_SERVER_HOST: notesnook-server
@@ -72,9 +70,7 @@ services:
         mc mb minio/$$S3_BUCKET_NAME -p
 
   identity-server:
-    build:
-      context: .
-      dockerfile: ./Streetwriters.Identity/Dockerfile
+    image: streetwriters/identity:latest
     ports:
       - "8264:80"
     networks:
@@ -94,9 +90,7 @@ services:
       MONGODB_DATABASE_NAME: identity
 
   notesnook-server:
-    build:
-      context: .
-      dockerfile: ./Notesnook.API/Dockerfile
+    image: streetwriters/notesnook-sync:latest
     ports:
       - "5264:80"
     networks:
@@ -114,7 +108,7 @@ services:
       start_period: 60s
     environment:
       <<: *server-discovery
-      MONGODB_CONNECTION_STRING: mongodb://notesnook-db:27017/notesnook?replSet=rs0
+      MONGODB_CONNECTION_STRING: mongodb://notesnook-db:27017/?replSet=rs0
       MONGODB_DATABASE_NAME: notesnook
       S3_INTERNAL_SERVICE_URL: "${S3_SERVICE_URL:-http://notesnook-s3:9000}"
       S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-${MINIO_ROOT_USER:-minioadmin}}"
@@ -124,9 +118,7 @@ services:
       S3_BUCKET_NAME: "${S3_BUCKET_NAME}"
 
   sse-server:
-    build:
-      context: .
-      dockerfile: ./Streetwriters.Messenger/Dockerfile
+    image: streetwriters/sse:latest
     ports:
       - "7264:80"
     env_file: *env-files