Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all sample codes to add await and async for initialize function #1008

Merged
merged 11 commits into from
Nov 21, 2023
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class AppInMeeting extends Component {
}

// Allows us to execute the React code when the component is already placed in the DOM.
componentDidMount() {
microsoftTeams.app.initialize();
async componentDidMount() {
await microsoftTeams.app.initialize();
}

// Share the content to meeting stage view.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Licensed under the MIT license.
// </copyright>

import * as React from "react";
import React, { useEffect } from 'react';
import { BrowserRouter, Route, Routes } from "react-router-dom";
import AppInMeeting from "../components/app-in-meeting";
import Configure from "../components/configure";
Expand All @@ -15,10 +15,11 @@ import AuthStart from "../components/auth-start";
import AuthEnd from "../components/auth-end";
export const AppRoute = () => {

React.useEffect(() => {
microsoftTeams.app.initialize();

}, [])
useEffect(() => {
(async function () {
await microsoftTeams.app.initialize();
})();
}, []);

return (
<React.Fragment>
Expand Down
11 changes: 6 additions & 5 deletions samples/app-anonymous-users/nodejs/ClientApp/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Licensed under the MIT license.
// </copyright>

import * as React from "react";
import React, { useEffect } from 'react';
import { BrowserRouter, Route, Routes } from "react-router-dom";
import AppInMeeting from "./components/app-in-meeting";
import Configure from "./components/configure";
Expand All @@ -15,10 +15,11 @@ import AuthStart from "./components/auth-start";
import AuthEnd from "./components/auth-end";
export const AppRoute = () => {

React.useEffect(() => {
microsoftTeams.app.initialize();

}, [])
useEffect(() => {
(async function () {
await microsoftTeams.app.initialize();
})();
}, []);

return (
<React.Fragment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ import { Button } from '@fluentui/react-components';
const AppInMeeting = () => {

// Allows us to execute the React code when the component is already placed in the DOM.
useEffect(() => {
microsoftTeams.app.initialize();
}, [])
useEffect(() => {
(async function () {
await microsoftTeams.app.initialize();
})();
}, []);

// Share the content to meeting stage view.
const shareSpecificPart = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,16 @@ const ShareView = () => {
const [ssoAuthenticationButtonVisible, setIsSsoAuthenticationButtonVisible] = useState(true);

useEffect(() => {
microsoftTeams.app.initialize();
verifyAnonymousUser();
microsoftTeams.app.initialize().then(() => {
verifyAnonymousUser();
});
}, [])

// Builds the socket connection, mapping it to /io
useEffect(() => {
microsoftTeams.app.initialize();
setSocket(io());
microsoftTeams.app.initialize().then(() => {
setSocket(io());
});
}, []);

// subscribe to the socket event
Expand Down
3 changes: 2 additions & 1 deletion samples/app-auth/nodejs/views/AuthTab.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
crossorigin="anonymous"></script>

<script type="text/javascript">
microsoftTeams.app.initialize();
microsoftTeams.app.initialize().then(() => {
});

// Trying to silently login using SSO
showUserInformationUsingSSO();
Expand Down
3 changes: 2 additions & 1 deletion samples/app-auth/nodejs/views/silent-end.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
<script type="text/javascript">
microsoftTeams.app.initialize();
microsoftTeams.app.initialize().then(() => {

// MSAL.js configuration
let msalConfig = {
Expand Down Expand Up @@ -33,4 +33,5 @@
microsoftTeams.authentication.notifyFailure(error);
return;
});
});
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
<script>
microsoftTeams.app.initialize();
microsoftTeams.app.initialize().then(() => {
function ssoLogin(){
microsoftTeams.authentication.notifySuccess('sso');
}
function facebookLogin() {
microsoftTeams.authentication.notifySuccess('facebooklogin');
}
function usingCredentialsLogin() {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove extra line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

function ssoLogin(){
microsoftTeams.authentication.notifySuccess('sso');
}
function facebookLogin() {
microsoftTeams.authentication.notifySuccess('facebooklogin');
}
function usingCredentialsLogin() {

microsoftTeams.authentication.notifySuccess('usercredentials');
}
microsoftTeams.authentication.notifySuccess('usercredentials');
}
});
</script>

<style>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
<script type="text/javascript">
$(document).ready(function () {
microsoftTeams.app.initialize().then(() => {
getAuthToken();
});
});

// Get face book client side token.
function getAuthToken() {
microsoftTeams.app.initialize();
localStorage.removeItem("auth.error");
let code = getHashParameters();
let key = "auth.result";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,75 +14,76 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
<script>
var requestFrom;
$(document).ready(function () {
$(document).ready(function () {
microsoftTeams.app.initialize().then(() => {
const params = window.location.search;
requestFrom = params.substring(params.search("=")+1);
});
});
});

microsoftTeams.app.initialize();

// Submit user name and password.
function submit()
{
var isValid = true;
$('#userName,#password').each(function () {

// Submit user name and password.
function submit()
{
var isValid = true;
$('#userName,#password').each(function () {

if ($.trim($(this).val()) == '') {
isValid = false;
$(this).css({
"border": "1px solid red"
});
}
else {
$(this).css({
"border": "",
"background": ""
});
}
});
if ($.trim($(this).val()) == '') {
isValid = false;
$(this).css({
"border": "1px solid red"
});
}
else {
$(this).css({
"border": "",
"background": ""
});
}
});

if (isValid == false) {
e.preventDefault();
return false;
}
if (isValid == false) {
e.preventDefault();
return false;
}

let credentials = {
userName: $('#userName').val(),
password: $('#password').val(),
};
let credentials = {
userName: $('#userName').val(),
password: $('#password').val(),
};

if(requestFrom == "tab"){
$.ajax({
type: 'POST',
url: '/tabCredentialsAuth',
dataType: 'json',
data: credentials,
success: function (response) {
microsoftTeams.authentication.notifySuccess(response);
},
error: function (xhr, textStatus, errorThrown) {
console.log("textStatus: " + textStatus + ", errorThrown:" + errorThrown);
},
});
}
else if(requestFrom == "msgext"){
microsoftTeams.authentication.notifySuccess(JSON.stringify(credentials));
}
else{
microsoftTeams.authentication.notifySuccess(JSON.stringify(credentials));
}
}
if(requestFrom == "tab"){
$.ajax({
type: 'POST',
url: '/tabCredentialsAuth',
dataType: 'json',
data: credentials,
success: function (response) {
microsoftTeams.authentication.notifySuccess(response);
},
error: function (xhr, textStatus, errorThrown) {
console.log("textStatus: " + textStatus + ", errorThrown:" + errorThrown);
},
});
}
else if(requestFrom == "msgext"){
microsoftTeams.authentication.notifySuccess(JSON.stringify(credentials));
}
else{
microsoftTeams.authentication.notifySuccess(JSON.stringify(credentials));
}
}

// Close auth window.
function closeWindow() {
microsoftTeams.authentication.notifyFailure({state:"CancelledByUser"});
}
// Close auth window.
function closeWindow() {
microsoftTeams.authentication.notifyFailure({state:"CancelledByUser"});
}

function showHint() {
var x = document.getElementById("snackbar");
x.className = "show";
setTimeout(function () { x.className = x.className.replace("show", ""); }, 3000);
}
function showHint() {
var x = document.getElementById("snackbar");
x.className = "show";
setTimeout(function () { x.className = x.className.replace("show", ""); }, 3000);
}
</script>

<style>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
let showFbToggle = false;
let showUserToggle = false;
let hostClientType;
microsoftTeams.app.initialize();

$(document).ready(function () {
microsoftTeams.app.initialize().then(() => {
microsoftTeams.app.getContext().then((context) => {
Expand Down
1 change: 0 additions & 1 deletion samples/app-complete-auth/nodejs/views/AuthTab.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
});
});

microsoftTeams.app.initialize();
ssoAuthentication = () => {
getClientSideToken()
.then((clientSideToken) => {
Expand Down
3 changes: 2 additions & 1 deletion samples/app-complete-auth/nodejs/views/config.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
<script>
microsoftTeams.app.initialize();
microsoftTeams.app.initialize().then(() => {
function ssoLogin(){
microsoftTeams.authentication.notifySuccess('sso');
}
Expand All @@ -17,6 +17,7 @@
function usingCredentialsLogin() {
microsoftTeams.authentication.notifySuccess('usercredentials');
}
});
</script>

<style>
Expand Down
3 changes: 2 additions & 1 deletion samples/app-complete-auth/nodejs/views/fb-auth.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
integrity="sha384-lIk8T3uMxKqXQVVfFbiw0K/Nq+kt1P3NtGt/pNexiDby2rKU6xnDY8p16gIwKqgI" ,
crossorigin="anonymous"></script>
<script>
microsoftTeams.app.initialize();
microsoftTeams.app.initialize().then(() => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please try once with await microsoftTeams.app.initialize()

});
localStorage.removeItem("auth.error");
let code = getHashParameters();
let key = "auth.result";
Expand Down
7 changes: 4 additions & 3 deletions samples/app-complete-auth/nodejs/views/popUpSignin.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
<script>
var requestFrom;
$(document).ready(function () {
const params = window.location.search;
requestFrom = params.substring(params.search("=") + 1);
microsoftTeams.app.initialize().then(() => {
const params = window.location.search;
requestFrom = params.substring(params.search("=") + 1);
});
});
microsoftTeams.app.initialize();
function submit() {
var isValid = true;
$('#userName,#password').each(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
<button onclick="selectHeroCards()">Hero Cards</button>
<script>
$(document).ready(function () {
microsoftTeams.app.initialize();
microsoftTeams.app.initialize().then(() => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please try once with await microsoftTeams.app.initialize()

});
});

function selectThumbnailCards() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
<script src="https://res.cdn.office.net/teams-js/2.0.0/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>

<script>
microsoftTeams.app.initialize();
microsoftTeams.app.initialize().then(() => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please try once with await microsoftTeams.app.initialize()

});
function submit()
{
microsoftTeams.authentication.notifySuccess('PopUpSignInAuthenticationSuccess');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<button onclick="selectThumbnailCards()">Thumbnail Cards</button>
<button onclick="selectHeroCards()">Hero Cards</button>
<script>
$(document).ready(function () {
microsoftTeams.app.initialize();
$(document).ready(async function () {
await microsoftTeams.app.initialize();
});

function selectThumbnailCards() {
Expand Down
Loading
Loading