GuzhavinAleksey/Vmeda.Online
1
0
Fork 0
forked from CIT/Vmeda.Online
Code Pull Requests Activity

MOBILE-2161 menu: Support auto-login in embedded menu items

Browse Source
This commit is contained in:
Dani Palou 2018-07-17 16:10:29 +02:00
parent 50637d0377
commit b8cbbd872c
6 changed files with 91 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/classes/site.ts
View File

@ -1221,59 +1221,30 @@ export class CoreSite {
* @return {Promise<InAppBrowserObject|void>} Promise resolved when done. Resolve param is returned only if inApp=true.
*/
openWithAutoLogin(inApp: boolean, url: string, options?: any, alertMessage?: string): Promise<InAppBrowserObject | void> {
// Convenience function to open the URL.
const open = (url): Promise<any> => {
return new Promise<InAppBrowserObject | void>((resolve, reject): void => {
if (modal) {
modal.dismiss();
}
if (alertMessage) {
this.domUtils.showAlert(this.translate.instant('core.notice'), alertMessage, undefined, 3000).then((alert) => {
alert.onDidDismiss(() => {
if (inApp) {
resolve(this.utils.openInApp(url, options));
} else {
resolve(this.utils.openInBrowser(url));
}
});
});
// Get the URL to open.
return this.getAutoLoginUrl(url).then((url) => {
if (!alertMessage) {
// Just open the URL.
if (inApp) {
return this.utils.openInApp(url, options);
} else {
if (inApp) {
resolve(this.utils.openInApp(url, options));
} else {
resolve(this.utils.openInBrowser(url));
}
return this.utils.openInBrowser(url);
}
});
};
if (!this.privateToken || !this.wsAvailable('tool_mobile_get_autologin_key') ||
(this.lastAutoLogin && this.timeUtils.timestamp() - this.lastAutoLogin < CoreConstants.SECONDS_MINUTE * 6)) {
// No private token, WS not available or last auto-login was less than 6 minutes ago.
// Open the final URL without auto-login.
return Promise.resolve(open(url));
}
const userId = this.getUserId(),
params = {
privatetoken: this.privateToken
},
modal = this.domUtils.showModalLoading();
// Use write to not use cache.
return this.write('tool_mobile_get_autologin_key', params).then((data) => {
if (!data.autologinurl || !data.key) {
// Not valid data, open the final URL without auto-login.
return open(url);
}
this.lastAutoLogin = this.timeUtils.timestamp();
// Show an alert first.
return this.domUtils.showAlert(this.translate.instant('core.notice'), alertMessage, undefined, 3000).then((alert) => {
return open(data.autologinurl + '?userid=' + userId + '&key=' + data.key + '&urltogo=' + url);
}).catch(() => {
// Couldn't get autologin key, open the final URL without auto-login.
return open(url);
return new Promise<InAppBrowserObject | void>((resolve, reject): void => {
alert.onDidDismiss(() => {
if (inApp) {
resolve(this.utils.openInApp(url, options));
} else {
resolve(this.utils.openInBrowser(url));
}
});
});
});
});
}
@ -1459,6 +1430,44 @@ export class CoreSite {
return false;
}
/**
* Given a URL, convert it to a URL that will auto-login if supported.
*
* @param {string} url The URL to convert.
* @return {Promise<string>} Promise resolved with the converted URL.
*/
getAutoLoginUrl(url: string): Promise<string> {
if (!this.privateToken || !this.wsAvailable('tool_mobile_get_autologin_key') ||
(this.lastAutoLogin && this.timeUtils.timestamp() - this.lastAutoLogin < CoreConstants.SECONDS_MINUTE * 6)) {
// No private token, WS not available or last auto-login was less than 6 minutes ago. Don't change the URL.
return Promise.resolve(url);
}
const userId = this.getUserId(),
params = {
privatetoken: this.privateToken
},
modal = this.domUtils.showModalLoading();
// Use write to not use cache.
return this.write('tool_mobile_get_autologin_key', params).then((data) => {
if (!data.autologinurl || !data.key) {
// Not valid data, return the same URL.
return url;
}
this.lastAutoLogin = this.timeUtils.timestamp();
return data.autologinurl + '?userid=' + userId + '&key=' + data.key + '&urltogo=' + url;
}).catch(() => {
// Couldn't get autologin key, return the same URL.
return url;
}).finally(() => {
modal.dismiss();
});
}
/**
* Get a version number from a release version.
* If release version is valid but not found in the list of Moodle releases, it will use the last released major version.

2
src/components/loading/core-loading.html
View File

@ -4,7 +4,7 @@
<p class="core-loading-message" *ngIf="message">{{message}}</p>
</span>
</div>
<div #content>
<div #content class="core-loading-content">
<ng-content [@coreShowHideAnimation] *ngIf="hideUntil">
</ng-content>
</div>

7
src/core/mainmenu/providers/mainmenu.ts
View File

@ -139,7 +139,7 @@ export class CoreMainMenuProvider {
if (!data) {
// No valid label, ignore this entry.
return;
continue;
}
}
@ -151,7 +151,10 @@ export class CoreMainMenuProvider {
};
}
return result;
// Remove undefined values.
return result.filter((entry) => {
return typeof entry != 'undefined';
});
});
});
}

4
src/core/viewer/pages/iframe/iframe.html
View File

@ -4,5 +4,7 @@
</ion-navbar>
</ion-header>
<ion-content>
<core-iframe [src]="url"></core-iframe>
<core-loading [hideUntil]="url">
<core-iframe *ngIf="url" [src]="url"></core-iframe>
</core-loading>
</ion-content>

5
src/core/viewer/pages/iframe/iframe.scss Normal file
View File

@ -0,0 +1,5 @@
page-core-viewer-iframe {
core-loading .core-loading-content {
height: 100%;
}
}

22
src/core/viewer/pages/iframe/iframe.ts
View File

@ -14,6 +14,7 @@
import { Component } from '@angular/core';
import { IonicPage, NavParams } from 'ionic-angular';
import { CoreSitesProvider } from '@providers/sites';
/**
* Page to display a URL in an iframe.
@ -27,8 +28,25 @@ export class CoreViewerIframePage {
title: string; // Page title.
url: string; // Iframe URL.
constructor(params: NavParams) {
protected autoLogin; // Whether the URL should be open with auto-login. Accepts the following values:
// "yes" -> Always auto-login.
// "no" -> Never auto-login.
// "check" -> Auto-login only if it points to the current site. Default value.
constructor(params: NavParams, sitesProvider: CoreSitesProvider) {
this.title = params.get('title');
this.url = params.get('url');
this.autoLogin = params.get('autoLogin') || 'check';
const url = params.get('url'),
currentSite = sitesProvider.getCurrentSite();
if (currentSite && (this.autoLogin == 'yes' || (this.autoLogin == 'check' && currentSite.containsUrl(url)))) {
// Format the URL to add auto-login.
currentSite.getAutoLoginUrl(url).then((url) => {
this.url = url;
});
} else {
this.url = url;
}
}
}