belt 0.2.19 → 0.3.1

data/lib/belt/cli.rb

@@ -6,6 +6,7 @@ require_relative 'cli/env_resolver'
 require_relative 'cli/new_command'
 require_relative 'cli/generate_command'
 require_relative 'cli/destroy_command'
+require_relative 'cli/index_command'
 require_relative 'cli/frontend_command'
 require_relative 'cli/frontend_setup_command'
 require_relative 'cli/frontend_deploy_command'

data/lib/belt/inflector.rb

@@ -42,6 +42,14 @@ module Belt
       word.to_s.split('_').map(&:capitalize).join
     end
 
+    # "conversation_id" → "conversationId"
+    def camelize_lower(word)
+      parts = word.to_s.split('_')
+      return word if parts.empty?
+
+      parts.first + parts[1..].map(&:capitalize).join
+    end
+
     # "BlogPost" → "blog_post"
     def underscore(word)
       word.to_s

data/lib/belt/route_dsl.rb

@@ -52,48 +52,46 @@ module Belt
 
   class NestedResourceBuilder
     def initialize(gateway, prefix, collection_prefix, inherited_tables: [], inherited_auth: nil, # rubocop:disable Metrics/ParameterLists
-                   inherited_controller: nil)
+                   inherited_controller: nil, inherited_lambda: nil)
       @gateway = gateway
       @prefix = prefix
       @collection_prefix = collection_prefix
       @inherited_tables = inherited_tables
       @inherited_auth = inherited_auth
       @inherited_controller = inherited_controller
+      @inherited_lambda = inherited_lambda
     end
 
-    def resources(name, options = {})
+    def resources(name, options = {}, &block)
       resource_name = name.to_s
       singular = @gateway.send(:singularize, resource_name)
       param_name = options[:param] || "#{singular}_id"
+      options = options.merge(tables: [resource_name.to_sym]) unless options.key?(:tables)
       options = merge_inherited_options(options)
-      options = @gateway.send(:auto_infer_tables, resource_name, options)
       resource_options = options.merge(route_type: :resources)
       actions = @gateway.send(:determine_actions, options)
 
-      @gateway.send(:add_route, :get, "#{@prefix}/#{resource_name}", resource_options) if actions.include?(:index)
-      @gateway.send(:add_route, :post, "#{@prefix}/#{resource_name}", resource_options) if actions.include?(:create)
-      if actions.include?(:show)
-        @gateway.send(:add_route, :get, "#{@prefix}/#{resource_name}/{#{param_name}}",
-                      resource_options)
-      end
-      if actions.include?(:update)
-        @gateway.send(:add_route, :put, "#{@prefix}/#{resource_name}/{#{param_name}}",
-                      resource_options)
-      end
-      return unless actions.include?(:destroy)
+      add_nested_resource_routes(resource_name, param_name, resource_options, actions)
+      return unless block
 
-      @gateway.send(:add_route, :delete, "#{@prefix}/#{resource_name}/{#{param_name}}",
-                    resource_options)
+      nested_member_prefix = "#{@prefix}/#{resource_name}/{#{param_name}}"
+      nested_collection_prefix = "#{@prefix}/#{resource_name}"
+      nested_builder = NestedResourceBuilder.new(@gateway, nested_member_prefix, nested_collection_prefix,
+                                                 inherited_tables: Array(options[:tables] || []),
+                                                 inherited_auth: options[:auth] || @inherited_auth,
+                                                 inherited_controller: @inherited_controller,
+                                                 inherited_lambda: @inherited_lambda)
+      nested_builder.instance_eval(&block)
     end
 
     def member(&)
       MemberCollectionBuilder.new(@gateway, @prefix, @inherited_tables, @inherited_auth,
-                                  @inherited_controller).instance_eval(&)
+                                  @inherited_controller, @inherited_lambda).instance_eval(&)
     end
 
     def collection(&)
       MemberCollectionBuilder.new(@gateway, @collection_prefix, @inherited_tables,
-                                  @inherited_auth, @inherited_controller).instance_eval(&)
+                                  @inherited_auth, @inherited_controller, @inherited_lambda).instance_eval(&)
     end
 
     %i[get post put delete patch].each do |method|
@@ -107,6 +105,20 @@ module Belt
 
     private
 
+    def add_nested_resource_routes(resource_name, param_name, resource_options, actions)
+      @gateway.send(:add_route, :get, "#{@prefix}/#{resource_name}", resource_options) if actions.include?(:index)
+      @gateway.send(:add_route, :post, "#{@prefix}/#{resource_name}", resource_options) if actions.include?(:create)
+      if actions.include?(:show)
+        @gateway.send(:add_route, :get, "#{@prefix}/#{resource_name}/{#{param_name}}", resource_options)
+      end
+      if actions.include?(:update)
+        @gateway.send(:add_route, :put, "#{@prefix}/#{resource_name}/{#{param_name}}", resource_options)
+      end
+      return unless actions.include?(:destroy)
+
+      @gateway.send(:add_route, :delete, "#{@prefix}/#{resource_name}/{#{param_name}}", resource_options)
+    end
+
     def merge_inherited_options(options)
       result = options.dup
       if @inherited_tables.any?
@@ -115,17 +127,20 @@ module Belt
       end
       result[:auth] ||= @inherited_auth if @inherited_auth
       result[:controller] ||= @inherited_controller if @inherited_controller
+      result[:lambda] ||= @inherited_lambda if @inherited_lambda
       result
     end
   end
 
   class MemberCollectionBuilder
-    def initialize(gateway, prefix, inherited_tables, inherited_auth, inherited_controller = nil)
+    def initialize(gateway, prefix, inherited_tables, inherited_auth, # rubocop:disable Metrics/ParameterLists
+                   inherited_controller = nil, inherited_lambda = nil)
       @gateway = gateway
       @prefix = prefix
       @inherited_tables = inherited_tables
       @inherited_auth = inherited_auth
       @inherited_controller = inherited_controller
+      @inherited_lambda = inherited_lambda
     end
 
     %i[get post put delete patch].each do |method|
@@ -146,6 +161,7 @@ module Belt
       end
       result[:auth] ||= @inherited_auth if @inherited_auth
       result[:controller] ||= @inherited_controller if @inherited_controller
+      result[:lambda] ||= @inherited_lambda if @inherited_lambda
       result
     end
   end
@@ -197,9 +213,11 @@ module Belt
       resource_tables = Array(options[:tables] || [])
       inherited_tables = (@default_tables + resource_tables).uniq
       inherited_auth = options[:auth] || @default_auth
+      inherited_lambda = options[:lambda]
       nested_builder = NestedResourceBuilder.new(self, member_prefix, collection_prefix,
                                                  inherited_tables: inherited_tables,
-                                                 inherited_auth: inherited_auth)
+                                                 inherited_auth: inherited_auth,
+                                                 inherited_lambda: inherited_lambda)
       nested_builder.instance_eval(&)
     end
 
@@ -282,11 +300,15 @@ module Belt
         @dsl
       end
 
-      def namespace(name, options = {}, &)
-        gateway = Belt::ApiGateway.new(name, options)
-        RouteBuilder.new(gateway).instance_eval(&) if block_given?
-        @dsl.api_gateways << gateway
+      # Primary DSL keyword: defines an API Gateway with a default Lambda function.
+      def gateway(name, options = {}, &)
+        gw = Belt::ApiGateway.new(name, options)
+        RouteBuilder.new(gw).instance_eval(&) if block_given?
+        @dsl.api_gateways << gw
       end
+
+      # Legacy alias — existing routes files using `namespace` still work.
+      alias namespace gateway
     end
 
     def routes
@@ -302,11 +324,40 @@ module Belt
         @gateway = gateway
         @scope_prefix = ''
         @scope_module = nil
+        @lambda_target = nil
         @scope_auth = nil
         @scope_tables = []
         @scope_controller = nil
       end
 
+      # Rails-like `namespace` — adds both a path prefix AND a module prefix.
+      # Equivalent to: scope path: "admin", module: "admin"
+      #
+      # Example:
+      #   namespace :admin do
+      #     resources :users   # → /admin/users, controller: "admin/users"
+      #   end
+      def namespace(name, options = {}, &)
+        segment = name.to_s
+        merged = { path: segment, module: segment }.merge(options)
+        scope(merged, &)
+      end
+
+      # Rails-like `scope` — groups routes with shared options (path prefix, module,
+      # auth, tables, controller).
+      #
+      # Examples:
+      #   scope path: "admin" do
+      #     resources :users   # → /admin/users
+      #   end
+      #
+      #   scope module: "v2" do
+      #     resources :users   # → /users, controller: "v2/users"
+      #   end
+      #
+      #   scope path: "v1", module: "v1", auth: :cognito do
+      #     resources :posts   # → /v1/posts, controller: "v1/posts", auth: cognito
+      #   end
       def scope(options = {}, &)
         previous_prefix = @scope_prefix
         previous_module = @scope_module
@@ -314,12 +365,16 @@ module Belt
         previous_tables = @scope_tables
         previous_controller = @scope_controller
 
-        # Nest path segments (Rails-style): scope path: "a" { scope path: "b" } → "a/b"
+        # Nest path segments: scope path: "a" { scope path: "b" } → "a/b"
         if options.key?(:path)
           segment = options[:path].to_s.gsub(%r{^/|/$}, '')
           @scope_prefix = @scope_prefix.to_s.empty? ? segment : "#{@scope_prefix}/#{segment}"
         end
-        @scope_module = options[:module] || @scope_module
+        # Nest module segments: namespace :admin { namespace :v2 } → "admin/v2"
+        if options.key?(:module)
+          mod_segment = options[:module].to_s
+          @scope_module = @scope_module.to_s.empty? ? mod_segment : "#{@scope_module}/#{mod_segment}"
+        end
         @scope_auth = options[:auth] || @scope_auth
         @scope_tables = (@scope_tables + Array(options[:tables] || [])).uniq
         @scope_controller = options[:controller] || @scope_controller
@@ -333,85 +388,76 @@ module Belt
         @scope_controller = previous_controller
       end
 
+      # Target a different Lambda function for enclosed routes.
+      # Routes within this block will have their :lambda field set to `name`.
+      # Does NOT affect path prefixes or controller module resolution.
+      #
+      # Example:
+      #   gateway :api, auth: :cognito do
+      #     resources :posts                # → lambda: "api"
+      #
+      #     function :onboarding do
+      #       resources :stuff              # → lambda: "onboarding"
+      #     end
+      #
+      #     function :custom do
+      #       get '/blah'                   # → lambda: "custom"
+      #     end
+      #   end
+      def function(name, options = {}, &)
+        previous_lambda = @lambda_target
+        @lambda_target = name.to_s
+        # function blocks can also carry auth/tables
+        previous_auth = @scope_auth
+        previous_tables = @scope_tables
+        @scope_auth = options[:auth] if options[:auth]
+        @scope_tables = (@scope_tables + Array(options[:tables] || [])).uniq
+
+        instance_eval(&) if block_given?
+
+        @lambda_target = previous_lambda
+        @scope_auth = previous_auth
+        @scope_tables = previous_tables
+      end
+
       %i[get post put delete patch].each do |method|
         define_method(method) do |path, options = {}|
           full_path = build_path(path)
-          route_options = options.dup
-          route_options[:lambda] ||= @scope_module if @scope_module
-          route_options[:auth] ||= @scope_auth if @scope_auth
-          route_options[:controller] ||= @scope_controller if @scope_controller
-          if @scope_tables.any? || route_options[:tables]
-            route_options[:tables] =
-              (@scope_tables + Array(route_options[:tables] || [])).uniq
-          end
+          route_options = apply_scope_to_route(options)
           @gateway.send(method, full_path, route_options)
         end
       end
 
-      def resources(name, options = {}, &block)
+      def resources(name, options = {}, &)
         options = apply_scope_options(options)
 
-        if @scope_prefix.empty?
-          @gateway.resources(name, options, &block)
-        else
-          # When inside a scope, generate routes with the prefix applied.
-          # Also set the controller explicitly so inference resolves correctly
-          # (e.g., scope "admin" + resources :users → controller "admin/users").
+        if @scope_prefix.empty? && @scope_module.nil?
+          @gateway.resources(name, options, &)
+        elsif @scope_prefix.empty?
           resource_name = name.to_s
-          singular = Belt::Inflector.singularize(resource_name)
-          param_name = options[:param] || "#{singular}_id"
-          controller = "#{@scope_prefix}/#{resource_name}"
-          resource_options = options.merge(route_type: :resources, controller: controller)
-          actions = determine_scoped_actions(options)
-
-          add_scoped_resource_routes(resource_name, param_name, resource_options, actions)
-
-          if block
-            collection_prefix = build_path("/#{resource_name}")
-            member_prefix = build_path("/#{resource_name}/{#{param_name}}")
-            resource_tables = Array(options[:tables] || [])
-            inherited_tables = (@gateway.default_tables + resource_tables).uniq
-            inherited_auth = options[:auth] || @gateway.default_auth
-            nested_builder = NestedResourceBuilder.new(@gateway, member_prefix, collection_prefix,
-                                                       inherited_tables: inherited_tables,
-                                                       inherited_auth: inherited_auth,
-                                                       inherited_controller: controller)
-            nested_builder.instance_eval(&block)
-          end
+          controller = determine_scoped_controller(resource_name)
+          options = options.merge(controller: controller) unless options[:controller]
+          @gateway.resources(name, options, &)
+        else
+          build_scoped_resources(name, options, &)
         end
       end
 
       def resource(name, options = {})
         options = apply_scope_options(options)
 
-        if @scope_prefix.empty?
+        if @scope_prefix.empty? && @scope_module.nil?
           @gateway.resource(name, options)
-        else
+        elsif @scope_prefix.empty?
           resource_name = name.to_s
-          controller = "#{@scope_prefix}/#{resource_name}"
-          resource_options = options.merge(route_type: :resource, controller: controller)
-          actions = determine_scoped_actions(options, default: %i[show update destroy create])
-
-          @gateway.send(:add_route, :get, build_path("/#{resource_name}"), resource_options) if actions.include?(:show)
-          if actions.include?(:update)
-            @gateway.send(:add_route, :put, build_path("/#{resource_name}"),
-                          resource_options)
-          end
-          if actions.include?(:destroy)
-            @gateway.send(:add_route, :delete, build_path("/#{resource_name}"),
-                          resource_options)
-          end
-          if actions.include?(:create)
-            @gateway.send(:add_route, :post, build_path("/#{resource_name}"),
-                          resource_options)
-          end
+          controller = determine_scoped_controller(resource_name)
+          options = options.merge(controller: controller) unless options[:controller]
+          @gateway.resource(name, options)
+        else
+          build_scoped_resource(name, options)
         end
       end
 
-      def lambda(name, &)
-        name
-      end
-
       def mount(mountable, options = {})
         prefix = options[:at]&.to_s&.gsub(%r{^/|/$}, '') || ''
         extra_tables = Array(options[:tables] || [])
@@ -456,6 +502,16 @@ module Belt
         @scope_prefix.empty? ? path : "/#{@scope_prefix}#{path}"
       end
 
+      def determine_scoped_controller(resource_name)
+        if @scope_module && !@scope_module.empty?
+          "#{@scope_module}/#{resource_name}"
+        elsif !@scope_prefix.empty?
+          "#{@scope_prefix}/#{resource_name}"
+        else
+          resource_name
+        end
+      end
+
       def determine_scoped_actions(options, default: %i[index create show update destroy])
         if options[:only]
           Array(options[:only])
@@ -480,10 +536,65 @@ module Belt
         @gateway.send(:add_route, :delete, build_path("/#{resource_name}/{#{param_name}}"), resource_options)
       end
 
+      def build_scoped_resources(name, options, &block)
+        resource_name = name.to_s
+        singular = Belt::Inflector.singularize(resource_name)
+        param_name = options[:param] || "#{singular}_id"
+        controller = options[:controller] || determine_scoped_controller(resource_name)
+        resource_options = options.merge(route_type: :resources, controller: controller)
+        actions = determine_scoped_actions(options)
+
+        add_scoped_resource_routes(resource_name, param_name, resource_options, actions)
+        build_nested_resource_block(resource_name, param_name, options, controller, &block) if block
+      end
+
+      def build_nested_resource_block(resource_name, param_name, options, controller, &)
+        collection_prefix = build_path("/#{resource_name}")
+        member_prefix = build_path("/#{resource_name}/{#{param_name}}")
+        resource_tables = Array(options[:tables] || [])
+        inherited_tables = (@gateway.default_tables + resource_tables).uniq
+        inherited_auth = options[:auth] || @gateway.default_auth
+        nested_builder = NestedResourceBuilder.new(@gateway, member_prefix, collection_prefix,
+                                                   inherited_tables: inherited_tables,
+                                                   inherited_auth: inherited_auth,
+                                                   inherited_controller: controller,
+                                                   inherited_lambda: @lambda_target)
+        nested_builder.instance_eval(&)
+      end
+
+      def build_scoped_resource(name, options)
+        resource_name = name.to_s
+        controller = options[:controller] || determine_scoped_controller(resource_name)
+        resource_options = options.merge(route_type: :resource, controller: controller)
+        actions = determine_scoped_actions(options, default: %i[show update destroy create])
+
+        @gateway.send(:add_route, :get, build_path("/#{resource_name}"), resource_options) if actions.include?(:show)
+        @gateway.send(:add_route, :put, build_path("/#{resource_name}"), resource_options) if actions.include?(:update)
+        if actions.include?(:destroy)
+          @gateway.send(:add_route, :delete, build_path("/#{resource_name}"),
+                        resource_options)
+        end
+        @gateway.send(:add_route, :post, build_path("/#{resource_name}"), resource_options) if actions.include?(:create)
+      end
+
+      def apply_scope_to_route(options)
+        route_options = options.dup
+        # Lambda target: only explicit function block affects it
+        route_options[:lambda] ||= @lambda_target if @lambda_target
+        route_options[:auth] ||= @scope_auth if @scope_auth
+        route_options[:controller] ||= @scope_controller if @scope_controller
+        if @scope_tables.any? || route_options[:tables]
+          route_options[:tables] =
+            (@scope_tables + Array(route_options[:tables] || [])).uniq
+        end
+        route_options
+      end
+
       def apply_scope_options(options)
         result = options.dup
         result[:auth] ||= @scope_auth if @scope_auth
-        result[:lambda] ||= @scope_module if @scope_module
+        # Lambda target: only explicit function block affects it
+        result[:lambda] ||= @lambda_target if @lambda_target
         result[:controller] ||= @scope_controller if @scope_controller
         result[:tables] = (@scope_tables + Array(result[:tables] || [])).uniq if @scope_tables.any? || result[:tables]
         result

data/lib/belt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Belt
-  VERSION = '0.2.19'
+  VERSION = '0.3.1'
 end

data/lib/templates/generate/auth/cognito.tf.erb

@@ -51,9 +51,7 @@ resource "aws_cognito_user_pool_client" "<%= pool[:name] %>" {
 
   explicit_auth_flows = [
     "ALLOW_USER_SRP_AUTH",
-<% if @signup -%>
     "ALLOW_USER_PASSWORD_AUTH",
-<% end -%>
     "ALLOW_REFRESH_TOKEN_AUTH"
   ]
 

data/lib/templates/generate/auth/frontend/ConfirmEmail.jsx

@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { confirmSignUp } from '../lib/auth'
+import { confirmSignUp } from '../../lib/auth'
 
 export default function ConfirmEmail() {
   const params = new URLSearchParams(window.location.search)

data/lib/templates/generate/auth/frontend/Login.jsx

@@ -1,5 +1,6 @@
 import { useState } from 'react'
-import { signIn, completeNewPassword } from '../lib/auth'
+import { signIn, completeNewPassword } from '../../lib/auth'
+import './auth.css'
 
 export default function Login({ onLogin }) {
   const [email, setEmail] = useState('')
@@ -72,9 +73,6 @@ export default function Login({ onLogin }) {
         <button type="submit" disabled={loading}>
           {loading ? 'Signing in...' : 'Sign In'}
         </button>
-        <p className="auth-link">
-          Don't have an account? <a href="/signup">Sign up</a>
-        </p>
       </form>
     </div>
   )

data/lib/templates/generate/auth/frontend/SignUp.jsx

@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { signUp } from '../lib/auth'
+import { signUp } from '../../lib/auth'
 
 export default function SignUp() {
   const [email, setEmail] = useState('')

data/lib/templates/generate/auth/frontend/auth.css

@@ -0,0 +1,157 @@
+.auth-page {
+  --auth-bg: #f6f8fa;
+  --auth-card-bg: #ffffff;
+  --auth-border: #d0d7de;
+  --auth-text: #1f2328;
+  --auth-muted: #656d76;
+  --auth-input-bg: #f6f8fa;
+  --auth-btn: #2da44e;
+  --auth-btn-hover: #2c974b;
+  --auth-btn-disabled-bg: #94d3a2;
+  --auth-btn-disabled-text: #fff;
+  --auth-error-bg: rgba(248, 81, 73, 0.08);
+  --auth-error-border: rgba(248, 81, 73, 0.4);
+  --auth-error-text: #cf222e;
+  --auth-link: #0969da;
+  --auth-focus: #0969da;
+}
+
+@media (prefers-color-scheme: dark) {
+  .auth-page {
+    --auth-bg: #0d1117;
+    --auth-card-bg: #161b22;
+    --auth-border: #30363d;
+    --auth-text: #e6edf3;
+    --auth-muted: #8b949e;
+    --auth-input-bg: #0d1117;
+    --auth-btn: #238636;
+    --auth-btn-hover: #2ea043;
+    --auth-btn-disabled-bg: #21262d;
+    --auth-btn-disabled-text: #484f58;
+    --auth-error-bg: rgba(248, 81, 73, 0.1);
+    --auth-error-border: rgba(248, 81, 73, 0.4);
+    --auth-error-text: #f85149;
+    --auth-link: #58a6ff;
+    --auth-focus: #58a6ff;
+  }
+}
+
+.auth-page {
+  min-height: 100vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: var(--auth-bg);
+  padding: 1rem;
+}
+
+.auth-form {
+  background: var(--auth-card-bg);
+  border: 1px solid var(--auth-border);
+  border-radius: 12px;
+  padding: 2.5rem;
+  width: 100%;
+  max-width: 380px;
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+}
+
+.auth-form h2 {
+  color: var(--auth-text);
+  font-size: 1.5rem;
+  margin: 0 0 0.5rem;
+  text-align: center;
+}
+
+.auth-form p {
+  color: var(--auth-muted);
+  font-size: 0.85rem;
+  text-align: center;
+  margin: 0 0 1.5rem;
+}
+
+.auth-form input {
+  display: block;
+  width: 100%;
+  padding: 0.75rem 1rem;
+  margin-bottom: 0.75rem;
+  background: var(--auth-input-bg);
+  border: 1px solid var(--auth-border);
+  border-radius: 8px;
+  color: var(--auth-text);
+  font-size: 0.9rem;
+  outline: none;
+  transition: border-color 0.2s;
+  box-sizing: border-box;
+}
+
+.auth-form input:focus {
+  border-color: var(--auth-focus);
+}
+
+.auth-form input::placeholder {
+  color: var(--auth-muted);
+}
+
+.auth-form button {
+  display: block;
+  width: 100%;
+  padding: 0.75rem;
+  margin-top: 0.5rem;
+  background: var(--auth-btn);
+  border: none;
+  border-radius: 8px;
+  color: #fff;
+  font-size: 0.9rem;
+  font-weight: 600;
+  cursor: pointer;
+  transition: background 0.2s;
+}
+
+.auth-form button:hover {
+  background: var(--auth-btn-hover);
+}
+
+.auth-form button:disabled {
+  background: var(--auth-btn-disabled-bg);
+  color: var(--auth-btn-disabled-text);
+  cursor: not-allowed;
+}
+
+.auth-error {
+  background: var(--auth-error-bg);
+  border: 1px solid var(--auth-error-border);
+  border-radius: 8px;
+  color: var(--auth-error-text);
+  padding: 0.6rem 0.75rem;
+  font-size: 0.8rem;
+  margin-bottom: 1rem;
+  text-align: center;
+}
+
+.auth-link {
+  color: var(--auth-muted);
+  font-size: 0.8rem;
+  text-align: center;
+  margin-top: 1.25rem !important;
+}
+
+.auth-link a {
+  color: var(--auth-link);
+  text-decoration: none;
+}
+
+.auth-link a:hover {
+  text-decoration: underline;
+}
+
+.auth-btn {
+  display: inline-block;
+  padding: 0.6rem 1.5rem;
+  background: var(--auth-btn);
+  border-radius: 8px;
+  color: #fff;
+  text-decoration: none;
+  font-weight: 600;
+  font-size: 0.85rem;
+  margin-top: 1rem;
+}

data/lib/templates/generate/auth/frontend/auth.js

@@ -55,7 +55,11 @@ export async function completeNewPassword(username, newPassword, session) {
     ChallengeName: 'NEW_PASSWORD_REQUIRED',
     ClientId: CLIENT_ID,
     Session: session,
-    ChallengeResponses: { USERNAME: username, NEW_PASSWORD: newPassword }
+    ChallengeResponses: {
+      USERNAME: username,
+      NEW_PASSWORD: newPassword,
+      'userAttributes.email': username
+    }
   }))
   setTokens(response.AuthenticationResult)
   return { success: true }