Skip to content

Commit 52f90c3

Browse files
committed
Merge pull request #1 from oneall/master
Include changes
2 parents 07430b6 + 5ce7266 commit 52f90c3

File tree

5 files changed

+71
-5
lines changed

5 files changed

+71
-5
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
bin
2+
obj
3+
.suo

Demo/Social.aspx.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ protected void Page_Load(object sender, EventArgs e)
3838
if (responseUser != null && responseUser.Result != null && responseUser.Result.Data != null)
3939
{
4040
User oneAllUser = responseUser.Result.Data.User;
41-
if (oneAllUser != null && oneAllUser.Identities != null && oneAllUser.Identities.Identity != null)
41+
if (oneAllUser != null && oneAllUser.Identities != null && oneAllUser.Identities[0] != null)
4242
{
43-
Identity oneAllId = oneAllUser.Identities.Identity.FirstOrDefault();
43+
Identity oneAllId = oneAllUser.Identities[0];
4444
if (oneAllId != null)
4545
{
4646
_labelSocialName.Text = oneAllId.DisplayName;
@@ -57,4 +57,4 @@ protected void Page_Load(object sender, EventArgs e)
5757
}
5858
}
5959
}
60-
}
60+
}

Help/OneAll.chm

697 KB
Binary file not shown.

OneAll.shfbproj

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3+
<PropertyGroup>
4+
<!-- The configuration and platform will be used to determine which assemblies to include from solution and
5+
project documentation sources -->
6+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8+
<SchemaVersion>2.0</SchemaVersion>
9+
<ProjectGuid>{a17a52b5-9521-47e5-bc00-3616a6f1e216}</ProjectGuid>
10+
<SHFBSchemaVersion>1.9.9.0</SHFBSchemaVersion>
11+
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual Studio adds them anyway -->
12+
<AssemblyName>Documentation</AssemblyName>
13+
<RootNamespace>Documentation</RootNamespace>
14+
<Name>Documentation</Name>
15+
<!-- SHFB properties -->
16+
<FrameworkVersion>.NET Framework 4.0</FrameworkVersion>
17+
<OutputPath>.\Help\</OutputPath>
18+
<HtmlHelpName>OneAll</HtmlHelpName>
19+
<Language>en-US</Language>
20+
<DocumentationSources>
21+
<DocumentationSource sourceFile="Source\OneAll.csproj" />
22+
</DocumentationSources>
23+
<ProjectSummary>The .Net OneAll SDK originally created by me at XPG. Contains code examples that show you how to use OneAll REST API and how to implement and customize Social Login on your own website. The OneAll.Net SDK supports single and multiple OneAll REST API connections simultaneously. It also includes extension methods for use in ASP.Net Web Pages as well as extensions for .Net MVC Razor Engine and a singleton API class for easy server side interaction. Full CHM documentation is included.</ProjectSummary>
24+
<BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
25+
<HelpFileFormat>HtmlHelp1</HelpFileFormat>
26+
<IndentHtml>False</IndentHtml>
27+
<KeepLogFile>False</KeepLogFile>
28+
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
29+
<CppCommentsFixup>False</CppCommentsFixup>
30+
<CleanIntermediates>True</CleanIntermediates>
31+
<MaximumGroupParts>2</MaximumGroupParts>
32+
<NamespaceGrouping>False</NamespaceGrouping>
33+
<SyntaxFilters>Standard</SyntaxFilters>
34+
<SdkLinkTarget>Blank</SdkLinkTarget>
35+
<RootNamespaceContainer>False</RootNamespaceContainer>
36+
<PresentationStyle>VS2013</PresentationStyle>
37+
<Preliminary>False</Preliminary>
38+
<NamingMethod>Guid</NamingMethod>
39+
<HelpTitle>OneAll API Class Library Help</HelpTitle>
40+
<ContentPlacement>AboveNamespaces</ContentPlacement>
41+
<VisibleItems>Protected, ProtectedInternalAsProtected</VisibleItems>
42+
</PropertyGroup>
43+
<!-- There are no properties for these groups. AnyCPU needs to appear in order for Visual Studio to perform
44+
the build. The others are optional common platform types that may appear. -->
45+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
46+
</PropertyGroup>
47+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48+
</PropertyGroup>
49+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
50+
</PropertyGroup>
51+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
52+
</PropertyGroup>
53+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
54+
</PropertyGroup>
55+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
56+
</PropertyGroup>
57+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
58+
</PropertyGroup>
59+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
60+
</PropertyGroup>
61+
<!-- Import the SHFB build targets -->
62+
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
63+
</Project>

Source/OneAllAPI.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ public Response<PostResult> UserPublishContent(Guid token, PostMessage message)
647647
/// <code lang="cs">
648648
/// <![CDATA[
649649
/// Guid userToken = new Guid("D2B5F3A5-3834-4EBA-B76F-369EDD01F499"); // This is a fictitious token and will return an error.
650-
/// Response<UserResult> response = OneAllAPI.Default.UserReadDetails(userToken);
650+
/// Response<ContactsResult> response = OneAllAPI.Default.UserReadContacts(userToken);
651651
///
652652
/// if (response != null && response.Request != null && response.Request.Status != null &&
653653
/// (response.Request.Status.Code.Equals(200) || response.Request.Status.Code.Equals(207)) && // 207 is a multi-status, see OneAll documentation for details
@@ -666,7 +666,7 @@ public Response<PostResult> UserPublishContent(Guid token, PostMessage message)
666666
/// }
667667
/// else if (response != null && response.Request != null && response.Request.Status != null)
668668
/// {
669-
/// Console.WriteLine("{0}: {1}", response.Code, response.Info);
669+
/// Console.WriteLine("{0}: {1}", response.Request.Status.Code, response.Request.Status.Info);
670670
/// }
671671
/// ]]>
672672
/// </code>

0 commit comments

Comments
 (0)