Merge pull request #222 from Muska-Ami/dev

Upgrade to v1.0.0+2

Author: Muska-Ami

Diff for: RELEASE_CHANGELOG.md

@@ -4,18 +4,11 @@
 
 ### GUI
 
-- 一些逻辑改动和界面优化 
+- 修改回调地址
 
 ### CLI
 
-- 移除了 `login` 指令参数
-- 添加 `authorize` 指令参数
-
-### 其他
-
-#### NyaLCF Core
-
-- 适配 API v2.2.0
+- 添加回调提示
 
 ## 版本信息
 

Diff for: nyalcf_cli/lib/commands/authorize.dart

@@ -4,21 +4,19 @@ import 'dart:io';
 
 // Package imports:
 import 'package:crypto/crypto.dart';
+// Project imports:
+import 'package:nyalcf/templates/command.dart';
 import 'package:nyalcf_core/models/user_info_model.dart';
 import 'package:nyalcf_core/network/client/api/auth/oauth/access_token.dart';
+import 'package:nyalcf_core/network/client/api/user/frp/token.dart'
+    as user_frp_token;
 import 'package:nyalcf_core/network/client/api/user/info.dart' as user_info;
 import 'package:nyalcf_core/network/client/api_client.dart';
 import 'package:nyalcf_core/network/server/oauth.dart';
 import 'package:nyalcf_core/storages/stores/user_info_storage.dart';
 import 'package:nyalcf_core/utils/logger.dart';
 import 'package:nyalcf_core_extend/storages/token_storage.dart';
 
-// Project imports:
-import 'package:nyalcf/templates/command.dart';
-
-import 'package:nyalcf_core/network/client/api/user/frp/token.dart'
-    as user_frp_token;
-
 class Authorize implements Command {
   static final _tokenStorage = TokenStorage();
 
@@ -30,8 +28,19 @@ class Authorize implements Command {
     final ApiClient api = ApiClient();
 
     await startHttpServer();
+    Logger.info(
+      'Please open this link to authorize: '
+      'http://dashboard.locyanfrp.cn/auth/oauth/authorize'
+      '?app_id=1'
+      '&scopes=User,Proxy,Sign'
+      '&redirect_url='
+      'https%3A%2F%2Fdashboard.locyanfrp.cn%2Fcallback%2Fauth%2Foauth%2Flocalhost%3Fport%3D21131%26ssl%3Dfalse%26path%3D%2Foauth%2Fcallback',
+    );
     Logger.write('Waiting callback...');
-    while (!_callback) {}
+    Future.doWhile(() async {
+      await Future.delayed(const Duration(milliseconds: 1000)); // 延迟检查
+      return !_callback;
+    });
     if (_refreshToken == null) exit(1);
     final rs = await api.post(PostAccessToken(
       appId: 1,

Diff for: nyalcf_cli/pubspec.lock

@@ -54,14 +54,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
   collection:
     dependency: transitive
     description:
@@ -134,11 +126,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.1"
-  flutter:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
   frontend_server_client:
     dependency: transitive
     description:
@@ -243,14 +230,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.12.16+1"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
   meta:
     dependency: transitive
     description:
@@ -375,11 +354,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
   source_map_stack_trace:
     dependency: transitive
     description:
@@ -476,14 +450,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
   vm_service:
     dependency: transitive
     description:

Diff for: nyalcf_cli/pubspec.yaml

@@ -1,6 +1,6 @@
 name: nyalcf
 description: "[CLI]The next generation of LoCyanFrp launcher."
-version: 1.0.0+1
+version: 1.0.0+2
 homepage: https://nyalcf.1l1.icu
 publish_to: none
 # repository: https://github.com/my_org/my_repo

Diff for: nyalcf_gui/nyalcf_ui/lib/views/auth/authorize.dart

@@ -1,11 +1,10 @@
 // Dart imports:
 import 'dart:convert';
 
-// Flutter imports:
-import 'package:flutter/material.dart';
-
 // Package imports:
 import 'package:crypto/crypto.dart';
+// Flutter imports:
+import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:nyalcf_core/models/user_info_model.dart';
 import 'package:nyalcf_core/network/client/api/auth/oauth/access_token.dart';
@@ -15,12 +14,11 @@ import 'package:nyalcf_core/network/client/api_client.dart';
 import 'package:nyalcf_core/network/server/oauth.dart';
 import 'package:nyalcf_core_extend/storages/prefs/token_info_prefs.dart';
 import 'package:nyalcf_core_extend/storages/prefs/user_info_prefs.dart';
-import 'package:url_launcher/url_launcher.dart';
-
 // Project imports:
 import 'package:nyalcf_ui/models/appbar_actions.dart';
 import 'package:nyalcf_ui/widgets/nya_loading_circle.dart';
 import 'package:nyalcf_ui/widgets/nya_scaffold.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class AuthorizeUI extends StatefulWidget {
   const AuthorizeUI({super.key});
@@ -111,7 +109,8 @@ class _AuthorizeState extends State<AuthorizeUI> {
     const url = 'https://dashboard.locyanfrp.cn/auth/oauth/authorize'
         '?app_id=1'
         '&scopes=User,Proxy,Sign'
-        '&redirect_url=http://localhost:21131/oauth/callback';
+        '&redirect_url='
+        'https%3A%2F%2Fdashboard.locyanfrp.cn%2Fcallback%2Fauth%2Foauth%2Flocalhost%3Fport%3D21131%26ssl%3Dfalse%26path%3D%2Foauth%2Fcallback';
     launchUrl(Uri.parse(url));
     OAuth.initRoute(
       response: OAuthResponseBody(success: '授权成功', error: '授权失败'),

Diff for: nyalcf_gui/pubspec.yaml

@@ -1,6 +1,6 @@
 name: nyalcf
 description: "[GUI]The next generation of LoCyanFrp launcher."
-version: 1.0.0+1
+version: 1.0.0+2
 homepage: https://nyalcf.1l1.icu
 publish_to: 'none'