mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 05:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Wait to show the auth modal until the sign request has returned

Browse source
This commit is contained in:
Mikayla Maki 2023-03-23 20:34:58 -07:00
parent 15e29d44b9
commit 19cc86a2d4
1 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
crates/copilot/src/copilot.rs
View file

@ -25,17 +25,28 @@ actions!(copilot, [SignIn, SignOut, ToggleAuthStatus]);
pub fn init(client: Arc<Client>, cx: &mut MutableAppContext) { pub fn init(client: Arc<Client>, cx: &mut MutableAppContext) {
let copilot = cx.add_model(|cx| Copilot::start(client.http_client(), cx)); let copilot = cx.add_model(|cx| Copilot::start(client.http_client(), cx));
cx.set_global(copilot.clone()); cx.set_global(copilot.clone());
cx.add_action(|workspace: &mut Workspace, _: &SignIn, cx| { cx.add_action(|_workspace: &mut Workspace, _: &SignIn, cx| {
let copilot = Copilot::global(cx); let copilot = Copilot::global(cx);
if copilot.read(cx).status() == Status::Authorized { if copilot.read(cx).status() == Status::Authorized {
return; return;
} }
if !copilot.read(cx).has_subscription() {
let display_subscription =
cx.subscribe(&copilot, |workspace, _copilot, e, cx| match e {
Event::PromptUserDeviceFlow => {
workspace.toggle_modal(cx, |_workspace, cx| build_auth_modal(cx));
}
});
copilot.update(cx, |copilot, _cx| {
copilot.set_subscription(display_subscription)
})
}
copilot copilot
.update(cx, |copilot, cx| copilot.sign_in(cx)) .update(cx, |copilot, cx| copilot.sign_in(cx))
.detach_and_log_err(cx); .detach_and_log_err(cx);
workspace.toggle_modal(cx, |_workspace, cx| build_auth_modal(cx));
}); });
cx.add_action(|workspace: &mut Workspace, _: &SignOut, cx| { cx.add_action(|workspace: &mut Workspace, _: &SignOut, cx| {
let copilot = Copilot::global(cx); let copilot = Copilot::global(cx);
@ -89,10 +100,7 @@ enum SignInStatus {
#[derive(Debug)] #[derive(Debug)]
pub enum Event { pub enum Event {
PromptUserDeviceFlow { PromptUserDeviceFlow,
user_code: String,
verification_uri: String,
},
} }
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
@ -118,6 +126,7 @@ pub struct Completion {
struct Copilot { struct Copilot {
server: CopilotServer, server: CopilotServer,
_display_subscription: Option<gpui::Subscription>,
} }
impl Entity for Copilot { impl Entity for Copilot {
@ -129,6 +138,15 @@ impl Copilot {
cx.global::<ModelHandle<Self>>().clone() cx.global::<ModelHandle<Self>>().clone()
} }
fn has_subscription(&self) -> bool {
self._display_subscription.is_some()
}
fn set_subscription(&mut self, display_subscription: gpui::Subscription) {
debug_assert!(self._display_subscription.is_none());
self._display_subscription = Some(display_subscription);
}
fn start(http: Arc<dyn HttpClient>, cx: &mut ModelContext<Self>) -> Self { fn start(http: Arc<dyn HttpClient>, cx: &mut ModelContext<Self>) -> Self {
// TODO: Don't eagerly download the LSP // TODO: Don't eagerly download the LSP
cx.spawn(|this, mut cx| async move { cx.spawn(|this, mut cx| async move {
@ -166,6 +184,7 @@ impl Copilot {
Self { Self {
server: CopilotServer::Downloading, server: CopilotServer::Downloading,
_display_subscription: None,
} }
} }
@ -183,6 +202,8 @@ impl Copilot {
flow.verification_uri, flow.verification_uri,
cx, cx,
); );
cx.emit(Event::PromptUserDeviceFlow)
}); });
// TODO: catch an error here and clear the corresponding user code // TODO: catch an error here and clear the corresponding user code
let response = server let response = server