Merge pull request #565 from narumincho/dev

TOTPでの新規作成

.github/workflows/deploy_to_cloudflare_pages.yaml

@@ -16,12 +16,12 @@ jobs:
           flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
           channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }}
           cache: true
-      - run: flutter build web
+      - run: flutter build web --dart-define=ORIGIN=https://definy.deno.dev
       - name: Deploy to Cloudflare Pages
         uses: cloudflare/pages-action@1
         with:
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           projectName: definy
           directory: ./build/web/
-          gitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          gitHubToken: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -46,3 +46,4 @@ app.*.map.json
 
 /.fvm/flutter_sdk
 /script/startInLocal.ts
+/local.sqlite*

.vscode/launch.json

@@ -16,7 +16,9 @@
         "--inspect",
         "--check",
         "--unstable",
-        "--allow-net=:8000"
+        "--allow-net=:8000",
+        "--allow-read=local.sqlite*",
+        "--allow-write=local.sqlite*"
       ],
       "program": "${workspaceFolder}/script/startInLocal.ts",
       "attachSimplePort": 9229

README.md

@@ -40,7 +40,7 @@ deno run --check --allow-env --allow-net --allow-read --allow-write=./dist.json
 fvm flutter pub run ./lib/codegen.dart && fvm dart fix --apply && fvm dart format .
 ```
 
-### step 1 api gen
+### step 2 api gen
 
 ```sh
 fvm flutter pub run ./lib/codegen_api.dart && fvm dart fix --apply && fvm dart format .
@@ -54,7 +54,9 @@ deno run --allow-run --allow-read ./script/typeCheck.ts
 
 ## フォルダとファイルの説明
 
-- `/.github/workflows/pull_request.yml`: Pull Request
+- `.github/workflows/pull_request.yml`: Pull Request
   したときに実行されるテストの処理が書かれている
-- `/.vscode`: VSCode 向けの設定
-- `/assets`: スタティックなファイルが置かれている
+- `.vscode`: VSCode 向けの設定
+- `assets`: スタティックなファイルが置かれている
+- `local.sqlite`, `local.sqlite-shm`, `local.sqlite-wal`
+  ローカルで開発するときに使うデータベースのファイル

analysis_options.yaml

@@ -43,7 +43,6 @@ linter:
     - tighten_type_of_initializing_formals
     - type_annotate_public_apis
     - unawaited_futures
-    - unnecessary_await_in_return
     - unnecessary_parenthesis
     - unnecessary_raw_strings
     - use_colored_box

lib/codegen.dart

@@ -2,6 +2,7 @@
 
 import 'dart:io';
 
+// ignore: depend_on_referenced_packages
 import 'package:simple_dart_code_gen/simple_dart_code_gen.dart';
 import 'package:simple_graphql_client_gen/simple_graphql_client_gen.dart';
 

lib/codegen_api.dart

@@ -4,21 +4,74 @@ import 'dart:io';
 
 import 'package:definy/graphql/query.dart' as query;
 import 'package:fast_immutable_collections/fast_immutable_collections.dart';
+// ignore: depend_on_referenced_packages
 import 'package:simple_dart_code_gen/simple_dart_code_gen.dart';
 import 'package:simple_graphql_client_gen/query_string.dart';
 import 'package:simple_graphql_client_gen/simple_graphql_client_gen.dart';
 
 const IMap<String, GraphQLRootObject> _apiMap = IMapConst({
   'accountByCode': query.Query(
-    name: 'QueryAccountByCode',
-    IListConst([
-      query.Query_accountByCode(
-        code: Variable('code'),
-        query.Account(IListConst([
-          query.Account_id(),
-        ])),
+    'QueryAccountByCode',
+    IMapConst({}),
+    accountByCode: query.Query_accountByCode(
+      code: Variable('code'),
+      query.Account(
+        'AccountOnlyId',
+        IMapConst({}),
+        id: query.Account_id(),
       ),
-    ]),
+    ),
+  ),
+  'createTotpKey': query.Mutation(
+    'MutationCreateTotpKey',
+    IMapConst({}),
+    createTotpKey: query.Mutation_createTotpKey(query.TotpKeyAndId(
+      'TotpKey',
+      IMapConst({}),
+      id: query.TotpKeyAndId_id(),
+      secret: query.TotpKeyAndId_secret(),
+    )),
+  ),
+  'createAccount': query.Mutation(
+    'QueryCreateAccount',
+    IMapConst({}),
+    createAccount: query.Mutation_createAccount(
+      totpCode: Variable('totpCode'),
+      accountCode: Variable('accountCode'),
+      totpKeyId: Variable('totpKeyId'),
+      displayName: Variable('displayName'),
+      query.CreateAccountResult(
+        createAccountDuplicateCode: query.CreateAccountDuplicateCode(
+          'CreateAccountDuplicateCode',
+          IMapConst({}),
+          accountCode: query.CreateAccountDuplicateCode_accountCode(),
+        ),
+        createAccountInvalidCode: query.CreateAccountInvalidCode(
+          'CreateAccountInvalidCode',
+          IMapConst({}),
+          accountCode: query.CreateAccountInvalidCode_accountCode(),
+        ),
+        createAccountNotFoundTotpKeyId: query.CreateAccountNotFoundTotpKeyId(
+          'CreateAccountNotFoundTotpKeyId',
+          IMapConst({}),
+          keyId: query.CreateAccountNotFoundTotpKeyId_keyId(),
+        ),
+        createAccountResultOk: query.CreateAccountResultOk(
+          'CreateAccountResultOk',
+          IMapConst({}),
+          account: query.CreateAccountResultOk_account(
+            query.Account(
+              'Account',
+              IMapConst({}),
+              id: query.Account_id(),
+              code: query.Account_code(),
+              createDateTime: query.Account_createDateTime(),
+              displayName: query.Account_displayName(),
+            ),
+          ),
+        ),
+      ),
+    ),
   ),
 });
 

lib/env.dart

@@ -0,0 +1,6 @@
+// ignore_for_file: do_not_use_environment
+
+const origin =
+    String.fromEnvironment('ORIGIN', defaultValue: 'http://localhost:8080');
+
+final originUri = Uri.parse(origin);