|
|
@@ -62,6 +62,8 @@ window.initgui = async function(){
|
|
|
let url = new URL(window.location);
|
|
|
url = url.href;
|
|
|
|
|
|
+ let picked_a_user_for_sdk_login = false;
|
|
|
+
|
|
|
// update SDK if auth_token is different from the one in the SDK
|
|
|
if(window.auth_token && puter.authToken !== window.auth_token)
|
|
|
puter.setAuthToken(window.auth_token);
|
|
|
@@ -168,13 +170,16 @@ window.initgui = async function(){
|
|
|
await getUserAppToken(openerOrigin);
|
|
|
}
|
|
|
else if(action === 'sign-in' && is_auth()){
|
|
|
- if(await UIWindowSessionList({
|
|
|
+ picked_a_user_for_sdk_login = await UIWindowSessionList({
|
|
|
reload_on_success: false,
|
|
|
draggable_body: false,
|
|
|
has_head: false,
|
|
|
cover_page: true,
|
|
|
- }))
|
|
|
+ });
|
|
|
+
|
|
|
+ if(picked_a_user_for_sdk_login){
|
|
|
await getUserAppToken(openerOrigin);
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
}
|
|
|
@@ -252,7 +257,7 @@ window.initgui = async function(){
|
|
|
let response = await checkUserSiteRelationship(openerOrigin);
|
|
|
window.userAppToken = response.token;
|
|
|
|
|
|
- if(logged_in_users.length > 0 && (!userAppToken || url_query_params.get('request_auth') )){
|
|
|
+ if(!picked_a_user_for_sdk_login && logged_in_users.length > 0 && (!userAppToken || url_query_params.get('request_auth') )){
|
|
|
await UIWindowSessionList({
|
|
|
reload_on_success: false,
|
|
|
draggable_body: false,
|
Nariman Jelveh