Base classes to get a head start on MFA

pmiller7 · pmiller7 · commit 00f618f71876 · 2016-08-23T10:08:42.000-07:00
diff --git a/api/src/main/java/com/stormpath/sdk/account/Account.java b/api/src/main/java/com/stormpath/sdk/account/Account.java
@@ -30,6 +30,7 @@
 import com.stormpath.sdk.group.GroupMembershipList;
 import com.stormpath.sdk.oauth.AccessTokenList;
 import com.stormpath.sdk.oauth.RefreshTokenList;
+import com.stormpath.sdk.phone.Phone;
 import com.stormpath.sdk.provider.ProviderData;
 import com.stormpath.sdk.resource.Auditable;
 import com.stormpath.sdk.resource.Deletable;
@@ -560,4 +561,6 @@ public interface Account extends Resource, Saveable, Deletable, Extendable, Audi
      * @since 1.0.RC7
      */
     RefreshTokenList getRefreshTokens();
+
+    Phone createPhone(Phone phone);
 }
diff --git a/api/src/main/java/com/stormpath/sdk/challenge/Challenge.java b/api/src/main/java/com/stormpath/sdk/challenge/Challenge.java
@@ -0,0 +1,23 @@
+/*
+* Copyright 2015 Stormpath, Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.stormpath.sdk.challenge;
+
+/**
+ * TODO: description
+ */
+public interface Challenge {
+
+}
diff --git a/api/src/main/java/com/stormpath/sdk/factor/Factor.java b/api/src/main/java/com/stormpath/sdk/factor/Factor.java
@@ -0,0 +1,31 @@
+/*
+* Copyright 2015 Stormpath, Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.stormpath.sdk.factor;
+
+import com.stormpath.sdk.account.Account;
+
+/**
+ * TODO: description
+ */
+public abstract class Factor {
+    private FactorType factorType;
+    private Account account;
+
+    public Factor(FactorType factorType, Account account) {
+        this.factorType = factorType;
+        this.account = account;
+    }
+}
diff --git a/api/src/main/java/com/stormpath/sdk/factor/FactorType.java b/api/src/main/java/com/stormpath/sdk/factor/FactorType.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Stormpath, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stormpath.sdk.factor;
+
+/**
+ * TODO: description
+ */
+public enum FactorType {
+    SMS
+}
diff --git a/api/src/main/java/com/stormpath/sdk/factor/sms/SmsFactor.java b/api/src/main/java/com/stormpath/sdk/factor/sms/SmsFactor.java
@@ -0,0 +1,23 @@
+/*
+* Copyright 2015 Stormpath, Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.stormpath.sdk.factor.sms;
+
+/**
+ * TODO: description
+ */
+public interface SmsFactor {
+
+}
diff --git a/api/src/main/java/com/stormpath/sdk/factor/sms/SmsFactorBuilder.java b/api/src/main/java/com/stormpath/sdk/factor/sms/SmsFactorBuilder.java
@@ -0,0 +1,31 @@
+/*
+* Copyright 2015 Stormpath, Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.stormpath.sdk.factor.sms;
+
+import com.stormpath.sdk.account.Account;
+import com.stormpath.sdk.phone.Phone;
+
+/**
+ * TODO: description
+ */
+public interface SmsFactorBuilder {
+
+    SmsFactorBuilder setPhone(Phone phone);
+    SmsFactorBuilder setAccount(Account account);
+    SmsFactorBuilder setChallengeMessage(String message);
+
+    SmsFactor build();
+}
diff --git a/api/src/main/java/com/stormpath/sdk/phone/Phone.java b/api/src/main/java/com/stormpath/sdk/phone/Phone.java
@@ -0,0 +1,26 @@
+/*
+* Copyright 2015 Stormpath, Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.stormpath.sdk.phone;
+
+import com.stormpath.sdk.resource.Deletable;
+import com.stormpath.sdk.resource.Resource;
+
+/**
+ * TODO: description
+ */
+public interface Phone extends Resource, Deletable {
+
+}
diff --git a/api/src/main/java/com/stormpath/sdk/phone/PhoneBuilder.java b/api/src/main/java/com/stormpath/sdk/phone/PhoneBuilder.java
@@ -0,0 +1,33 @@
+/*
+* Copyright 2015 Stormpath, Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.stormpath.sdk.phone;
+
+import com.stormpath.sdk.account.Account;
+
+/**
+ * TODO: description
+ */
+public interface PhoneBuilder {
+
+    PhoneBuilder setNumber(String number);
+    PhoneBuilder setName(String name);
+    PhoneBuilder setDescription(String description);
+    PhoneBuilder setPhoneStatus(PhoneStatus phoneStatus);
+    PhoneBuilder setPhoneVerificationStatus(PhoneVerificationStatus phoneVerificationStatus);
+    PhoneBuilder setAccount(Account account);
+
+    Phone build();
+}
diff --git a/api/src/main/java/com/stormpath/sdk/phone/PhoneList.java b/api/src/main/java/com/stormpath/sdk/phone/PhoneList.java
@@ -0,0 +1,24 @@
+/*
+* Copyright 2015 Stormpath, Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.stormpath.sdk.phone;
+
+import com.stormpath.sdk.resource.CollectionResource;
+
+/**
+ * TODO: description
+ */
+public interface PhoneList extends CollectionResource<Phone> {
+}
diff --git a/api/src/main/java/com/stormpath/sdk/phone/PhoneStatus.java b/api/src/main/java/com/stormpath/sdk/phone/PhoneStatus.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Stormpath, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stormpath.sdk.phone;
+
+/**
+ * TODO: description
+ */
+public enum PhoneStatus {
+    ENABLED, DISABLED
+}
diff --git a/api/src/main/java/com/stormpath/sdk/phone/PhoneVerificationStatus.java b/api/src/main/java/com/stormpath/sdk/phone/PhoneVerificationStatus.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 Stormpath, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stormpath.sdk.phone;
+
+/**
+ * TODO: description
+ */
+public enum PhoneVerificationStatus {
+    VERIFIED, UNVERIFIED
+}
diff --git a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/client/FactorIT.groovy b/extensions/httpclient/src/test/groovy/com/stormpath/sdk/client/FactorIT.groovy
@@ -0,0 +1,34 @@
+package com.stormpath.sdk.client
+
+import com.stormpath.sdk.account.Account
+import com.stormpath.sdk.directory.Directory
+import com.stormpath.sdk.factor.Factor
+import com.stormpath.sdk.impl.factor.sms.DefaultSmsFactorBuilder
+import com.stormpath.sdk.impl.phone.DefaultPhoneBuilder
+import com.stormpath.sdk.phone.Phone
+import org.testng.annotations.Test
+
+class FactorIT extends ClientIT {
+    @Test
+    void testCreateFactorWithNewPhone() {
+
+        Directory dir = client.instantiate(Directory)
+        dir.name = uniquify("Java SDK: DirectoryIT.testDeleteAccount")
+        dir = client.currentTenant.createDirectory(dir)
+        deleteOnTeardown(dir)
+
+        def email = 'johndeleteme@nowhere.com'
+
+        Account account = client.instantiate(Account)
+        account = account.setGivenName('John')
+                .setSurname('DELETEME')
+                .setEmail(email)
+                .setPassword('Changeme1!')
+
+        dir.createAccount(account)
+
+        Phone phone = new DefaultPhoneBuilder().setAccount(account).setNumber("+18008675309").build()
+
+        Factor smsFactor = new DefaultSmsFactorBuilder().setAccount(account).setPhone(phone).build()
+    }
+}
diff --git a/impl/src/main/java/com/stormpath/sdk/impl/account/DefaultAccount.java b/impl/src/main/java/com/stormpath/sdk/impl/account/DefaultAccount.java
@@ -50,6 +50,8 @@
 import com.stormpath.sdk.oauth.AccessTokenList;
 import com.stormpath.sdk.oauth.RefreshToken;
 import com.stormpath.sdk.oauth.RefreshTokenList;
+import com.stormpath.sdk.phone.Phone;
+import com.stormpath.sdk.phone.PhoneList;
 import com.stormpath.sdk.provider.ProviderData;
 import com.stormpath.sdk.query.Criteria;
 import com.stormpath.sdk.resource.ResourceException;
@@ -97,10 +99,13 @@ public class DefaultAccount extends AbstractExtendableInstanceResource implement
     static final CollectionReference<RefreshTokenList, RefreshToken> REFRESH_TOKENS =
             new CollectionReference<RefreshTokenList, RefreshToken>("refreshTokens", RefreshTokenList.class, RefreshToken.class);
 
+    static final CollectionReference<PhoneList, Phone> PHONES =
+            new CollectionReference<>("phones", PhoneList.class, Phone.class);
+
     static final Map<String, Property> PROPERTY_DESCRIPTORS = createPropertyDescriptorMap(
             USERNAME, EMAIL, PASSWORD, GIVEN_NAME, MIDDLE_NAME, SURNAME, STATUS, FULL_NAME,
             EMAIL_VERIFICATION_TOKEN, CUSTOM_DATA, DIRECTORY, TENANT, GROUPS, GROUP_MEMBERSHIPS, 
-            PROVIDER_DATA,API_KEYS, APPLICATIONS, ACCESS_TOKENS, REFRESH_TOKENS);
+            PROVIDER_DATA,API_KEYS, APPLICATIONS, ACCESS_TOKENS, REFRESH_TOKENS, PHONES);
 
     public DefaultAccount(InternalDataStore dataStore) {
         super(dataStore);
@@ -464,4 +469,9 @@ public AccessTokenList getAccessTokens() {
     public RefreshTokenList getRefreshTokens() {
         return getResourceProperty(REFRESH_TOKENS);
     }
+
+    @Override
+    public Phone createPhone(Phone phone) {
+        return getDataStore().create(this.getHref() + "/phones", phone);
+    }
 }
diff --git a/impl/src/main/java/com/stormpath/sdk/impl/challenge/DefaultChallenge.java b/impl/src/main/java/com/stormpath/sdk/impl/challenge/DefaultChallenge.java
@@ -0,0 +1,25 @@
+/*
+* Copyright 2015 Stormpath, Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.stormpath.sdk.impl.challenge;
+
+import com.stormpath.sdk.challenge.Challenge;
+
+/**
+ * TODO: description
+ */
+public class DefaultChallenge implements Challenge {
+
+}
diff --git a/impl/src/main/java/com/stormpath/sdk/impl/factor/sms/DefaultSmsFactor.java b/impl/src/main/java/com/stormpath/sdk/impl/factor/sms/DefaultSmsFactor.java
diff --git a/impl/src/main/java/com/stormpath/sdk/impl/factor/sms/DefaultSmsFactorBuilder.java b/impl/src/main/java/com/stormpath/sdk/impl/factor/sms/DefaultSmsFactorBuilder.java
diff --git a/impl/src/main/java/com/stormpath/sdk/impl/phone/DefaultPhone.java b/impl/src/main/java/com/stormpath/sdk/impl/phone/DefaultPhone.java
diff --git a/impl/src/main/java/com/stormpath/sdk/impl/phone/DefaultPhoneBuilder.java b/impl/src/main/java/com/stormpath/sdk/impl/phone/DefaultPhoneBuilder.java
